Fix loginflow with apptoken enter on iOS
It seems iOS doesn't like us to change the location. So now we submit it to the server that geneartes the redirect. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
3c3cb71bda
commit
2757a42907
|
@ -336,4 +336,34 @@ class ClientFlowLoginController extends Controller {
|
|||
|
||||
return new Http\RedirectResponse($redirectUri);
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
*/
|
||||
public function apptokenRedirect(string $stateToken, string $user, string $password) {
|
||||
if (!$this->isValidToken($stateToken)) {
|
||||
return $this->stateTokenForbiddenResponse();
|
||||
}
|
||||
|
||||
$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password);
|
||||
return new Http\RedirectResponse($redirectUri);
|
||||
}
|
||||
|
||||
private function getServerPath() {
|
||||
$serverPostfix = '';
|
||||
if (strpos($this->request->getRequestUri(), '/index.php') !== false) {
|
||||
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php'));
|
||||
} else if (strpos($this->request->getRequestUri(), '/login/flow') !== false) {
|
||||
$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/flow'));
|
||||
}
|
||||
$protocol = $this->request->getServerProtocol();
|
||||
if ($protocol !== "https") {
|
||||
$xForwardedProto = $this->request->getHeader('X-Forwarded-Proto');
|
||||
$xForwardedSSL = $this->request->getHeader('X-Forwarded-Ssl');
|
||||
if ($xForwardedProto === 'https' || $xForwardedSSL === 'on') {
|
||||
$protocol = 'https';
|
||||
}
|
||||
}
|
||||
return $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,12 +5,4 @@ jQuery(document).ready(function() {
|
|||
$('#redirect-link').addClass('hidden');
|
||||
$('#app-token-login-field').removeClass('hidden');
|
||||
});
|
||||
|
||||
$('#submit-app-token-login').click(function(e) {
|
||||
e.preventDefault();
|
||||
window.location.href = 'nc://login/server:'
|
||||
+ encodeURIComponent($('#serverHost').val())
|
||||
+ "&user:" + encodeURIComponent($('#user').val())
|
||||
+ "&password:" + encodeURIComponent($('#password').val());
|
||||
});
|
||||
});
|
||||
|
|
|
@ -53,6 +53,7 @@ $application->registerRoutes($this, [
|
|||
['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
|
||||
['name' => 'ClientFlowLogin#redirectPage', 'url' => '/login/flow/redirect', 'verb' => 'GET'],
|
||||
['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
|
||||
['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
|
||||
['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
|
||||
['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
|
||||
['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
|
||||
|
|
|
@ -44,7 +44,7 @@ $urlGenerator = $_['urlGenerator'];
|
|||
</a>
|
||||
</p>
|
||||
|
||||
<fieldset id="app-token-login-field" class="hidden">
|
||||
<form action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLogin.apptokenRedirect')); ?>" method="post" id="app-token-login-field" class="hidden">
|
||||
<p class="grouptop">
|
||||
<input type="text" name="user" id="user" placeholder="<?php p($l->t('Username')) ?>">
|
||||
<label for="user" class="infield"><?php p($l->t('Username')) ?></label>
|
||||
|
@ -53,9 +53,10 @@ $urlGenerator = $_['urlGenerator'];
|
|||
<input type="password" name="password" id="password" placeholder="<?php p($l->t('App token')) ?>">
|
||||
<label for="password" class="infield"><?php p($l->t('Password')) ?></label>
|
||||
</p>
|
||||
<input type="hidden" id="serverHost" value="<?php p($_['serverHost']) ?>" />
|
||||
<input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" />
|
||||
<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>">
|
||||
<input id="submit-app-token-login" type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Grant access')) ?>">
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<?php if(empty($_['oauthState'])): ?>
|
||||
|
|
Loading…
Reference in New Issue