llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-18 18:23:49 +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
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) 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}

1
object/application.go
View File

@ -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"`

10
web/src/ApplicationEditPage.js
View File

@ -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")}:

3
web/src/ApplicationListPage.js
View File

@ -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,

248
web/src/UrlTable.js
View File

@ -1,124 +1,124 @@
// Copyright 2021 The casbin Authors. All Rights Reserved. // Copyright 2021 The casbin Authors. All Rights Reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
// You may obtain a copy of the License at // You may obtain a copy of the License at
// //
// http://www.apache.org/licenses/LICENSE-2.0 // http://www.apache.org/licenses/LICENSE-2.0
// //
// Unless required by applicable law or agreed to in writing, software // Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, // distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import React from "react"; import React from "react";
import {DownOutlined, DeleteOutlined, UpOutlined} from '@ant-design/icons'; import {DownOutlined, DeleteOutlined, UpOutlined} from '@ant-design/icons';
import {Button, Col, Input, Row, Table, Tooltip} from 'antd'; import {Button, Col, Input, Row, Table, Tooltip} from 'antd';
import * as Setting from "./Setting"; import * as Setting from "./Setting";
class UrlTable extends React.Component { class UrlTable extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
classes: props, classes: props,
}; };
} }
updateTable(table) { updateTable(table) {
this.props.onUpdateTable(table); this.props.onUpdateTable(table);
} }
updateField(table, index, value) { updateField(table, index, value) {
table[index] = value; table[index] = value;
this.updateTable(table); this.updateTable(table);
} }
addRow(table) { addRow(table) {
let row = ""; let row = "";
if (table === undefined) { if (table === undefined) {
table = []; table = [];
} }
table = Setting.addRow(table, row); table = Setting.addRow(table, row);
this.updateTable(table); this.updateTable(table);
} }
deleteRow(table, i) { deleteRow(table, i) {
table = Setting.deleteRow(table, i); table = Setting.deleteRow(table, i);
this.updateTable(table); this.updateTable(table);
} }
upRow(table, i) { upRow(table, i) {
table = Setting.swapRow(table, i - 1, i); table = Setting.swapRow(table, i - 1, i);
this.updateTable(table); this.updateTable(table);
} }
downRow(table, i) { downRow(table, i) {
table = Setting.swapRow(table, i, i + 1); table = Setting.swapRow(table, i, i + 1);
this.updateTable(table); this.updateTable(table);
} }
renderTable(table) { renderTable(table) {
const columns = [ const columns = [
{ {
title: 'Redirect URLs', title: 'Redirect URLs',
dataIndex: 'id', dataIndex: 'id',
key: 'id', key: 'id',
render: (text, record, index) => { render: (text, record, index) => {
return ( return (
<Input value={text} onChange={e => { <Input value={text} onChange={e => {
this.updateField(table, index, e.target.value); this.updateField(table, index, e.target.value);
}} /> }} />
) )
} }
}, },
{ {
title: 'Action', title: 'Action',
key: 'action', key: 'action',
width: '120px', width: '120px',
render: (text, record, index) => { render: (text, record, index) => {
return ( return (
<div> <div>
<Tooltip placement="bottomLeft" title="Up"> <Tooltip placement="bottomLeft" title="Up">
<Button style={{marginRight: "5px"}} disabled={index === 0} icon={<UpOutlined />} size="small" onClick={() => this.upRow(table, index)} /> <Button style={{marginRight: "5px"}} disabled={index === 0} icon={<UpOutlined />} size="small" onClick={() => this.upRow(table, index)} />
</Tooltip> </Tooltip>
<Tooltip placement="topLeft" title="Down"> <Tooltip placement="topLeft" title="Down">
<Button style={{marginRight: "5px"}} disabled={index === table.length - 1} icon={<DownOutlined />} size="small" onClick={() => this.downRow(table, index)} /> <Button style={{marginRight: "5px"}} disabled={index === table.length - 1} icon={<DownOutlined />} size="small" onClick={() => this.downRow(table, index)} />
</Tooltip> </Tooltip>
<Tooltip placement="topLeft" title="Delete"> <Tooltip placement="topLeft" title="Delete">
<Button icon={<DeleteOutlined />} size="small" onClick={() => this.deleteRow(table, index)} /> <Button icon={<DeleteOutlined />} size="small" onClick={() => this.deleteRow(table, index)} />
</Tooltip> </Tooltip>
</div> </div>
); );
} }
}, },
]; ];
return ( return (
<Table columns={columns} dataSource={table.map(row => ({id: row}))} size="middle" bordered pagination={{pageSize: 100}} <Table columns={columns} dataSource={table.map(row => ({id: row}))} size="middle" bordered pagination={{pageSize: 100}}
title={() => ( title={() => (
<div> <div>
{this.props.title}&nbsp;&nbsp;&nbsp;&nbsp; {this.props.title}&nbsp;&nbsp;&nbsp;&nbsp;
<Button style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.addRow(table)}>Add</Button> <Button style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.addRow(table)}>Add</Button>
</div> </div>
)} )}
/> />
); );
} }
render() { render() {
return ( return (
<div> <div>
<Row style={{marginTop: '20px'}} > <Row style={{marginTop: '20px'}} >
<Col span={24}> <Col span={24}>
{ {
this.renderTable(this.props.table) this.renderTable(this.props.table)
} }
</Col> </Col>
</Row> </Row>
</div> </div>
) )
} }
} }
export default UrlTable; export default UrlTable;

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

@ -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,
});
}
} }
}); });
} }

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

@ -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>