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

Add EnableSignUp.

Browse Source
This commit is contained in:
Yang Luo 2021-03-26 21:55:39 +08:00
parent da38f7a6ba
commit b6b433f26a
7 changed files with 165 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
controllers/auth.go
View File

@ -152,15 +152,22 @@ func (c *ApiController) Login() {
resp = c.HandleLoggedIn(userId, &form)
} else {
//if object.IsForbidden(userId) {
// c.forbiddenAccountResp(userId)
// return
//if userId := object.GetUserIdByField(application, "email", userInfo.Email); userId != "" {
// resp = c.HandleLoggedIn(userId, &form)
//
// object.LinkUserAccount(userId, provider.Type, userInfo.Username)
//}
if userId := object.GetUserIdByField(application, "email", userInfo.Email); userId != "" {
resp = c.HandleLoggedIn(userId, &form)
object.LinkUserAccount(userId, provider.Type, userInfo.Username)
if !application.EnableSignUp {
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
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}

1
object/application.go
View File

@ -30,6 +30,7 @@ type Application struct {
Description string `xorm:"varchar(100)" json:"description"`
Organization string `xorm:"varchar(100)" json:"organization"`
EnablePassword bool `json:"enablePassword"`
EnableSignUp bool `json:"enableSignUp"`
Providers []string `xorm:"varchar(100)" json:"providers"`
ProviderObjs []*Provider `xorm:"-" json:"providerObjs"`

10
web/src/ApplicationEditPage.js
View File

@ -226,6 +226,16 @@ class ApplicationEditPage extends React.Component {
}} />
</Col>
</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'}} >
<Col style={{marginTop: '5px'}} span={2}>
{i18next.t("general:Providers")}:

3
web/src/ApplicationListPage.js
View File

@ -49,7 +49,8 @@ class ApplicationListPage extends React.Component {
createdTime: moment().format(),
displayName: `New Application - ${this.state.applications.length}`,
logo: "https://cdn.casbin.com/logo/logo_1024x256.png",
EnablePassword: true,
enablePassword: true,
enableSignUp: true,
providers: [],
redirectUris: [],
expireInHours: 24 * 7,

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

@ -83,10 +83,14 @@ class AuthCallback extends React.Component {
// Util.showMessage("success", `Authorization code: ${res.data}`);
}
} else {
// Util.showMessage("error", `Log in failed：${res.msg}`);
this.setState({
msg: res.msg,
});
if (res.msg === "need sign up") {
Util.goToLink("/register");
} else {
// Util.showMessage("error", `Log in failed：${res.msg}`);
this.setState({
msg: res.msg,
});
}
}
});
}

9
web/src/auth/Util.js
View File

@ -14,6 +14,7 @@
import React from "react";
import {Alert, Button, message, Result} from "antd";
import * as Setting from "../Setting";
export function goToLink(link) {
window.location.href = link;
@ -58,10 +59,12 @@ export function renderMessageLarge(msg) {
title="Login Error"
subTitle={msg}
extra={[
<Button type="primary" key="details">
Details
<Button key="home" onClick={() => Setting.goToLink("/")}>
Home
</Button>,
<Button type="primary" key="help" onClick={() => Setting.goToLink("/help")}>
Help
</Button>,
<Button key="help">Help</Button>,
]}
>
</Result>