Removing code from index.php, adding dependency in OAuthWrapper

pydio · Mar 11, 2016 · 72980ff · 72980ff
1 parent 35e2f6d
commit 72980ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/core/src/core/classes/guzzle/composer.json b/core/src/core/classes/guzzle/composer.json
@@ -3,6 +3,7 @@
         "guzzlehttp/guzzle": "~5",
         "guzzlehttp/command": "~0.7",
         "guzzlehttp/guzzle-services": "~0.5",
-        "gimler/guzzle-description-loader" : "*"
+        "gimler/guzzle-description-loader" : "*",
+        "commerceguys/guzzle-oauth2-plugin": "~2.0"
     }
 }
diff --git a/core/src/index.php b/core/src/index.php
@@ -68,9 +68,6 @@
 }
 session_start();
 
-if (isSet($_GET['code'])) {
-    $_SESSION['oauth_code'] = AJXP_Utils::sanitize($_GET['code'], AJXP_SANITIZE_ALPHANUM);
-}
 if (isSet($_GET["tmp_repository_id"]) || isSet($_POST["tmp_repository_id"])) {
     try{
         ConfService::switchRootDir(isset($_GET["tmp_repository_id"])?$_GET["tmp_repository_id"]:$_POST["tmp_repository_id"], true);

diff --git a/core/src/plugins/core.access/src/Stream/OAuthWrapper.php b/core/src/plugins/core.access/src/Stream/OAuthWrapper.php
@@ -38,6 +38,10 @@ class OAuthWrapper extends AJXP_SchemeTranslatorWrapper
      */
     public static function applyInitPathHook($url) {
 
+        if (!class_exists('CommerceGuys\Guzzle\Oauth2\Oauth2Subscriber')) {
+            throw new Exception('Oauth plugin not loaded - go to ' . AJXP_BIN_FOLDER . '/guzzle from the command line and run \'composer update\' to install');
+        }
+
         // Repository information
         $urlParts = AJXP_Utils::safeParseUrl($url);
         $repository = ConfService::getRepositoryById($urlParts["host"]);
@@ -132,7 +136,7 @@ public static function applyInitPathHook($url) {
             $accessToken = $oauth2->getAccessToken();
             $refreshToken = $oauth2->getRefreshToken();
         } catch (\Exception $e) {
-            throw new AJXP_UserAlertException("Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"" . $authUrl . "\">" . $authUrl . "</a> to authorize the access to your onedrive. Then try again to switch to this workspace");
+            throw new AJXP_UserAlertException("Please go to <a style=\"text-decoration:underline;\" href=\"" . $authUrl . "\">" . $authUrl . "</a> to authorize the access to your onedrive. Then try again to switch to this workspace");
         }
 
         // Saving tokens for later use