git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent warning when user is not logged in
[grauphel.git]
/
controller
/
apicontroller.php
diff --git
a/controller/apicontroller.php
b/controller/apicontroller.php
index 691d8abbe0cdaf99b3586c922c31194f2a2fc460..688d0b0a47d36920d78634329233e3590648420b 100644
(file)
--- a/
controller/apicontroller.php
+++ b/
controller/apicontroller.php
@@
-16,6
+16,7
@@
namespace OCA\Grauphel\Controller;
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
+use \OCA\Grauphel\Lib\Client;
use \OCA\Grauphel\Lib\NoteStorage;
use \OCA\Grauphel\Lib\OAuth;
use \OCA\Grauphel\Lib\OAuthException;
use \OCA\Grauphel\Lib\NoteStorage;
use \OCA\Grauphel\Lib\OAuth;
use \OCA\Grauphel\Lib\OAuthException;
@@
-105,6
+106,12
@@
class ApiController extends Controller
'api-version' => '1.0',
);
'api-version' => '1.0',
);
+ $cl = new Client();
+ $client = $cl->getClient();
+ if ($client !== false) {
+ $data['oauth_authorize_url'] .= '?client=' . urlencode($client);
+ }
+
if ($authenticated) {
$data['user-ref'] = array(
'api-ref' => $urlGen->getAbsoluteURL(
if ($authenticated) {
$data['user-ref'] = array(
'api-ref' => $urlGen->getAbsoluteURL(