X-Git-Url: https://git.cweiske.de/grauphel.git/blobdiff_plain/3b7dde5d693bbbde491c66b47b0040fcfdc851da..381f04b7e408baccc64588a865bff33bcd87e152:/controller/apicontroller.php

diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 7f6bc67..a4361ef 100644
--- 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\OAuthException;
 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
 {
-	/**
-	 * 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;
@@ -67,7 +68,7 @@ class ApiController extends Controller
         $urlGen = $deps->urlGen;
 
         try {
-            $provider = new \OAuthProvider();
+            $provider = OAuth::getProvider();
             $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;
 
-        } catch (\OAuth_Exception $e) {
+        } catch (OAuthException $e) {
             return new ErrorResponse($e->getMessage());
         } catch (\OAuthException $e) {
             if ($e->getCode() != OAUTH_PARAMETER_ABSENT) {