make sync work with conboy

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index aa21429d4c56811d7654668af0105521490a30f8..a4361ef2d1af62f7dfd5b4794b6c06a9aa155c31 100644 (file)
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -18,6 +18,7 @@ use \OCP\AppFramework\Http\JSONResponse;
 
 use \OCA\Grauphel\Lib\NoteStorage;
 use \OCA\Grauphel\Lib\OAuth;
 
 use \OCA\Grauphel\Lib\NoteStorage;
 use \OCA\Grauphel\Lib\OAuth;

+use \OCA\Grauphel\Lib\OAuthException;

 use \OCA\Grauphel\Lib\Dependencies;
 use \OCA\Grauphel\Lib\Response\ErrorResponse;
 
 use \OCA\Grauphel\Lib\Dependencies;
 use \OCA\Grauphel\Lib\Response\ErrorResponse;
 


@@ -79,7 +80,7 @@ class ApiController extends Controller
             $token = $deps->tokens->load('access', $provider->token);
             $username = $token->user;
 
             $token = $deps->tokens->load('access', $provider->token);
             $username = $token->user;
 

-        } catch (\OAuth_Exception $e) {
+        } catch (OAuthException $e) {

             return new ErrorResponse($e->getMessage());
         } catch (\OAuthException $e) {
             if ($e->getCode() != OAUTH_PARAMETER_ABSENT) {
             return new ErrorResponse($e->getMessage());
         } catch (\OAuthException $e) {
             if ($e->getCode() != OAUTH_PARAMETER_ABSENT) {

diff --git a/lib/oauth.php b/lib/oauth.php
index d6c72e835daf2123cc6f95156b2e1d7a662f986c..6900c20305e0fba6ca68d8bd79886c91d0b6cfc6 100644 (file)
--- a/lib/oauth.php
+++ b/lib/oauth.php
@@ -98,6 +98,11 @@ class OAuth
 
     public function accessTokenHandler(\OAuthProvider $provider)
     {
 
     public function accessTokenHandler(\OAuthProvider $provider)
     {

+        if ($provider->token == '') {
+            //conboy sends empty token when not authed yet
+            return OAUTH_PARAMETER_ABSENT;
+        }
+

         $token = $this->tokens->load('access', $provider->token);
         $provider->token_secret = $token->secret;
         return OAUTH_OK;
         $token = $this->tokens->load('access', $provider->token);
         $provider->token_secret = $token->secret;
         return OAUTH_OK;