make sync work with conboy

[grauphel.git] / controller / apicontroller.php

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 7f6bc67d7e9391977cdfaad2107e0cb8fddfe3ad..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;
 


@@ -34,13 +35,13 @@ use \OCA\Grauphel\Lib\Response\ErrorResponse;
  */
 class ApiController extends Controller
 {
  */
 class ApiController extends Controller
 {

-       /**
-        * constructor of the controller
+    /**
+     * constructor of the controller

      *
      *

-        * @param string   $appName Name of the app
-        * @param IRequest $request Instance of the request
-        */
-       public function __construct($appName, \OCP\IRequest $request, $user)
+     * @param string   $appName Name of the app
+     * @param IRequest $request Instance of the request
+     */
+    public function __construct($appName, \OCP\IRequest $request, $user)

     {
         parent::__construct($appName, $request);
         $this->user  = $user;
     {
         parent::__construct($appName, $request);
         $this->user  = $user;


@@ -67,7 +68,7 @@ class ApiController extends Controller
         $urlGen = $deps->urlGen;
 
         try {
         $urlGen = $deps->urlGen;
 
         try {

-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();

             $oauth->registerHandler($provider)
                 ->registerAccessTokenHandler($provider);
             $provider->checkOAuthRequest(
             $oauth->registerHandler($provider)
                 ->registerAccessTokenHandler($provider);
             $provider->checkOAuthRequest(


@@ -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) {