Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not invalidate main token on OAuth
Fixes #10584

We deleted the main token when using the login flow else mutliple tokens
would show up for a single user.

However in the case of OAuth this is perfectly fine as the
authentication happens really in your browser:

1. You are already logged in, no need to log you out
2. You are not logged in yet, but since you log in into the exact same
browser the expected behavior is to stay logged in.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
rullzer committed Sep 6, 2018
commit be2d8cc4e9b6f0aac2e0c8f82e8635dbbce2a51d
6 changes: 3 additions & 3 deletions core/Controller/ClientFlowLoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,10 @@ public function generateAppPassword($stateToken,

$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);
}
Expand Down