Add organization.DefaultPassword

This commit is contained in:
Yang Luo 2023-10-18 11:58:25 +08:00
parent f2e2b960ff
commit a616127909
6 changed files with 28 additions and 0 deletions

View File

@ -15,6 +15,7 @@
"tags": [], "tags": [],
"languages": ["en", "zh", "es", "fr", "de", "id", "ja", "ko", "ru", "vi", "it", "ms", "tr","ar", "he", "nl", "pl", "fi", "sv", "uk", "kk", "fa"], "languages": ["en", "zh", "es", "fr", "de", "id", "ja", "ko", "ru", "vi", "it", "ms", "tr","ar", "he", "nl", "pl", "fi", "sv", "uk", "kk", "fa"],
"masterPassword": "", "masterPassword": "",
"defaultPassword": "",
"initScore": 2000, "initScore": 2000,
"enableSoftDeletion": false, "enableSoftDeletion": false,
"isProfilePublic": true, "isProfilePublic": true,

View File

@ -315,6 +315,9 @@ func GetMaskedApplication(application *Application, userId string) *Application
if application.OrganizationObj.MasterPassword != "" { if application.OrganizationObj.MasterPassword != "" {
application.OrganizationObj.MasterPassword = "***" application.OrganizationObj.MasterPassword = "***"
} }
if application.OrganizationObj.DefaultPassword != "" {
application.OrganizationObj.DefaultPassword = "***"
}
if application.OrganizationObj.PasswordType != "" { if application.OrganizationObj.PasswordType != "" {
application.OrganizationObj.PasswordType = "***" application.OrganizationObj.PasswordType = "***"
} }

View File

@ -64,6 +64,7 @@ type Organization struct {
Languages []string `xorm:"varchar(255)" json:"languages"` Languages []string `xorm:"varchar(255)" json:"languages"`
ThemeData *ThemeData `xorm:"json" json:"themeData"` ThemeData *ThemeData `xorm:"json" json:"themeData"`
MasterPassword string `xorm:"varchar(100)" json:"masterPassword"` MasterPassword string `xorm:"varchar(100)" json:"masterPassword"`
DefaultPassword string `xorm:"varchar(100)" json:"defaultPassword"`
InitScore int `json:"initScore"` InitScore int `json:"initScore"`
EnableSoftDeletion bool `json:"enableSoftDeletion"` EnableSoftDeletion bool `json:"enableSoftDeletion"`
IsProfilePublic bool `json:"isProfilePublic"` IsProfilePublic bool `json:"isProfilePublic"`
@ -155,6 +156,9 @@ func GetMaskedOrganization(organization *Organization, errs ...error) (*Organiza
if organization.MasterPassword != "" { if organization.MasterPassword != "" {
organization.MasterPassword = "***" organization.MasterPassword = "***"
} }
if organization.DefaultPassword != "" {
organization.DefaultPassword = "***"
}
return organization, nil return organization, nil
} }
@ -202,9 +206,14 @@ func UpdateOrganization(id string, organization *Organization) (bool, error) {
} }
session := ormer.Engine.ID(core.PK{owner, name}).AllCols() session := ormer.Engine.ID(core.PK{owner, name}).AllCols()
if organization.MasterPassword == "***" { if organization.MasterPassword == "***" {
session.Omit("master_password") session.Omit("master_password")
} }
if organization.DefaultPassword == "***" {
session.Omit("default_password")
}
affected, err := session.Update(organization) affected, err := session.Update(organization)
if err != nil { if err != nil {
return false, err return false, err

View File

@ -696,6 +696,10 @@ func AddUser(user *User) (bool, error) {
return false, nil return false, nil
} }
if organization.DefaultPassword != "" && user.Password == "123" {
user.Password = organization.DefaultPassword
}
if user.PasswordType == "" || user.PasswordType == "plain" { if user.PasswordType == "" || user.PasswordType == "plain" {
user.UpdateUserPassword(organization) user.UpdateUserPassword(organization)
} }

View File

@ -313,6 +313,16 @@ class OrganizationEditPage extends React.Component {
}} /> }} />
</Col> </Col>
</Row> </Row>
<Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
{Setting.getLabel(i18next.t("general:Default password"), i18next.t("general:Default password - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.organization.defaultPassword} onChange={e => {
this.updateOrganizationField("defaultPassword", e.target.value);
}} />
</Col>
</Row>
<Row style={{marginTop: "20px"}} > <Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}> <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
{Setting.getLabel(i18next.t("organization:Init score"), i18next.t("organization:Init score - Tooltip"))} : {Setting.getLabel(i18next.t("organization:Init score"), i18next.t("organization:Init score - Tooltip"))} :

View File

@ -41,6 +41,7 @@ class OrganizationListPage extends BaseListPage {
tags: [], tags: [],
languages: Setting.Countries.map(item => item.key), languages: Setting.Countries.map(item => item.key),
masterPassword: "", masterPassword: "",
defaultPassword: "",
enableSoftDeletion: false, enableSoftDeletion: false,
isProfilePublic: true, isProfilePublic: true,
accountItems: [ accountItems: [