Return JSON responses in auth, token and micropub API

The IndieAuth spec wants that now.
Previously, it allowed both x-www-form-urlencoded and application/json.
Now this is not true anymore, because aaronpk wanted IndieAuth to be
"a proper OAuth2 extension".

Resolves: https://github.com/cweiske/anoweco/issues/9

diff --git a/www/auth.php b/www/auth.php
index 22e3de9f0195375b6425083b2575ac94a958b97c..d47642c97bab9d95416044a80a89fcef6d9f693c 100644 (file)
--- a/www/auth.php
+++ b/www/auth.php
@@ -146,8 +146,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'GET') {
             error('Invalid signature');
         }
         header('HTTP/1.0 200 OK');
-        header('Content-type: application/x-www-form-urlencoded');
-        echo http_build_query(['me' => $me]);
+        header('Content-type: application/json');
+        echo json_encode(['me' => $me]);
         exit();
     }
 } else if ($_SERVER['REQUEST_METHOD'] == 'HEAD') {

diff --git a/www/micropub.php b/www/micropub.php
index 3cbfbe87da22524bbc093f7b18edc18386d7fc55..ab6af864ff1fef631fc45db57db5e130414c0133 100644 (file)
--- a/www/micropub.php
+++ b/www/micropub.php
@@ -35,7 +35,8 @@ function validateToken($token)
         array(
             'http' => array(
                 'header' => array(
-                    'Authorization: Bearer ' . $token
+                    'Authorization: Bearer ' . $token,
+                    'Accept: application/json',
                 ),
                 'ignore_errors' => true,
             ),
@@ -52,10 +53,10 @@ function validateToken($token)
         );
     }
 
-    parse_str($res, $data);
+    $data = json_decode($res, true);
     //FIXME: they spit out non-micropub json error responess
-    verifyUrlParameter($data, 'me');
-    verifyUrlParameter($data, 'client_id');
+    verifyParameter($data, 'me');
+    verifyParameter($data, 'client_id');
     verifyParameter($data, 'scope');
 
     return [$data['me'], $data['client_id'], $data['scope']];

diff --git a/www/token.php b/www/token.php
index e7d9e9f60c0c726e85cefc7ddf374495bbbb77e6..67d6bb19fde0aa3c1f26c643bd2658e42d01cbfb 100644 (file)
--- a/www/token.php
+++ b/www/token.php
@@ -79,8 +79,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'GET') {
     }
 
     header('HTTP/1.0 200 OK');
-    header('Content-type: application/x-www-form-urlencoded');
-    echo http_build_query(
+    header('Content-type: application/json');
+    echo json_encode(
         array(
             'me'        => $me,
             'client_id' => $client_id,
@@ -127,10 +127,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'GET') {
         )
     );
     header('HTTP/1.0 200 OK');
-    header('Content-type: application/x-www-form-urlencoded');
-    echo http_build_query(
+    header('Content-type: application/json');
+    echo json_encode(
         array(
             'access_token' => $access_token,
+            'token_type' => 'Bearer',
             'me' => $me,
             'scope' => $scope
         )