Merge pull request #1308 from gradido/fix-navigation-after-email-confirmation

fix: Redirect after Email Confirmation
This commit is contained in:
Moriz Wahl 2022-01-18 15:13:37 +01:00 committed by GitHub
commit 1fb253ce1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -50,7 +50,7 @@ const routes = [
path: '/thx/:comingFrom',
component: () => import('../views/Pages/thx.vue'),
beforeEnter: (to, from, next) => {
const validFrom = ['password', 'reset', 'register', 'login', 'Login']
const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail']
if (!validFrom.includes(from.path.split('/')[1])) {
next({ path: '/login' })
} else {

View File

@ -63,7 +63,7 @@ describe('ForgotPassword', () => {
})
it('links to login', () => {
expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/Login')
expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/login')
})
})

View File

@ -32,7 +32,7 @@
</b-col>
</b-row>
<div class="text-center py-lg-4">
<router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
<router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
</div>
</b-container>
</div>