mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-18 11:23:50 +08:00
Add EnableSignUp.
This commit is contained in:
@ -152,15 +152,22 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
resp = c.HandleLoggedIn(userId, &form)
|
resp = c.HandleLoggedIn(userId, &form)
|
||||||
} else {
|
} else {
|
||||||
//if object.IsForbidden(userId) {
|
//if userId := object.GetUserIdByField(application, "email", userInfo.Email); userId != "" {
|
||||||
// c.forbiddenAccountResp(userId)
|
// resp = c.HandleLoggedIn(userId, &form)
|
||||||
// return
|
//
|
||||||
|
// object.LinkUserAccount(userId, provider.Type, userInfo.Username)
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if userId := object.GetUserIdByField(application, "email", userInfo.Email); userId != "" {
|
if !application.EnableSignUp {
|
||||||
resp = c.HandleLoggedIn(userId, &form)
|
resp = &Response{Status: "error", Msg: fmt.Sprintf("the account for provider: %s and username: %s does not exist and is not allowed to register as new account, please contact your IT support", provider.Type, userInfo.Username)}
|
||||||
|
c.Data["json"] = resp
|
||||||
object.LinkUserAccount(userId, provider.Type, userInfo.Username)
|
c.ServeJSON()
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
resp = &Response{Status: "error", Msg: "need sign up"}
|
||||||
|
c.Data["json"] = resp
|
||||||
|
c.ServeJSON()
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//resp = &Response{Status: "ok", Msg: "", Data: res}
|
//resp = &Response{Status: "ok", Msg: "", Data: res}
|
||||||
|
@ -30,6 +30,7 @@ type Application struct {
|
|||||||
Description string `xorm:"varchar(100)" json:"description"`
|
Description string `xorm:"varchar(100)" json:"description"`
|
||||||
Organization string `xorm:"varchar(100)" json:"organization"`
|
Organization string `xorm:"varchar(100)" json:"organization"`
|
||||||
EnablePassword bool `json:"enablePassword"`
|
EnablePassword bool `json:"enablePassword"`
|
||||||
|
EnableSignUp bool `json:"enableSignUp"`
|
||||||
Providers []string `xorm:"varchar(100)" json:"providers"`
|
Providers []string `xorm:"varchar(100)" json:"providers"`
|
||||||
ProviderObjs []*Provider `xorm:"-" json:"providerObjs"`
|
ProviderObjs []*Provider `xorm:"-" json:"providerObjs"`
|
||||||
|
|
||||||
|
@ -226,6 +226,16 @@ class ApplicationEditPage extends React.Component {
|
|||||||
}} />
|
}} />
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
|
<Row style={{marginTop: '20px'}} >
|
||||||
|
<Col style={{marginTop: '5px'}} span={2}>
|
||||||
|
{i18next.t("application:Enable Sign Up")}:
|
||||||
|
</Col>
|
||||||
|
<Col span={1} >
|
||||||
|
<Switch checked={this.state.application.enableSignUp} onChange={checked => {
|
||||||
|
this.updateApplicationField('enableSignUp', checked);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
<Row style={{marginTop: '20px'}} >
|
<Row style={{marginTop: '20px'}} >
|
||||||
<Col style={{marginTop: '5px'}} span={2}>
|
<Col style={{marginTop: '5px'}} span={2}>
|
||||||
{i18next.t("general:Providers")}:
|
{i18next.t("general:Providers")}:
|
||||||
|
@ -49,7 +49,8 @@ class ApplicationListPage extends React.Component {
|
|||||||
createdTime: moment().format(),
|
createdTime: moment().format(),
|
||||||
displayName: `New Application - ${this.state.applications.length}`,
|
displayName: `New Application - ${this.state.applications.length}`,
|
||||||
logo: "https://cdn.casbin.com/logo/logo_1024x256.png",
|
logo: "https://cdn.casbin.com/logo/logo_1024x256.png",
|
||||||
EnablePassword: true,
|
enablePassword: true,
|
||||||
|
enableSignUp: true,
|
||||||
providers: [],
|
providers: [],
|
||||||
redirectUris: [],
|
redirectUris: [],
|
||||||
expireInHours: 24 * 7,
|
expireInHours: 24 * 7,
|
||||||
|
@ -83,10 +83,14 @@ class AuthCallback extends React.Component {
|
|||||||
// Util.showMessage("success", `Authorization code: ${res.data}`);
|
// Util.showMessage("success", `Authorization code: ${res.data}`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Util.showMessage("error", `Log in failed:${res.msg}`);
|
if (res.msg === "need sign up") {
|
||||||
this.setState({
|
Util.goToLink("/register");
|
||||||
msg: res.msg,
|
} else {
|
||||||
});
|
// Util.showMessage("error", `Log in failed:${res.msg}`);
|
||||||
|
this.setState({
|
||||||
|
msg: res.msg,
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import {Alert, Button, message, Result} from "antd";
|
import {Alert, Button, message, Result} from "antd";
|
||||||
|
import * as Setting from "../Setting";
|
||||||
|
|
||||||
export function goToLink(link) {
|
export function goToLink(link) {
|
||||||
window.location.href = link;
|
window.location.href = link;
|
||||||
@ -58,10 +59,12 @@ export function renderMessageLarge(msg) {
|
|||||||
title="Login Error"
|
title="Login Error"
|
||||||
subTitle={msg}
|
subTitle={msg}
|
||||||
extra={[
|
extra={[
|
||||||
<Button type="primary" key="details">
|
<Button key="home" onClick={() => Setting.goToLink("/")}>
|
||||||
Details
|
Home
|
||||||
|
</Button>,
|
||||||
|
<Button type="primary" key="help" onClick={() => Setting.goToLink("/help")}>
|
||||||
|
Help
|
||||||
</Button>,
|
</Button>,
|
||||||
<Button key="help">Help</Button>,
|
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
</Result>
|
</Result>
|
||||||
|
Reference in New Issue
Block a user