enterprise/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-10-31 09:27:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SignupApplication to user.

Browse Source
This commit is contained in:
Yang Luo
2021-06-21 10:22:47 +08:00
parent 64f85fdc6c
commit 9c233e42c0
3 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
controllers/account.go
View File

@ -135,22 +135,23 @@ func (c *ApiController) Signup() {
} }
user := &object.User{ user := &object.User{
Owner: form.Organization, Owner: form.Organization,
Name: username, Name: username,
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
Id: id, Id: id,
Type: "normal-user", Type: "normal-user",
Password: form.Password, Password: form.Password,
DisplayName: form.Name, DisplayName: form.Name,
Avatar: organization.DefaultAvatar, Avatar: organization.DefaultAvatar,
Email: form.Email, Email: form.Email,
Phone: form.Phone, Phone: form.Phone,
Address: []string{}, Address: []string{},
Affiliation: form.Affiliation, Affiliation: form.Affiliation,
IsAdmin: false, IsAdmin: false,
IsGlobalAdmin: false, IsGlobalAdmin: false,
IsForbidden: false, IsForbidden: false,
Properties: map[string]string{}, SignupApplication: application.Name,
Properties: map[string]string{},
} }
affected := object.AddUser(user) affected := object.AddUser(user)

27
controllers/auth.go
View File

@ -271,19 +271,20 @@ func (c *ApiController) Login() {
properties := map[string]string{} properties := map[string]string{}
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2) properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
user := &object.User{ user := &object.User{
Owner: application.Organization, Owner: application.Organization,
Name: userInfo.Username, Name: userInfo.Username,
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
Id: util.GenerateId(), Id: util.GenerateId(),
Type: "normal-user", Type: "normal-user",
DisplayName: userInfo.DisplayName, DisplayName: userInfo.DisplayName,
Avatar: userInfo.AvatarUrl, Avatar: userInfo.AvatarUrl,
Email: userInfo.Email, Email: userInfo.Email,
Score: 200, Score: 200,
IsAdmin: false, IsAdmin: false,
IsGlobalAdmin: false, IsGlobalAdmin: false,
IsForbidden: false, IsForbidden: false,
Properties: properties, SignupApplication: application.Name,
Properties: properties,
} }
object.AddUser(user) object.AddUser(user)

35
object/user.go
View File

@ -27,23 +27,24 @@ type User struct {
CreatedTime string `xorm:"varchar(100)" json:"createdTime"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"`
Id string `xorm:"varchar(100)" json:"id"` Id string `xorm:"varchar(100)" json:"id"`
Type string `xorm:"varchar(100)" json:"type"` Type string `xorm:"varchar(100)" json:"type"`
Password string `xorm:"varchar(100)" json:"password"` Password string `xorm:"varchar(100)" json:"password"`
DisplayName string `xorm:"varchar(100)" json:"displayName"` DisplayName string `xorm:"varchar(100)" json:"displayName"`
Avatar string `xorm:"varchar(255)" json:"avatar"` Avatar string `xorm:"varchar(255)" json:"avatar"`
Email string `xorm:"varchar(100)" json:"email"` Email string `xorm:"varchar(100)" json:"email"`
Phone string `xorm:"varchar(100)" json:"phone"` Phone string `xorm:"varchar(100)" json:"phone"`
Address []string `json:"address"` Address []string `json:"address"`
Affiliation string `xorm:"varchar(100)" json:"affiliation"` Affiliation string `xorm:"varchar(100)" json:"affiliation"`
Tag string `xorm:"varchar(100)" json:"tag"` Tag string `xorm:"varchar(100)" json:"tag"`
Language string `xorm:"varchar(100)" json:"language"` Language string `xorm:"varchar(100)" json:"language"`
Score int `json:"score"` Score int `json:"score"`
IsAdmin bool `json:"isAdmin"` IsAdmin bool `json:"isAdmin"`
IsGlobalAdmin bool `json:"isGlobalAdmin"` IsGlobalAdmin bool `json:"isGlobalAdmin"`
IsForbidden bool `json:"isForbidden"` IsForbidden bool `json:"isForbidden"`
Hash string `xorm:"varchar(100)" json:"hash"` SignupApplication string `xorm:"varchar(100)" json:"signupApplication"`
PreHash string `xorm:"varchar(100)" json:"preHash"` Hash string `xorm:"varchar(100)" json:"hash"`
PreHash string `xorm:"varchar(100)" json:"preHash"`
Github string `xorm:"varchar(100)" json:"github"` Github string `xorm:"varchar(100)" json:"github"`
Google string `xorm:"varchar(100)" json:"google"` Google string `xorm:"varchar(100)" json:"google"`