mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-18 00:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

support resending verify mail on mobile device

Browse Source
This commit is contained in:
MaysWind
2023-09-17 19:32:12 +08:00
parent b0ae731fa6
commit afcd4f7262
4 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/VerifyEmailPage.vue
+1 -7
View File
@@ -27,13 +27,7 @@
<p class="mb-0" v-if="token && verified">{{ $t('Email has been verified') }}</p>
<p class="mb-0" v-if="token && !verified && errorMessage">{{ errorMessage }}</p>
<p class="mb-0" v-if="!token && !email">{{ $t('Parameter Invalid') }}</p>
<p class="mb-0" v-if="!token && email">
<span v-if="hasValidEmailVerifyToken">{{ $t('Account activation link has been sent to your email address:') }}</span>
<span class="ml-1" v-if="hasValidEmailVerifyToken">{{ email }}</span>
<span class="ml-1" v-if="hasValidEmailVerifyToken">{{ $t(', If you don\'t receive the mail, fill password and click the button below to resend the verify mail.') }}</span>
<span v-if="!hasValidEmailVerifyToken">{{ $t('If you don\'t receive the mail, fill password and click the button below to resend the verify mail to:') }}</span>
<span class="ml-1" v-if="!hasValidEmailVerifyToken">{{ email }}</span>
</p>
<p class="mb-0" v-if="!token && email">{{ $t(hasValidEmailVerifyToken ? 'format.misc.accountActivationAndResendValidationEmailTip' : 'format.misc.resendValidationEmailTip', { email: email }) }}</p>
</v-card-text>
<v-card-text class="pb-0 mb-6">
src/views/mobile/LoginPage.vue
+62 -1
View File
@@ -162,6 +162,15 @@
</div>
</f7-page-content>
</f7-sheet>
<password-input-sheet :title="$t('Verify your email')"
:hint="$t(hasValidEmailVerifyToken ? 'format.misc.accountActivationAndResendValidationEmailTip' : 'format.misc.resendValidationEmailTip', { email: resendVerifyEmail })"
:confirm-disabled="requestingResendVerifyEmail"
:cancel-disabled="requestingResendVerifyEmail"
v-model:show="showVerifyEmailSheet"
v-model="currentPasswordForResendVerifyEmail"
@password:confirm="requestResendVerifyEmail">
</password-input-sheet>
</f7-page>
</template>
@@ -172,7 +181,11 @@ import { useSettingsStore } from '@/stores/setting.js';
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
import assetConstants from '@/consts/asset.js';
import { isUserRegistrationEnabled, isUserForgetPasswordEnabled } from '@/lib/server_settings.js';
import {
isUserRegistrationEnabled,
isUserForgetPasswordEnabled,
isUserVerifyEmailEnabled
} from '@/lib/server_settings.js';
import { getDesktopVersionPath } from '@/lib/version.js';
import { isModalShowing } from '@/lib/ui.mobile.js';
@@ -188,11 +201,16 @@ export default {
backupCode: '',
tempToken: '',
forgetPasswordEmail: '',
resendVerifyEmail: '',
hasValidEmailVerifyToken: false,
currentPasswordForResendVerifyEmail: '',
logining: false,
verifying: false,
requestingForgetPassword: false,
requestingResendVerifyEmail: false,
show2faSheet: false,
showForgetPasswordSheet: false,
showVerifyEmailSheet: false,
twoFAVerifyType: 'passcode'
};
},
@@ -238,6 +256,9 @@ export default {
},
currentLanguageName() {
return this.$locale.getCurrentLanguageDisplayName();
},
isUserVerifyEmailEnabled() {
return isUserVerifyEmailEnabled();
}
},
methods: {
@@ -261,6 +282,9 @@ export default {
}
self.logining = true;
self.resendVerifyEmail = '';
self.hasValidEmailVerifyToken = false;
self.currentPasswordForResendVerifyEmail = '';
self.$showLoading(() => self.logining);
self.rootStore.authorize({
@@ -290,6 +314,14 @@ export default {
self.logining = false;
self.$hideLoading();
if (self.isUserVerifyEmailEnabled && error.error && error.error.errorCode === 201020 && error.error.context && error.error.context.email) {
self.resendVerifyEmail = error.error.context.email;
self.hasValidEmailVerifyToken = error.error.context.hasValidEmailVerifyToken || false;
self.currentPasswordForResendVerifyEmail = '';
self.showVerifyEmailSheet = true;
return;
}
if (!error.processed) {
self.$toast(error.message || error);
}
@@ -376,6 +408,35 @@ export default {
}
});
},
requestResendVerifyEmail() {
const self = this;
if (!self.currentPasswordForResendVerifyEmail) {
self.$toast('Current password cannot be empty');
return;
}
self.requestingResendVerifyEmail = true;
self.$showLoading(() => self.requestingResendVerifyEmail);
self.rootStore.resendVerifyEmailByUnloginUser({
email: self.resendVerifyEmail,
password: self.currentPasswordForResendVerifyEmail
}).then(() => {
self.requestingResendVerifyEmail = false;
self.$hideLoading();
self.$toast('Validation email has been sent');
self.showVerifyEmailSheet = false;
}).catch(error => {
self.requestingResendVerifyEmail = false;
self.$hideLoading();
if (!error.processed) {
self.$toast(error.message || error);
}
});
},
switch2FAVerifyType() {
if (this.twoFAVerifyType === 'passcode') {
this.twoFAVerifyType = 'backupcode';