git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sync work with conboy
[grauphel.git]
/
controller
/
apicontroller.php
diff --git
a/controller/apicontroller.php
b/controller/apicontroller.php
index 4c7af4856d379703bc922a52b0d69a890c0e9b68..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;
@@
-67,7
+68,7
@@
class ApiController extends Controller
$urlGen = $deps->urlGen;
try {
$urlGen = $deps->urlGen;
try {
- $provider =
new \OAuth
Provider();
+ $provider =
OAuth::get
Provider();
$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 (
OAuth
Exception $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) {