aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-09-06 13:14:26 +0200
committerGitHub <noreply@github.com>2018-09-06 13:14:26 +0200
commit70a21de4c2f7b75db198e9e66dcf9e7d6ba843c0 (patch)
treebe0f81cfa1c5a074fa9f632ca8d69b60e3dec82a
parent5767f1c9d3e214bb8a20a838239220016cd54c58 (diff)
parentbe2d8cc4e9b6f0aac2e0c8f82e8635dbbce2a51d (diff)
downloadnextcloud-server-70a21de4c2f7b75db198e9e66dcf9e7d6ba843c0.tar.gz
nextcloud-server-70a21de4c2f7b75db198e9e66dcf9e7d6ba843c0.zip
Merge pull request #11082 from nextcloud/fix/10584/no_invalidate_token_oauth
Do not invalidate main token on OAuth
-rw-r--r--core/Controller/ClientFlowLoginController.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
index c3b88f752db..088a6a98699 100644
--- a/core/Controller/ClientFlowLoginController.php
+++ b/core/Controller/ClientFlowLoginController.php
@@ -366,10 +366,10 @@ class ClientFlowLoginController extends Controller {
$serverPath = $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
$redirectUri = 'nc://login/server:' . $serverPath . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
- }
- // Clear the token from the login here
- $this->tokenProvider->invalidateToken($sessionId);
+ // Clear the token from the login here
+ $this->tokenProvider->invalidateToken($sessionId);
+ }
return new Http\RedirectResponse($redirectUri);
}