From 99af4fb6372c09f85f62e5efd6d15ec273eed3eb Mon Sep 17 00:00:00 2001 From: Thomas Hufschmidt Date: Fri, 11 Nov 2016 10:47:13 +0100 Subject: [PATCH] fixed issues #38, #39, #40 updated tools/oauth2demo for 1.6.0. refactoring --- RESTController/RESTController.php | 10 +---- .../core/oauth2_v2/models/Authorize.php | 6 +-- RESTController/core/oauth2_v2/views/index.php | 2 +- RESTController/database/RESTclient.php | 6 +-- RESTController/libs/RESTDatabase.php | 6 ++- RESTController/libs/RESTRequest.php | 4 ++ RESTController/libs/RESTResponse.php | 9 +++- api.php | 2 +- tools/oauth2demo/config.ini.php.default | 6 +-- .../endpoints/authcode_endpoint.php | 44 +++++++++---------- tools/oauth2demo/index.php | 37 +++++++--------- 11 files changed, 65 insertions(+), 67 deletions(-) diff --git a/RESTController/RESTController.php b/RESTController/RESTController.php index 497e274c..d6967db8 100644 --- a/RESTController/RESTController.php +++ b/RESTController/RESTController.php @@ -90,16 +90,10 @@ public static function registerAutoloader() { * $iliasRoot - Absolute path to ILIAS directory * $userSettings - Associative array of application settings */ - public function __construct($iliasRoot, array $userSettings = array()) { + public function __construct(array $userSettings = array()) { // Call parent (SLIM) constructor parent::__construct($userSettings); - // Fetch environment and remeber base-directory (just in case) - $env = $this->environment(); - $env['ilias_root'] = $iliasRoot; - $env['ctl_root'] = __DIR__; - // Alternatively set as hard-coded path: "$root/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController" - // Add Content-Type middleware (support for JSON/XML requests) $contentType = new libs\Middleware\ContentTypes(); $this->add($contentType); @@ -123,7 +117,7 @@ public function __construct($iliasRoot, array $userSettings = array()) { // Set default template base-directory // DoIt: Extract using ILIAS (or keep constant) - $this->view()->setTemplatesDirectory($appDirectory); + $this->view()->setTemplatesDirectory(__DIR__); // Set default 404 template $this->notFound(function () { diff --git a/RESTController/core/oauth2_v2/models/Authorize.php b/RESTController/core/oauth2_v2/models/Authorize.php index 49d49eda..1dcb8717 100644 --- a/RESTController/core/oauth2_v2/models/Authorize.php +++ b/RESTController/core/oauth2_v2/models/Authorize.php @@ -331,9 +331,7 @@ public static function ShowWebsite($app, $param) { // fetch absolute dirictory of view folder $plugin = Libs\RESTilias::getPlugin(); $pluginDir = str_replace('./', '', $plugin->getDirectory()); - $pluginDir = $pluginDir . '/RESTController/core/oauth2_v2/views/'; - - + $viewDir = $pluginDir . '/RESTController/core/oauth2_v2/views/'; // Content and further logic is managed by the template $app->response()->setFormat('HTML'); @@ -341,7 +339,7 @@ public static function ShowWebsite($app, $param) { 'core/oauth2_v2/views/index.php', array( 'baseURL' => ILIAS_HTTP_PATH, - 'viewURL' => ILIAS_HTTP_PATH . '/' . $pluginDir, + 'viewURL' => ILIAS_HTTP_PATH . '/' . $viewDir, 'endpoint' => ILIAS_HTTP_PATH . '/' . $pluginDir . '/api.php' . $routeURL, 'client' => CLIENT_ID, 'parameters' => $param, diff --git a/RESTController/core/oauth2_v2/views/index.php b/RESTController/core/oauth2_v2/views/index.php index 2818de22..3906f72b 100644 --- a/RESTController/core/oauth2_v2/views/index.php +++ b/RESTController/core/oauth2_v2/views/index.php @@ -40,7 +40,7 @@
-

Anmeldung

+

OAuth2

Anwendungs-Zugriff


