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

fix: country/region prompted page not show when signin (#1047)

Browse Source
This commit is contained in:
Resulte Lee 2022-08-21 17:41:07 +08:00 committed by GitHub
parent 7312c5ce3c
commit 39c6bd5850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/Setting.js
View File

@ -320,6 +320,19 @@ function isProviderItemAnswered(user, application, providerItem) {
return linkedValue !== undefined && linkedValue !== ""; return linkedValue !== undefined && linkedValue !== "";
} }
function isSignupItemAnswered(user, signupItem) {
if (user === null) {
return false;
}
if (signupItem.name !== "Country/Region") {
return true;
}
const value = user["region"];
return value !== undefined && value !== "";
}
export function isPromptAnswered(user, application) { export function isPromptAnswered(user, application) {
if (!isAffiliationAnswered(user, application)) { if (!isAffiliationAnswered(user, application)) {
return false; return false;
@ -331,6 +344,13 @@ export function isPromptAnswered(user, application) {
return false; return false;
} }
} }
const signupItems = getAllPromptedSignupItems(application);
for (let i = 0; i < signupItems.length; i++) {
if (!isSignupItemAnswered(user, signupItems[i])) {
return false;
}
}
return true; return true;
} }