Do not require "me" parameter in connection callback

[shpub.git] / src / shpub / Command / Connect.php

diff --git a/src/shpub/Command/Connect.php b/src/shpub/Command/Connect.php
index e92077779c8abce3eb16d17d13649b1d26a53bec..b39665b1c729394335abeb749444d081fd578456 100644 (file)
--- a/src/shpub/Command/Connect.php
+++ b/src/shpub/Command/Connect.php
@@ -177,11 +177,13 @@ class Command_Connect
 
     protected function getBrowserAuthUrl($host, $user, $redirect_uri, $state, $scope)
     {
+        $sep = strpos($host->endpoints->authorization, '?') === false
+            ? '?' : '&';
         return $host->endpoints->authorization
-            . '?me=' . urlencode($user)
+            . $sep . 'me=' . urlencode($user)
             . '&client_id=' . urlencode(static::$client_id)
             . '&redirect_uri=' . urlencode($redirect_uri)
-            . '&state=' . $state
+            . '&state=' . urlencode($state)
             . '&scope=' . urlencode($scope)
             . '&response_type=code';
     }
@@ -277,7 +279,6 @@ class Command_Connect
                     parse_str($parts['query'], $query);
                     if (isset($query['code'])
                         && isset($query['state'])
-                        && isset($query['me'])
                     ) {
                         fwrite($sock, $responseOk);
                         fclose($sock);