MFA验证登录逻辑修改
continuous-integration/drone/push Build is running Details

uat_us
wangxiaoshuang 2025-01-03 09:42:47 +08:00
parent 5328217853
commit 6e66b77857
2 changed files with 18 additions and 15 deletions

View File

@ -134,9 +134,9 @@ export default {
let res = await verifyMFACode(this.form); let res = await verifyMFACode(this.form);
this.loading = false; this.loading = false;
if (res.IsSuccess) { if (res.IsSuccess) {
if (this.status === "login") { // if (this.status === "login") {
this.$message.success(this.$t("mfa:message:verifySuccess")); // this.$message.success(this.$t("mfa:message:verifySuccess"));
} // }
this.$emit("success", this.form.IdentityUserId); this.$emit("success", this.form.IdentityUserId);
this.cancel(); this.cancel();
} }
@ -153,9 +153,9 @@ export default {
clearInterval(this.timer); clearInterval(this.timer);
this.timer = null; this.timer = null;
} }
let data = { // let data = {
UserId: this.form.IdentityUserId, // IdentityUserId: this.form.IdentityUserId,
}; // };
if (this.status === "lock") { if (this.status === "lock") {
data.MfaType = 1; data.MfaType = 1;
} }

View File

@ -420,7 +420,7 @@ export default {
UserId: res.BasicInfo.IdentityUserId, UserId: res.BasicInfo.IdentityUserId,
EMail: res.BasicInfo.EMail, EMail: res.BasicInfo.EMail,
username: this.loginForm.username, username: this.loginForm.username,
callBack: this.loginIn, callBack: this.changeRoleLogin,
cancelBack: () => { cancelBack: () => {
this.loading = false this.loading = false
}, },
@ -432,14 +432,7 @@ export default {
// // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning')) // // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
// this.$message.warning(this.$t('login:message:login4')) // this.$message.warning(this.$t('login:message:login4'))
// } // }
if ( this.changeRoleLogin()
Array.isArray(this.$store.state.user.roles) &&
this.$store.state.user.roles.length === 1
) {
this.loginByRole(this.$store.state.user.roles[0].Id)
return
}
return (this.toggleRoleVisible = true)
}) })
.catch(() => { .catch(() => {
this.showCode = true this.showCode = true
@ -502,6 +495,16 @@ export default {
this.toggleRoleLoading = false this.toggleRoleLoading = false
}) })
}, },
changeRoleLogin() {
if (
Array.isArray(this.$store.state.user.roles) &&
this.$store.state.user.roles.length === 1
) {
this.loginByRole(this.$store.state.user.roles[0].Id)
return
}
return (this.toggleRoleVisible = true)
},
cancel() { cancel() {
this.showCode = true this.showCode = true
this.loading = false this.loading = false