Add hrefs to API responses

[grauphel.git] / controller / oauthcontroller.php

diff --git a/controller/oauthcontroller.php b/controller/oauthcontroller.php
index 8672927ecb584f78740c34dce3497febe1eff85d..dfb02c57a7a7661bfe5e46db89956954f8441195 100644 (file)
--- a/controller/oauthcontroller.php
+++ b/controller/oauthcontroller.php
@@ -18,6 +18,7 @@ use \OCP\AppFramework\Http;
 use \OCP\AppFramework\Http\RedirectResponse;
 use \OCP\AppFramework\Http\TemplateResponse;
 
 use \OCP\AppFramework\Http\RedirectResponse;
 use \OCP\AppFramework\Http\TemplateResponse;
 

+use \OCA\Grauphel\Lib\Client;

 use \OCA\Grauphel\Lib\Token;
 use \OCA\Grauphel\Lib\OAuth;
 use \OCA\Grauphel\Lib\Dependencies;
 use \OCA\Grauphel\Lib\Token;
 use \OCA\Grauphel\Lib\OAuth;
 use \OCA\Grauphel\Lib\Dependencies;


@@ -87,6 +88,7 @@ class OauthController extends Controller
             $newToken->tokenKey = 'a' . bin2hex($provider->generateToken(8));
             $newToken->secret   = 's' . bin2hex($provider->generateToken(8));
             $newToken->user     = $token->user;
             $newToken->tokenKey = 'a' . bin2hex($provider->generateToken(8));
             $newToken->secret   = 's' . bin2hex($provider->generateToken(8));
             $newToken->user     = $token->user;

+            $newToken->client   = $token->client;

             $this->deps->tokens->store($newToken);
 
             return new FormResponse(
             $this->deps->tokens->store($newToken);
 
             return new FormResponse(


@@ -118,10 +120,20 @@ class OauthController extends Controller
             return $token;
         }
 
             return $token;
         }
 

+        $clientTitle = 'unknown';
+        $clientAgent = '';
+        if (isset($_GET['client'])) {
+            $clientAgent = $_GET['client'];
+            $cl = new Client();
+            $clientTitle = $cl->getNiceName($clientAgent);
+        }
+

         $res = new TemplateResponse('grauphel', 'oauthAuthorize');
         $res->setParams(
             array(
                 'oauth_token' => $token->tokenKey,
         $res = new TemplateResponse('grauphel', 'oauthAuthorize');
         $res->setParams(
             array(
                 'oauth_token' => $token->tokenKey,

+                'clientTitle' => $clientTitle,
+                'clientAgent' => $clientAgent,

                 'formaction'  => $this->deps->urlGen->linkToRoute(
                     'grauphel.oauth.confirm'
                 ),
                 'formaction'  => $this->deps->urlGen->linkToRoute(
                     'grauphel.oauth.confirm'
                 ),


@@ -166,6 +178,11 @@ class OauthController extends Controller
             return $res;
         }
 
             return $res;
         }
 

+        $clientAgent = '';
+        if (isset($_POST['client'])) {
+            $clientAgent = $_POST['client'];
+        }
+

         //the user is logged in and authorized
         $provider = OAuth::getProvider();
 
         //the user is logged in and authorized
         $provider = OAuth::getProvider();
 


@@ -174,6 +191,7 @@ class OauthController extends Controller
         $newToken->secret   = $token->secret;
         $newToken->verifier = 'v' . bin2hex($provider->generateToken(8));
         $newToken->user     = $this->user->getUID();
         $newToken->secret   = $token->secret;
         $newToken->verifier = 'v' . bin2hex($provider->generateToken(8));
         $newToken->user     = $this->user->getUID();

+        $newToken->client   = $clientAgent;

 
         $this->deps->tokens->store($newToken);
 
 
         $this->deps->tokens->store($newToken);