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

feat: can redirect user to login page after linking provider in prompt page (#3820)

Browse Source
This commit is contained in:
DacongDA
2025-05-23 07:15:53 +08:00
committed by GitHub
parent 9035ca365a
commit 33afc52a0b
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/auth/AuthCallback.js
View File

@ -193,7 +193,11 @@ class AuthCallback extends React.Component {
const token = res.data; const token = res.data;
Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}${responseType}=${token}&state=${oAuthParams.state}&token_type=bearer`); Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}${responseType}=${token}&state=${oAuthParams.state}&token_type=bearer`);
} else if (responseType === "link") { } else if (responseType === "link") {
const from = innerParams.get("from"); let from = innerParams.get("from");
const oauth = innerParams.get("oauth");
if (oauth) {
from += `?oauth=${oauth}`;
}
Setting.goToLinkSoftOrJumpSelf(this, from); Setting.goToLinkSoftOrJumpSelf(this, from);
} else if (responseType === "saml") { } else if (responseType === "saml") {
if (res.data2.method === "POST") { if (res.data2.method === "POST") {

4
web/src/auth/PromptPage.js
View File

@ -194,8 +194,10 @@ class PromptPage extends React.Component {
const redirectUri = params.get("redirectUri"); const redirectUri = params.get("redirectUri");
const code = params.get("code"); const code = params.get("code");
const state = params.get("state"); const state = params.get("state");
const oauth = params.get("oauth");
if (redirectUri === null || code === null || state === null) { if (redirectUri === null || code === null || state === null) {
return ""; const signInUrl = sessionStorage.getItem("signinUrl");
return oauth === "true" ? signInUrl : "";
} }
return `${redirectUri}?code=${code}&state=${state}`; return `${redirectUri}?code=${code}&state=${state}`;
} }

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

@ -195,8 +195,9 @@ class SignupPage extends React.Component {
if (authConfig.appName === application.name) { if (authConfig.appName === application.name) {
return "/result"; return "/result";
} else { } else {
const oAuthParams = Util.getOAuthGetParameters();
if (Setting.hasPromptPage(application)) { if (Setting.hasPromptPage(application)) {
return `/prompt/${application.name}`; return `/prompt/${application.name}?oauth=${oAuthParams !== null}`;
} else { } else {
return `/result/${application.name}`; return `/result/${application.name}`;
} }