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

feat: support all captcha for login (#1619)

Browse Source 
* refactor: captcha modal

* feat: support all captcha when login

* chore: improve i18 in loginPage.js
This commit is contained in:
Yaodong Yu
2023-03-05 20:31:46 +08:00
committed by GitHub
parent f8bc87eb4e
commit e8a7b7ee9c
19 changed files with 160 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,13 +82,13 @@ class LoginPage extends React.Component {
componentDidUpdate(prevProps, prevState, snapshot) {
if (this.state.application && !prevState.application) {
const defaultCaptchaProviderItems = this.getDefaultCaptchaProviderItems(this.state.application);
const captchaProviderItems = this.getCaptchaProviderItems(this.state.application);
if (!defaultCaptchaProviderItems) {
if (!captchaProviderItems) {
return;
}
this.setState({enableCaptchaModal: defaultCaptchaProviderItems.some(providerItem => providerItem.rule === "Always")});
this.setState({enableCaptchaModal: captchaProviderItems.some(providerItem => providerItem.rule === "Always")});
}
}
@ -228,7 +228,7 @@ class LoginPage extends React.Component {
Setting.goToLinkSoft(ths, `/prompt/${application.name}?redirectUri=${oAuthParams.redirectUri}&code=${code}&state=${oAuthParams.state}`);
}
} else {
Setting.showMessage("error", `Failed to sign in: ${res.msg}`);
Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
}
});
} else {
@ -262,13 +262,7 @@ class LoginPage extends React.Component {
if (this.state.loginMethod === "password" && this.state.enableCaptchaModal) {
this.setState({
openCaptchaModal: true,
verifyCaptcha: (captchaType, captchaToken, secret) => {
values["captchaType"] = captchaType;
values["captchaToken"] = captchaToken;
values["clientSecret"] = secret;
this.login(values);
},
values: values,
});
} else {
this.login(values);
@ -290,8 +284,6 @@ class LoginPage extends React.Component {
}
Setting.showMessage("success", msg);
this.setState({openCaptchaModal: false});
if (casParams.service !== "") {
const st = res.data;
const newUrl = new URL(casParams.service);
@ -299,8 +291,7 @@ class LoginPage extends React.Component {
window.location.href = newUrl.toString();
}
} else {
this.setState({openCaptchaModal: false});
Setting.showMessage("error", `Failed to log in: ${res.msg}`);
Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
}
});
} else {
@ -338,8 +329,7 @@ class LoginPage extends React.Component {
}
}
} else {
this.setState({openCaptchaModal: false});
Setting.showMessage("error", `Failed to log in: ${res.msg}`);
Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
}
});
}
@ -549,7 +539,7 @@ class LoginPage extends React.Component {
}
}
getDefaultCaptchaProviderItems(application) {
getCaptchaProviderItems(application) {
const providers = application?.providers;
if (providers === undefined || providers === null) {
@ -561,7 +551,7 @@ class LoginPage extends React.Component {
return false;
}
return providerItem.provider.category === "Captcha" && providerItem.provider.type === "Default";
return providerItem.provider.category === "Captcha";
});
}
@ -570,22 +560,25 @@ class LoginPage extends React.Component {
return null;
}
const provider = this.getDefaultCaptchaProviderItems(application)
const provider = this.getCaptchaProviderItems(application)
.filter(providerItem => providerItem.rule === "Always")
.map(providerItem => providerItem.provider)[0];
return <CaptchaModal
owner={provider.owner}
name={provider.name}
captchaType={provider.type}
subType={provider.subType}
clientId={provider.clientId}
clientId2={provider.clientId2}
clientSecret={provider.clientSecret}
clientSecret2={provider.clientSecret2}
open={this.state.openCaptchaModal}
onOk={(captchaType, captchaToken, secret) => this.state.verifyCaptcha?.(captchaType, captchaToken, secret)}
canCancel={false}
visible={this.state.openCaptchaModal}
onOk={(captchaType, captchaToken, clientSecret) => {
const values = this.state.values;
values["captchaType"] = captchaType;
values["captchaToken"] = captchaToken;
values["clientSecret"] = clientSecret;
this.login(values);
this.setState({openCaptchaModal: false});
}}
onCancel={() => this.setState({openCaptchaModal: false})}
isCurrentProvider={true}
/>;
}