llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 20:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix the bug that autoSignin generates two callback AJAX calls (#1682)

Browse Source
This commit is contained in:
Yaodong Yu
2023-03-24 23:17:54 +08:00
committed by GitHub
parent 989fec72bf
commit 337ee2faef
4 changed files with 73 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/auth/SignupPage.js
View File

@ -65,8 +65,7 @@ class SignupPage extends React.Component {
super(props);
this.state = {
classes: props,
applicationName: props.match.params?.applicationName ?? authConfig.appName,
application: null,
applicationName: props.match?.params?.applicationName ?? authConfig.appName,
email: "",
phone: "",
countryCode: "",
@ -83,20 +82,17 @@ class SignupPage extends React.Component {
}
componentDidMount() {
let applicationName = this.state.applicationName;
const oAuthParams = Util.getOAuthGetParameters();
if (oAuthParams !== null) {
applicationName = oAuthParams.state;
this.setState({applicationName: oAuthParams.state});
const signinUrl = window.location.href.replace("/signup/oauth/authorize", "/login/oauth/authorize");
sessionStorage.setItem("signinUrl", signinUrl);
}
if (this.getApplicationObj() === null) {
if (applicationName !== undefined) {
this.getApplication(applicationName);
if (this.getApplicationObj() === undefined) {
if (this.state.applicationName !== null) {
this.getApplication(this.state.applicationName);
} else {
Setting.showMessage("error", `Unknown application name: ${applicationName}`);
Setting.showMessage("error", `Unknown application name: ${this.state.applicationName}`);
}
}
}
@ -109,9 +105,6 @@ class SignupPage extends React.Component {
ApplicationBackend.getApplication("admin", applicationName)
.then((application) => {
this.onUpdateApplication(application);
this.setState({
application: application,
});
if (application !== null && application !== undefined) {
Setting.getTermsOfUseContent(application.termsOfUse, res => {
@ -134,7 +127,7 @@ class SignupPage extends React.Component {
}
getApplicationObj() {
return this.props.application ?? this.state.application;
return this.props.application;
}
onUpdateAccount(account) {
@ -596,7 +589,7 @@ class SignupPage extends React.Component {
render() {
const application = this.getApplicationObj();
if (application === null) {
if (application === undefined || application === null) {
return null;
}