Make sure to re-display the authorization URL in case of step 2 error.

pydio · Jan 23, 2015 · e0efb68 · e0efb68
1 parent 5522988
commit e0efb68
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/plugins/access.dropbox/class.dropboxAccessDriver.php b/core/src/plugins/access.dropbox/class.dropboxAccessDriver.php
@@ -85,18 +85,22 @@ public function initRepository()
                 //echo "Step 2: You must now redirect the user to:\n";
                 $_SESSION['DROPBOX_NEGOCIATION_STATE'] = 2;
                 $_SESSION['oauth_tokens'] = $tokens;
-                throw new Exception("Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"".$oauth->getAuthorizeUrl()."\">".$oauth->getAuthorizeUrl()."</a> to authorize the access to your dropbox. Then try again to switch to this repository.");
+                throw new Exception("Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"".$oauth->getAuthorizeUrl()."\">".$oauth->getAuthorizeUrl()."</a> to authorize the access to your dropbox. Then try again to switch to this workspace.");
 
             case 2 :
                 $oauth->setToken($_SESSION['oauth_tokens']);
-                $tokens = $oauth->getAccessToken();
+                try{
+                    $tokens = $oauth->getAccessToken();
+                }catch(Exception $oauthEx){
+                    throw new Exception($oauthEx->getMessage() . ". Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"".$oauth->getAuthorizeUrl()."\">".$oauth->getAuthorizeUrl()."</a> to authorize the access to your dropbox. Then try again to switch to this workspace.");
+                }
                 $_SESSION['DROPBOX_NEGOCIATION_STATE'] = 3;
                 $_SESSION['OAUTH_DROPBOX_TOKENS'] = $tokens;
                 $this->setTokens($tokens);
                 return;
         }
 
-        throw new Exception("Impossible to find the tokens for accessing the dropbox repository");
+        throw new Exception("Impossible to find the dropbox tokens for accessing this workspace");
 
     }