diff --git a/object/application.go b/object/application.go index e14373a9..1c80d785 100644 --- a/object/application.go +++ b/object/application.go @@ -76,7 +76,6 @@ type Application struct { OrganizationObj *Organization `xorm:"-" json:"organizationObj"` CertPublicKey string `xorm:"-" json:"certPublicKey"` Tags []string `xorm:"mediumtext" json:"tags"` - InvitationCodes []string `xorm:"varchar(200)" json:"invitationCodes"` SamlAttributes []*SamlItem `xorm:"varchar(1000)" json:"samlAttributes"` ClientId string `xorm:"varchar(100)" json:"clientId"` @@ -392,10 +391,6 @@ func GetMaskedApplication(application *Application, userId string) *Application } } - if application.InvitationCodes != nil { - application.InvitationCodes = []string{"***"} - } - return application } diff --git a/object/check.go b/object/check.go index b65c174f..5b0e7614 100644 --- a/object/check.go +++ b/object/check.go @@ -128,18 +128,6 @@ func CheckUserSignup(application *Application, organization *Organization, authF } } - if len(application.InvitationCodes) > 0 { - if authForm.InvitationCode == "" { - if application.IsSignupItemRequired("Invitation code") { - return i18n.Translate(lang, "check:Invitation code cannot be blank") - } - } else { - if !util.InSlice(application.InvitationCodes, authForm.InvitationCode) { - return i18n.Translate(lang, "check:Invitation code is invalid") - } - } - } - for _, signupItem := range application.SignupItems { if signupItem.Regex == "" { continue diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js index 66829e0f..9c47dcdb 100644 --- a/web/src/ApplicationEditPage.js +++ b/web/src/ApplicationEditPage.js @@ -13,7 +13,7 @@ // limitations under the License. import React from "react"; -import {Button, Card, Col, ConfigProvider, Input, InputNumber, List, Popover, Radio, Result, Row, Select, Space, Switch, Upload} from "antd"; +import {Button, Card, Col, ConfigProvider, Input, InputNumber, Popover, Radio, Result, Row, Select, Switch, Upload} from "antd"; import {CopyOutlined, LinkOutlined, UploadOutlined} from "@ant-design/icons"; import * as ApplicationBackend from "./backend/ApplicationBackend"; import * as CertBackend from "./backend/CertBackend"; @@ -141,10 +141,6 @@ class ApplicationEditPage extends React.Component { application.tags = []; } - if (application.invitationCodes === null) { - application.invitationCodes = []; - } - this.setState({ application: application, }); @@ -873,52 +869,6 @@ class ApplicationEditPage extends React.Component { /> - - - {Setting.getLabel(i18next.t("application:Invitation code"), i18next.t("application:Invitation code - Tooltip"))} : - - - { - this.updateApplicationField("invitationCodes", Setting.addRow(this.state.application.invitationCodes, Setting.getRandomName())); - } - }> - {i18next.t("general:Add")} - - } - dataSource={this.state.application.invitationCodes.map(code => { - return {code: code}; - })} - renderItem={(item, index) => ( - - - { - const invitationCodes = [...this.state.application.invitationCodes]; - invitationCodes[index] = e.target.value; - this.updateApplicationField("invitationCodes", invitationCodes); - }} /> - - - - - - - )} - /> - - ) }