@@ -48,268 +48,268 @@ |
||
| 48 | 48 | use OCP\Session\Exceptions\SessionNotAvailableException; |
| 49 | 49 | |
| 50 | 50 | class ClientFlowLoginController extends Controller { |
| 51 | - /** @var IUserSession */ |
|
| 52 | - private $userSession; |
|
| 53 | - /** @var IL10N */ |
|
| 54 | - private $l10n; |
|
| 55 | - /** @var Defaults */ |
|
| 56 | - private $defaults; |
|
| 57 | - /** @var ISession */ |
|
| 58 | - private $session; |
|
| 59 | - /** @var IProvider */ |
|
| 60 | - private $tokenProvider; |
|
| 61 | - /** @var ISecureRandom */ |
|
| 62 | - private $random; |
|
| 63 | - /** @var IURLGenerator */ |
|
| 64 | - private $urlGenerator; |
|
| 65 | - /** @var ClientMapper */ |
|
| 66 | - private $clientMapper; |
|
| 67 | - /** @var AccessTokenMapper */ |
|
| 68 | - private $accessTokenMapper; |
|
| 69 | - /** @var ICrypto */ |
|
| 70 | - private $crypto; |
|
| 51 | + /** @var IUserSession */ |
|
| 52 | + private $userSession; |
|
| 53 | + /** @var IL10N */ |
|
| 54 | + private $l10n; |
|
| 55 | + /** @var Defaults */ |
|
| 56 | + private $defaults; |
|
| 57 | + /** @var ISession */ |
|
| 58 | + private $session; |
|
| 59 | + /** @var IProvider */ |
|
| 60 | + private $tokenProvider; |
|
| 61 | + /** @var ISecureRandom */ |
|
| 62 | + private $random; |
|
| 63 | + /** @var IURLGenerator */ |
|
| 64 | + private $urlGenerator; |
|
| 65 | + /** @var ClientMapper */ |
|
| 66 | + private $clientMapper; |
|
| 67 | + /** @var AccessTokenMapper */ |
|
| 68 | + private $accessTokenMapper; |
|
| 69 | + /** @var ICrypto */ |
|
| 70 | + private $crypto; |
|
| 71 | 71 | |
| 72 | - const stateName = 'client.flow.state.token'; |
|
| 72 | + const stateName = 'client.flow.state.token'; |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @param string $appName |
|
| 76 | - * @param IRequest $request |
|
| 77 | - * @param IUserSession $userSession |
|
| 78 | - * @param IL10N $l10n |
|
| 79 | - * @param Defaults $defaults |
|
| 80 | - * @param ISession $session |
|
| 81 | - * @param IProvider $tokenProvider |
|
| 82 | - * @param ISecureRandom $random |
|
| 83 | - * @param IURLGenerator $urlGenerator |
|
| 84 | - * @param ClientMapper $clientMapper |
|
| 85 | - * @param AccessTokenMapper $accessTokenMapper |
|
| 86 | - * @param ICrypto $crypto |
|
| 87 | - */ |
|
| 88 | - public function __construct($appName, |
|
| 89 | - IRequest $request, |
|
| 90 | - IUserSession $userSession, |
|
| 91 | - IL10N $l10n, |
|
| 92 | - Defaults $defaults, |
|
| 93 | - ISession $session, |
|
| 94 | - IProvider $tokenProvider, |
|
| 95 | - ISecureRandom $random, |
|
| 96 | - IURLGenerator $urlGenerator, |
|
| 97 | - ClientMapper $clientMapper, |
|
| 98 | - AccessTokenMapper $accessTokenMapper, |
|
| 99 | - ICrypto $crypto) { |
|
| 100 | - parent::__construct($appName, $request); |
|
| 101 | - $this->userSession = $userSession; |
|
| 102 | - $this->l10n = $l10n; |
|
| 103 | - $this->defaults = $defaults; |
|
| 104 | - $this->session = $session; |
|
| 105 | - $this->tokenProvider = $tokenProvider; |
|
| 106 | - $this->random = $random; |
|
| 107 | - $this->urlGenerator = $urlGenerator; |
|
| 108 | - $this->clientMapper = $clientMapper; |
|
| 109 | - $this->accessTokenMapper = $accessTokenMapper; |
|
| 110 | - $this->crypto = $crypto; |
|
| 111 | - } |
|
| 74 | + /** |
|
| 75 | + * @param string $appName |
|
| 76 | + * @param IRequest $request |
|
| 77 | + * @param IUserSession $userSession |
|
| 78 | + * @param IL10N $l10n |
|
| 79 | + * @param Defaults $defaults |
|
| 80 | + * @param ISession $session |
|
| 81 | + * @param IProvider $tokenProvider |
|
| 82 | + * @param ISecureRandom $random |
|
| 83 | + * @param IURLGenerator $urlGenerator |
|
| 84 | + * @param ClientMapper $clientMapper |
|
| 85 | + * @param AccessTokenMapper $accessTokenMapper |
|
| 86 | + * @param ICrypto $crypto |
|
| 87 | + */ |
|
| 88 | + public function __construct($appName, |
|
| 89 | + IRequest $request, |
|
| 90 | + IUserSession $userSession, |
|
| 91 | + IL10N $l10n, |
|
| 92 | + Defaults $defaults, |
|
| 93 | + ISession $session, |
|
| 94 | + IProvider $tokenProvider, |
|
| 95 | + ISecureRandom $random, |
|
| 96 | + IURLGenerator $urlGenerator, |
|
| 97 | + ClientMapper $clientMapper, |
|
| 98 | + AccessTokenMapper $accessTokenMapper, |
|
| 99 | + ICrypto $crypto) { |
|
| 100 | + parent::__construct($appName, $request); |
|
| 101 | + $this->userSession = $userSession; |
|
| 102 | + $this->l10n = $l10n; |
|
| 103 | + $this->defaults = $defaults; |
|
| 104 | + $this->session = $session; |
|
| 105 | + $this->tokenProvider = $tokenProvider; |
|
| 106 | + $this->random = $random; |
|
| 107 | + $this->urlGenerator = $urlGenerator; |
|
| 108 | + $this->clientMapper = $clientMapper; |
|
| 109 | + $this->accessTokenMapper = $accessTokenMapper; |
|
| 110 | + $this->crypto = $crypto; |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - /** |
|
| 114 | - * @return string |
|
| 115 | - */ |
|
| 116 | - private function getClientName() { |
|
| 117 | - $userAgent = $this->request->getHeader('USER_AGENT'); |
|
| 118 | - return $userAgent !== null ? $userAgent : 'unknown'; |
|
| 119 | - } |
|
| 113 | + /** |
|
| 114 | + * @return string |
|
| 115 | + */ |
|
| 116 | + private function getClientName() { |
|
| 117 | + $userAgent = $this->request->getHeader('USER_AGENT'); |
|
| 118 | + return $userAgent !== null ? $userAgent : 'unknown'; |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * @param string $stateToken |
|
| 123 | - * @return bool |
|
| 124 | - */ |
|
| 125 | - private function isValidToken($stateToken) { |
|
| 126 | - $currentToken = $this->session->get(self::stateName); |
|
| 127 | - if(!is_string($stateToken) || !is_string($currentToken)) { |
|
| 128 | - return false; |
|
| 129 | - } |
|
| 130 | - return hash_equals($currentToken, $stateToken); |
|
| 131 | - } |
|
| 121 | + /** |
|
| 122 | + * @param string $stateToken |
|
| 123 | + * @return bool |
|
| 124 | + */ |
|
| 125 | + private function isValidToken($stateToken) { |
|
| 126 | + $currentToken = $this->session->get(self::stateName); |
|
| 127 | + if(!is_string($stateToken) || !is_string($currentToken)) { |
|
| 128 | + return false; |
|
| 129 | + } |
|
| 130 | + return hash_equals($currentToken, $stateToken); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - /** |
|
| 134 | - * @return TemplateResponse |
|
| 135 | - */ |
|
| 136 | - private function stateTokenForbiddenResponse() { |
|
| 137 | - $response = new TemplateResponse( |
|
| 138 | - $this->appName, |
|
| 139 | - '403', |
|
| 140 | - [ |
|
| 141 | - 'file' => $this->l10n->t('State token does not match'), |
|
| 142 | - ], |
|
| 143 | - 'guest' |
|
| 144 | - ); |
|
| 145 | - $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 146 | - return $response; |
|
| 147 | - } |
|
| 133 | + /** |
|
| 134 | + * @return TemplateResponse |
|
| 135 | + */ |
|
| 136 | + private function stateTokenForbiddenResponse() { |
|
| 137 | + $response = new TemplateResponse( |
|
| 138 | + $this->appName, |
|
| 139 | + '403', |
|
| 140 | + [ |
|
| 141 | + 'file' => $this->l10n->t('State token does not match'), |
|
| 142 | + ], |
|
| 143 | + 'guest' |
|
| 144 | + ); |
|
| 145 | + $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 146 | + return $response; |
|
| 147 | + } |
|
| 148 | 148 | |
| 149 | - /** |
|
| 150 | - * @PublicPage |
|
| 151 | - * @NoCSRFRequired |
|
| 152 | - * @UseSession |
|
| 153 | - * |
|
| 154 | - * @param string $clientIdentifier |
|
| 155 | - * |
|
| 156 | - * @return TemplateResponse |
|
| 157 | - */ |
|
| 158 | - public function showAuthPickerPage($clientIdentifier = '') { |
|
| 159 | - $clientName = $this->getClientName(); |
|
| 160 | - $client = null; |
|
| 161 | - if($clientIdentifier !== '') { |
|
| 162 | - $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
|
| 163 | - $clientName = $client->getName(); |
|
| 164 | - } |
|
| 149 | + /** |
|
| 150 | + * @PublicPage |
|
| 151 | + * @NoCSRFRequired |
|
| 152 | + * @UseSession |
|
| 153 | + * |
|
| 154 | + * @param string $clientIdentifier |
|
| 155 | + * |
|
| 156 | + * @return TemplateResponse |
|
| 157 | + */ |
|
| 158 | + public function showAuthPickerPage($clientIdentifier = '') { |
|
| 159 | + $clientName = $this->getClientName(); |
|
| 160 | + $client = null; |
|
| 161 | + if($clientIdentifier !== '') { |
|
| 162 | + $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
|
| 163 | + $clientName = $client->getName(); |
|
| 164 | + } |
|
| 165 | 165 | |
| 166 | - // No valid clientIdentifier given and no valid API Request (APIRequest header not set) |
|
| 167 | - $clientRequest = $this->request->getHeader('OCS-APIREQUEST'); |
|
| 168 | - if ($clientRequest !== 'true' && $client === null) { |
|
| 169 | - return new TemplateResponse( |
|
| 170 | - $this->appName, |
|
| 171 | - 'error', |
|
| 172 | - [ |
|
| 173 | - 'errors' => |
|
| 174 | - [ |
|
| 175 | - [ |
|
| 176 | - 'error' => 'Access Forbidden', |
|
| 177 | - 'hint' => 'Invalid request', |
|
| 178 | - ], |
|
| 179 | - ], |
|
| 180 | - ], |
|
| 181 | - 'guest' |
|
| 182 | - ); |
|
| 183 | - } |
|
| 166 | + // No valid clientIdentifier given and no valid API Request (APIRequest header not set) |
|
| 167 | + $clientRequest = $this->request->getHeader('OCS-APIREQUEST'); |
|
| 168 | + if ($clientRequest !== 'true' && $client === null) { |
|
| 169 | + return new TemplateResponse( |
|
| 170 | + $this->appName, |
|
| 171 | + 'error', |
|
| 172 | + [ |
|
| 173 | + 'errors' => |
|
| 174 | + [ |
|
| 175 | + [ |
|
| 176 | + 'error' => 'Access Forbidden', |
|
| 177 | + 'hint' => 'Invalid request', |
|
| 178 | + ], |
|
| 179 | + ], |
|
| 180 | + ], |
|
| 181 | + 'guest' |
|
| 182 | + ); |
|
| 183 | + } |
|
| 184 | 184 | |
| 185 | - $stateToken = $this->random->generate( |
|
| 186 | - 64, |
|
| 187 | - ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS |
|
| 188 | - ); |
|
| 189 | - $this->session->set(self::stateName, $stateToken); |
|
| 185 | + $stateToken = $this->random->generate( |
|
| 186 | + 64, |
|
| 187 | + ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS |
|
| 188 | + ); |
|
| 189 | + $this->session->set(self::stateName, $stateToken); |
|
| 190 | 190 | |
| 191 | - return new TemplateResponse( |
|
| 192 | - $this->appName, |
|
| 193 | - 'loginflow/authpicker', |
|
| 194 | - [ |
|
| 195 | - 'client' => $clientName, |
|
| 196 | - 'clientIdentifier' => $clientIdentifier, |
|
| 197 | - 'instanceName' => $this->defaults->getName(), |
|
| 198 | - 'urlGenerator' => $this->urlGenerator, |
|
| 199 | - 'stateToken' => $stateToken, |
|
| 200 | - 'serverHost' => $this->request->getServerHost(), |
|
| 201 | - 'oauthState' => $this->session->get('oauth.state'), |
|
| 202 | - ], |
|
| 203 | - 'guest' |
|
| 204 | - ); |
|
| 205 | - } |
|
| 191 | + return new TemplateResponse( |
|
| 192 | + $this->appName, |
|
| 193 | + 'loginflow/authpicker', |
|
| 194 | + [ |
|
| 195 | + 'client' => $clientName, |
|
| 196 | + 'clientIdentifier' => $clientIdentifier, |
|
| 197 | + 'instanceName' => $this->defaults->getName(), |
|
| 198 | + 'urlGenerator' => $this->urlGenerator, |
|
| 199 | + 'stateToken' => $stateToken, |
|
| 200 | + 'serverHost' => $this->request->getServerHost(), |
|
| 201 | + 'oauthState' => $this->session->get('oauth.state'), |
|
| 202 | + ], |
|
| 203 | + 'guest' |
|
| 204 | + ); |
|
| 205 | + } |
|
| 206 | 206 | |
| 207 | - /** |
|
| 208 | - * @NoAdminRequired |
|
| 209 | - * @NoCSRFRequired |
|
| 210 | - * @UseSession |
|
| 211 | - * |
|
| 212 | - * @param string $stateToken |
|
| 213 | - * @param string $clientIdentifier |
|
| 214 | - * @return TemplateResponse |
|
| 215 | - */ |
|
| 216 | - public function redirectPage($stateToken = '', |
|
| 217 | - $clientIdentifier = '') { |
|
| 218 | - if(!$this->isValidToken($stateToken)) { |
|
| 219 | - return $this->stateTokenForbiddenResponse(); |
|
| 220 | - } |
|
| 207 | + /** |
|
| 208 | + * @NoAdminRequired |
|
| 209 | + * @NoCSRFRequired |
|
| 210 | + * @UseSession |
|
| 211 | + * |
|
| 212 | + * @param string $stateToken |
|
| 213 | + * @param string $clientIdentifier |
|
| 214 | + * @return TemplateResponse |
|
| 215 | + */ |
|
| 216 | + public function redirectPage($stateToken = '', |
|
| 217 | + $clientIdentifier = '') { |
|
| 218 | + if(!$this->isValidToken($stateToken)) { |
|
| 219 | + return $this->stateTokenForbiddenResponse(); |
|
| 220 | + } |
|
| 221 | 221 | |
| 222 | - return new TemplateResponse( |
|
| 223 | - $this->appName, |
|
| 224 | - 'loginflow/redirect', |
|
| 225 | - [ |
|
| 226 | - 'urlGenerator' => $this->urlGenerator, |
|
| 227 | - 'stateToken' => $stateToken, |
|
| 228 | - 'clientIdentifier' => $clientIdentifier, |
|
| 229 | - 'oauthState' => $this->session->get('oauth.state'), |
|
| 230 | - ], |
|
| 231 | - 'guest' |
|
| 232 | - ); |
|
| 233 | - } |
|
| 222 | + return new TemplateResponse( |
|
| 223 | + $this->appName, |
|
| 224 | + 'loginflow/redirect', |
|
| 225 | + [ |
|
| 226 | + 'urlGenerator' => $this->urlGenerator, |
|
| 227 | + 'stateToken' => $stateToken, |
|
| 228 | + 'clientIdentifier' => $clientIdentifier, |
|
| 229 | + 'oauthState' => $this->session->get('oauth.state'), |
|
| 230 | + ], |
|
| 231 | + 'guest' |
|
| 232 | + ); |
|
| 233 | + } |
|
| 234 | 234 | |
| 235 | - /** |
|
| 236 | - * @NoAdminRequired |
|
| 237 | - * @UseSession |
|
| 238 | - * |
|
| 239 | - * @param string $stateToken |
|
| 240 | - * @param string $clientIdentifier |
|
| 241 | - * @return Http\RedirectResponse|Response |
|
| 242 | - */ |
|
| 243 | - public function generateAppPassword($stateToken, |
|
| 244 | - $clientIdentifier = '') { |
|
| 245 | - if(!$this->isValidToken($stateToken)) { |
|
| 246 | - $this->session->remove(self::stateName); |
|
| 247 | - return $this->stateTokenForbiddenResponse(); |
|
| 248 | - } |
|
| 235 | + /** |
|
| 236 | + * @NoAdminRequired |
|
| 237 | + * @UseSession |
|
| 238 | + * |
|
| 239 | + * @param string $stateToken |
|
| 240 | + * @param string $clientIdentifier |
|
| 241 | + * @return Http\RedirectResponse|Response |
|
| 242 | + */ |
|
| 243 | + public function generateAppPassword($stateToken, |
|
| 244 | + $clientIdentifier = '') { |
|
| 245 | + if(!$this->isValidToken($stateToken)) { |
|
| 246 | + $this->session->remove(self::stateName); |
|
| 247 | + return $this->stateTokenForbiddenResponse(); |
|
| 248 | + } |
|
| 249 | 249 | |
| 250 | - $this->session->remove(self::stateName); |
|
| 250 | + $this->session->remove(self::stateName); |
|
| 251 | 251 | |
| 252 | - try { |
|
| 253 | - $sessionId = $this->session->getId(); |
|
| 254 | - } catch (SessionNotAvailableException $ex) { |
|
| 255 | - $response = new Response(); |
|
| 256 | - $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 257 | - return $response; |
|
| 258 | - } |
|
| 252 | + try { |
|
| 253 | + $sessionId = $this->session->getId(); |
|
| 254 | + } catch (SessionNotAvailableException $ex) { |
|
| 255 | + $response = new Response(); |
|
| 256 | + $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 257 | + return $response; |
|
| 258 | + } |
|
| 259 | 259 | |
| 260 | - try { |
|
| 261 | - $sessionToken = $this->tokenProvider->getToken($sessionId); |
|
| 262 | - $loginName = $sessionToken->getLoginName(); |
|
| 263 | - try { |
|
| 264 | - $password = $this->tokenProvider->getPassword($sessionToken, $sessionId); |
|
| 265 | - } catch (PasswordlessTokenException $ex) { |
|
| 266 | - $password = null; |
|
| 267 | - } |
|
| 268 | - } catch (InvalidTokenException $ex) { |
|
| 269 | - $response = new Response(); |
|
| 270 | - $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 271 | - return $response; |
|
| 272 | - } |
|
| 260 | + try { |
|
| 261 | + $sessionToken = $this->tokenProvider->getToken($sessionId); |
|
| 262 | + $loginName = $sessionToken->getLoginName(); |
|
| 263 | + try { |
|
| 264 | + $password = $this->tokenProvider->getPassword($sessionToken, $sessionId); |
|
| 265 | + } catch (PasswordlessTokenException $ex) { |
|
| 266 | + $password = null; |
|
| 267 | + } |
|
| 268 | + } catch (InvalidTokenException $ex) { |
|
| 269 | + $response = new Response(); |
|
| 270 | + $response->setStatus(Http::STATUS_FORBIDDEN); |
|
| 271 | + return $response; |
|
| 272 | + } |
|
| 273 | 273 | |
| 274 | - $clientName = $this->getClientName(); |
|
| 275 | - $client = false; |
|
| 276 | - if($clientIdentifier !== '') { |
|
| 277 | - $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
|
| 278 | - $clientName = $client->getName(); |
|
| 279 | - } |
|
| 274 | + $clientName = $this->getClientName(); |
|
| 275 | + $client = false; |
|
| 276 | + if($clientIdentifier !== '') { |
|
| 277 | + $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
|
| 278 | + $clientName = $client->getName(); |
|
| 279 | + } |
|
| 280 | 280 | |
| 281 | - $token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS); |
|
| 282 | - $uid = $this->userSession->getUser()->getUID(); |
|
| 283 | - $generatedToken = $this->tokenProvider->generateToken( |
|
| 284 | - $token, |
|
| 285 | - $uid, |
|
| 286 | - $loginName, |
|
| 287 | - $password, |
|
| 288 | - $clientName, |
|
| 289 | - IToken::PERMANENT_TOKEN, |
|
| 290 | - IToken::DO_NOT_REMEMBER |
|
| 291 | - ); |
|
| 281 | + $token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS); |
|
| 282 | + $uid = $this->userSession->getUser()->getUID(); |
|
| 283 | + $generatedToken = $this->tokenProvider->generateToken( |
|
| 284 | + $token, |
|
| 285 | + $uid, |
|
| 286 | + $loginName, |
|
| 287 | + $password, |
|
| 288 | + $clientName, |
|
| 289 | + IToken::PERMANENT_TOKEN, |
|
| 290 | + IToken::DO_NOT_REMEMBER |
|
| 291 | + ); |
|
| 292 | 292 | |
| 293 | - if($client) { |
|
| 294 | - $code = $this->random->generate(128); |
|
| 295 | - $accessToken = new AccessToken(); |
|
| 296 | - $accessToken->setClientId($client->getId()); |
|
| 297 | - $accessToken->setEncryptedToken($this->crypto->encrypt($token, $code)); |
|
| 298 | - $accessToken->setHashedCode(hash('sha512', $code)); |
|
| 299 | - $accessToken->setTokenId($generatedToken->getId()); |
|
| 300 | - $this->accessTokenMapper->insert($accessToken); |
|
| 293 | + if($client) { |
|
| 294 | + $code = $this->random->generate(128); |
|
| 295 | + $accessToken = new AccessToken(); |
|
| 296 | + $accessToken->setClientId($client->getId()); |
|
| 297 | + $accessToken->setEncryptedToken($this->crypto->encrypt($token, $code)); |
|
| 298 | + $accessToken->setHashedCode(hash('sha512', $code)); |
|
| 299 | + $accessToken->setTokenId($generatedToken->getId()); |
|
| 300 | + $this->accessTokenMapper->insert($accessToken); |
|
| 301 | 301 | |
| 302 | - $redirectUri = sprintf( |
|
| 303 | - '%s?state=%s&code=%s', |
|
| 304 | - $client->getRedirectUri(), |
|
| 305 | - urlencode($this->session->get('oauth.state')), |
|
| 306 | - urlencode($code) |
|
| 307 | - ); |
|
| 308 | - $this->session->remove('oauth.state'); |
|
| 309 | - } else { |
|
| 310 | - $redirectUri = 'nc://login/server:' . $this->request->getServerHost() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token); |
|
| 311 | - } |
|
| 302 | + $redirectUri = sprintf( |
|
| 303 | + '%s?state=%s&code=%s', |
|
| 304 | + $client->getRedirectUri(), |
|
| 305 | + urlencode($this->session->get('oauth.state')), |
|
| 306 | + urlencode($code) |
|
| 307 | + ); |
|
| 308 | + $this->session->remove('oauth.state'); |
|
| 309 | + } else { |
|
| 310 | + $redirectUri = 'nc://login/server:' . $this->request->getServerHost() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token); |
|
| 311 | + } |
|
| 312 | 312 | |
| 313 | - return new Http\RedirectResponse($redirectUri); |
|
| 314 | - } |
|
| 313 | + return new Http\RedirectResponse($redirectUri); |
|
| 314 | + } |
|
| 315 | 315 | } |