IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change Login page to more general page message

Browse Source
This commit is contained in:
Wolfgang Huß 2022-04-27 13:05:37 +02:00
parent baac1d8dde
commit 5c89fe545d
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/pages/Login.spec.js
View File

@ -211,7 +211,7 @@ describe('Login', () => {
await wrapper.find('input[placeholder="form.password"]').setValue('1234') await wrapper.find('input[placeholder="form.password"]').setValue('1234')
await flushPromises() await flushPromises()
apolloQueryMock.mockRejectedValue({ apolloQueryMock.mockRejectedValue({
message: '..No user with this credentials', message: '...No user with this credentials',
}) })
await wrapper.find('form').trigger('submit') await wrapper.find('form').trigger('submit')
await flushPromises() await flushPromises()
@ -222,7 +222,9 @@ describe('Login', () => {
}) })
it('toasts an error message', () => { it('toasts an error message', () => {
expect(toastErrorSpy).toBeCalledWith('error.no-account') expect(toastErrorSpy).toBeCalledWith(
'error.unknown-error...No user with this credentials',
)
}) })
describe('login fails with "User email not validated"', () => { describe('login fails with "User email not validated"', () => {

30
frontend/src/pages/Login.vue
View File

@ -60,18 +60,10 @@
<b-container v-else class="mt--8 p-1"> <b-container v-else class="mt--8 p-1">
<!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys--> <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
<message <message
v-if="errorReason === 'email-unvalidated'"
:headline="$t('site.thx.errorTitle')" :headline="$t('site.thx.errorTitle')"
:subtitle="$t('site.thx.activateEmail')" :subtitle="errorSubtitle"
:buttonText="$t('settings.password.reset')" :buttonText="$t('settings.password.reset')"
linkTo="/forgot-password" :linkTo="errorLinkTo"
/>
<message
v-else-if="errorReason === 'password-unset'"
:headline="$t('site.thx.errorTitle')"
:subtitle="$t('site.thx.unsetPassword')"
:buttonText="$t('settings.password.reset')"
linkTo="/reset-password/login"
/> />
<!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys--> <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
</b-container> </b-container>
@ -101,6 +93,8 @@ export default {
passwordVisible: false, passwordVisible: false,
showPageMessage: false, showPageMessage: false,
errorReason: null, errorReason: null,
errorSubtitle: '',
errorLinkTo: '',
CONFIG, CONFIG,
} }
}, },
@ -132,13 +126,23 @@ export default {
} }
}) })
.catch((error) => { .catch((error) => {
this.toastError(this.$t('error.no-account'))
if (error.message.includes('User email not validated')) { if (error.message.includes('User email not validated')) {
this.toastError(this.$t('error.no-account'))
this.showPageMessage = true this.showPageMessage = true
this.errorReason = 'email-unvalidated' this.errorSubtitle = this.$t('site.thx.activateEmail')
this.errorLinkTo = '/forgot-password'
} else if (error.message.includes('User has no password set yet')) { } else if (error.message.includes('User has no password set yet')) {
this.toastError(this.$t('error.no-account'))
this.showPageMessage = true this.showPageMessage = true
this.errorReason = 'password-unset' this.errorSubtitle = this.$t('site.thx.unsetPassword')
this.errorLinkTo = '/reset-password/login'
} else {
// appeared errors: 'GraphQL error: No user with this credentials'
const errorMessage = this.$t('error.unknown-error') + error.message
this.toastError(errorMessage)
this.showPageMessage = true
this.errorSubtitle = errorMessage
this.errorLinkTo = '/forgot-password'
} }
loader.hide() loader.hide()
}) })