mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 02:35:49 +08:00
feat: update signinUrl storage to include pathname and query parameters only to prevent new tab popup after password reset (#3587)
This commit is contained in:
parent
f8d44e2dca
commit
26718bc4a1
@ -68,7 +68,7 @@ class LoginPage extends React.Component {
|
|||||||
this.state.applicationName = props.match?.params?.casApplicationName;
|
this.state.applicationName = props.match?.params?.casApplicationName;
|
||||||
}
|
}
|
||||||
|
|
||||||
localStorage.setItem("signinUrl", window.location.href);
|
localStorage.setItem("signinUrl", window.location.pathname + window.location.search);
|
||||||
|
|
||||||
this.form = React.createRef();
|
this.form = React.createRef();
|
||||||
}
|
}
|
||||||
@ -314,7 +314,7 @@ class LoginPage extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (resp.data2) {
|
if (resp.data2) {
|
||||||
sessionStorage.setItem("signinUrl", window.location.href);
|
sessionStorage.setItem("signinUrl", window.location.pathname + window.location.search);
|
||||||
Setting.goToLinkSoft(ths, `/forget/${application.name}`);
|
Setting.goToLinkSoft(ths, `/forget/${application.name}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -454,7 +454,7 @@ class LoginPage extends React.Component {
|
|||||||
|
|
||||||
if (responseType === "login") {
|
if (responseType === "login") {
|
||||||
if (res.data2) {
|
if (res.data2) {
|
||||||
sessionStorage.setItem("signinUrl", window.location.href);
|
sessionStorage.setItem("signinUrl", window.location.pathname + window.location.search);
|
||||||
Setting.goToLink(this, `/forget/${this.state.applicationName}`);
|
Setting.goToLink(this, `/forget/${this.state.applicationName}`);
|
||||||
}
|
}
|
||||||
Setting.showMessage("success", i18next.t("application:Logged in successfully"));
|
Setting.showMessage("success", i18next.t("application:Logged in successfully"));
|
||||||
@ -463,7 +463,7 @@ class LoginPage extends React.Component {
|
|||||||
this.postCodeLoginAction(res);
|
this.postCodeLoginAction(res);
|
||||||
} else if (responseType === "token" || responseType === "id_token") {
|
} else if (responseType === "token" || responseType === "id_token") {
|
||||||
if (res.data2) {
|
if (res.data2) {
|
||||||
sessionStorage.setItem("signinUrl", window.location.href);
|
sessionStorage.setItem("signinUrl", window.location.pathname + window.location.search);
|
||||||
Setting.goToLink(this, `/forget/${this.state.applicationName}`);
|
Setting.goToLink(this, `/forget/${this.state.applicationName}`);
|
||||||
}
|
}
|
||||||
const amendatoryResponseType = responseType === "token" ? "access_token" : responseType;
|
const amendatoryResponseType = responseType === "token" ? "access_token" : responseType;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user