llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix loading status not reset issue when failed to login (#3743)

Browse Source
This commit is contained in:
DacongDA 2025-04-24 00:57:52 +08:00 committed by GitHub
parent 7d1c614452
commit d3a5539dae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/auth/LoginPage.js
View File

@ -391,6 +391,9 @@ class LoginPage extends React.Component {
}).then(res => res.json()) }).then(res => res.json())
.then((res) => { .then((res) => {
if (res.status === "error") { if (res.status === "error") {
this.setState({
loginLoading: false,
});
Setting.showMessage("error", res.msg); Setting.showMessage("error", res.msg);
return; return;
} }
@ -455,6 +458,7 @@ class LoginPage extends React.Component {
} else { } else {
Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
} }
}).finally(() => {
this.setState({loginLoading: false}); this.setState({loginLoading: false});
}); });
} else { } else {
@ -511,6 +515,7 @@ class LoginPage extends React.Component {
} else { } else {
Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
} }
}).finally(() => {
this.setState({loginLoading: false}); this.setState({loginLoading: false});
}); });
} }
@ -720,7 +725,7 @@ class LoginPage extends React.Component {
values["FaceIdImage"] = FaceIdImage; values["FaceIdImage"] = FaceIdImage;
this.login(values); this.login(values);
this.setState({openFaceRecognitionModal: false}); this.setState({openFaceRecognitionModal: false});
}} onCancel={() => this.setState({openFaceRecognitionModal: false})} /></Suspense> : }} onCancel={() => this.setState({openFaceRecognitionModal: false, loginLoading: false})} /></Suspense> :
<Suspense fallback={null}> <Suspense fallback={null}>
<FaceRecognitionModal <FaceRecognitionModal
visible={this.state.openFaceRecognitionModal} visible={this.state.openFaceRecognitionModal}
@ -731,7 +736,7 @@ class LoginPage extends React.Component {
this.login(values); this.login(values);
this.setState({openFaceRecognitionModal: false}); this.setState({openFaceRecognitionModal: false});
}} }}
onCancel={() => this.setState({openFaceRecognitionModal: false})} onCancel={() => this.setState({openFaceRecognitionModal: false, loginLoading: false})}
/> />
</Suspense> </Suspense>
: :
@ -1065,6 +1070,10 @@ class LoginPage extends React.Component {
.catch(error => { .catch(error => {
Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}${error}`); Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}${error}`);
}); });
}).finally(() => {
this.setState({
loginLoading: false,
});
}); });
} }