Skip to content

Commit c332ca7

Browse files
authored
Merge pull request #59790 from nextcloud/fix/fix-passwordless-login-redirect
fix: Harmonize login and passwordless login redirect behavior
2 parents be5d980 + ce30e42 commit c332ca7

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

core/src/components/login/PasswordLessLoginForm.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
</template>
5252

5353
<script type="ts">
54+
import { getBaseUrl } from '@nextcloud/router'
5455
import { browserSupportsWebAuthn } from '@simplewebauthn/browser'
5556
import { defineComponent } from 'vue'
5657
import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
@@ -147,8 +148,15 @@ export default defineComponent({
147148
148149
return finishAuthentication(challenge)
149150
.then(({ defaultRedirectUrl }) => {
150-
logger.debug('Logged in redirecting') // Redirect url might be false so || should be used instead of ??.
151-
window.location.href = redirectUrl || defaultRedirectUrl
151+
logger.debug('Logged in redirecting')
152+
if (redirectUrl) {
153+
if (redirectUrl.charAt(0) !== '/') {
154+
redirectUrl = '/' + redirectUrl
155+
}
156+
window.location.href = getBaseUrl() + redirectUrl
157+
} else {
158+
window.location.href = defaultRedirectUrl
159+
}
152160
})
153161
.catch((error) => {
154162
logger.debug('GOT AN ERROR WHILE SUBMITTING CHALLENGE!', { error }) // Example: timeout, interaction refused...

dist/core-login.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)