getKey(...) */ - public function getKey($key) { + public function getKey($key, $read = false) { // Fetch internal value from parent - $value = parent::getKey($key); + $value = parent::getKey($key, $read); // Convert internal value when publshing // Note: Make sure to 'revert' those changes in setKey(...)! @@ -329,7 +329,7 @@ public function isScopeAllowed($scope) { return Libs\RESTLib::CheckComplexRestriction($allowed, $scopes, ' '); } - + /** * Function: isBridgeAllowed($direction) * Checks if the ILIAS <-> oAuth2 bridge is allowed for this client in the requested direction. diff --git a/RESTController/libs/RESTDatabase.php b/RESTController/libs/RESTDatabase.php index 3bdf2171..e21a4ccd 100644 --- a/RESTController/libs/RESTDatabase.php +++ b/RESTController/libs/RESTDatabase.php @@ -185,7 +185,8 @@ public static function fromWhere($where = null, $limit = false, $offset = false, // Build a simple where-based query $table = static::getTableName(); - $class = end(explode('\\', get_called_class())); + $array = explode('\\', get_called_class()); + $class = end($array); $sql = sprintf('SELECT %s.* FROM %s AS %s %s %s %s %s', $class, $table, $class, $joinSQL, $whereSQL, $limitSQL, $offsetSQL); // Generate ilDB query-object @@ -1175,7 +1176,8 @@ public static function getTableKeys() { * - Short name of current class name (late static binding) */ public static function getName() { - return end(explode('\\', get_called_class())); + $array = explode('\\', get_called_class()); + return end($array); } diff --git a/RESTController/libs/RESTRequest.php b/RESTController/libs/RESTRequest.php index 1a996647..31274f71 100644 --- a/RESTController/libs/RESTRequest.php +++ b/RESTController/libs/RESTRequest.php @@ -222,6 +222,10 @@ public function getToken($name = 'access', $stringOnly = false) { if (isset($this->tokens[$name])) return $this->tokens[$name]; + // Prevent undefined variables + $tokenString = null; + + // Extract token switch ($name) { // Fetch access-token default: diff --git a/RESTController/libs/RESTResponse.php b/RESTController/libs/RESTResponse.php index 9d691776..0d70a24d 100644 --- a/RESTController/libs/RESTResponse.php +++ b/RESTController/libs/RESTResponse.php @@ -57,8 +57,15 @@ public function __construct($body = '', $status = 200, $headers = array()) { * @See \Slim\Http\Response->write(...) for more details */ public function write($body, $replace = false) { + // Keep normal mode of operation for HTML/RAW + switch ($this->format) { + case 'HTML': + case 'RAW': + return parent::write($body, $replace); + } + // Merged new body with old content - if ($replace === false) { + if ($replace !== true) { // Decode old content $oldBody = $this->decode($this->getBody()); diff --git a/api.php b/api.php index 56445bcf..87cb5de4 100644 --- a/api.php +++ b/api.php @@ -19,5 +19,5 @@ chdir($directory); // Instantate and run the RESTController application -$restCTL = new \RESTController\RESTController($directory); +$restCTL = new \RESTController\RESTController(); $restCTL->run(); diff --git a/tools/oauth2demo/config.ini.php.default b/tools/oauth2demo/config.ini.php.default index c3e31da5..7a2faf87 100644 --- a/tools/oauth2demo/config.ini.php.default +++ b/tools/oauth2demo/config.ini.php.default @@ -1,4 +1,4 @@ $_GET['code'], 'api_key' => $api_key, 'api_secret' => $api_secret, - 'redirect_uri' => $redirect_uri + 'redirect_uri' => $_SERVER['PHP_SELF'] ); - // Endpoint (url) used for curl call - $url = $subFolder. "/v2/oauth2/token"; - // - $ch = curl_init($url); + $ch = curl_init($tokenUrl); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -61,18 +48,27 @@ // Convert to array $decoded = json_decode($body, true); - ?> -

OAuth2 Token via Authorization Code Workflow Retrieved!

- 
Access-Token:
- 
Refresh-Token:
-

The client can continue now making further API requests with the obtained bearer token.

- +

OAuth2 Token via Authorization Code Workflow Retrieved!

+ 
Access-Token:
+ 
Refresh-Token:
+

The client can continue now making further API requests with the obtained bearer token.

+ +

Error when requesting OAuth2 Token:

+
+

The Server has authenticated your request and generated an authentication code that can be traded for a bearer token.

Authorization Code:
- &make_curl_call=1'>Trade authentication code for bearer token

+ Trade authentication code for bearer token

Initiating one of the following OAuth2 Grant Mechanism via a GET Request:

    @@ -33,23 +30,23 @@

    Initiating one of the following OAuth2 Grant Mechanism via a POST Request:

    • -
      + - " /> +
    • -
      + - " /> +
    • -
      + @@ -58,7 +55,7 @@
    • -
      +