diff --git a/controllers/account.go b/controllers/account.go index 2005beab..61001894 100644 --- a/controllers/account.go +++ b/controllers/account.go @@ -135,22 +135,23 @@ func (c *ApiController) Signup() { } user := &object.User{ - Owner: form.Organization, - Name: username, - CreatedTime: util.GetCurrentTime(), - Id: id, - Type: "normal-user", - Password: form.Password, - DisplayName: form.Name, - Avatar: organization.DefaultAvatar, - Email: form.Email, - Phone: form.Phone, - Address: []string{}, - Affiliation: form.Affiliation, - IsAdmin: false, - IsGlobalAdmin: false, - IsForbidden: false, - Properties: map[string]string{}, + Owner: form.Organization, + Name: username, + CreatedTime: util.GetCurrentTime(), + Id: id, + Type: "normal-user", + Password: form.Password, + DisplayName: form.Name, + Avatar: organization.DefaultAvatar, + Email: form.Email, + Phone: form.Phone, + Address: []string{}, + Affiliation: form.Affiliation, + IsAdmin: false, + IsGlobalAdmin: false, + IsForbidden: false, + SignupApplication: application.Name, + Properties: map[string]string{}, } affected := object.AddUser(user) diff --git a/controllers/auth.go b/controllers/auth.go index 06bcb86c..fff2b175 100644 --- a/controllers/auth.go +++ b/controllers/auth.go @@ -271,19 +271,20 @@ func (c *ApiController) Login() { properties := map[string]string{} properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2) user := &object.User{ - Owner: application.Organization, - Name: userInfo.Username, - CreatedTime: util.GetCurrentTime(), - Id: util.GenerateId(), - Type: "normal-user", - DisplayName: userInfo.DisplayName, - Avatar: userInfo.AvatarUrl, - Email: userInfo.Email, - Score: 200, - IsAdmin: false, - IsGlobalAdmin: false, - IsForbidden: false, - Properties: properties, + Owner: application.Organization, + Name: userInfo.Username, + CreatedTime: util.GetCurrentTime(), + Id: util.GenerateId(), + Type: "normal-user", + DisplayName: userInfo.DisplayName, + Avatar: userInfo.AvatarUrl, + Email: userInfo.Email, + Score: 200, + IsAdmin: false, + IsGlobalAdmin: false, + IsForbidden: false, + SignupApplication: application.Name, + Properties: properties, } object.AddUser(user) diff --git a/object/user.go b/object/user.go index 55d0688c..51c8f085 100644 --- a/object/user.go +++ b/object/user.go @@ -27,23 +27,24 @@ type User struct { CreatedTime string `xorm:"varchar(100)" json:"createdTime"` UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` - Id string `xorm:"varchar(100)" json:"id"` - Type string `xorm:"varchar(100)" json:"type"` - Password string `xorm:"varchar(100)" json:"password"` - DisplayName string `xorm:"varchar(100)" json:"displayName"` - Avatar string `xorm:"varchar(255)" json:"avatar"` - Email string `xorm:"varchar(100)" json:"email"` - Phone string `xorm:"varchar(100)" json:"phone"` - Address []string `json:"address"` - Affiliation string `xorm:"varchar(100)" json:"affiliation"` - Tag string `xorm:"varchar(100)" json:"tag"` - Language string `xorm:"varchar(100)" json:"language"` - Score int `json:"score"` - IsAdmin bool `json:"isAdmin"` - IsGlobalAdmin bool `json:"isGlobalAdmin"` - IsForbidden bool `json:"isForbidden"` - Hash string `xorm:"varchar(100)" json:"hash"` - PreHash string `xorm:"varchar(100)" json:"preHash"` + Id string `xorm:"varchar(100)" json:"id"` + Type string `xorm:"varchar(100)" json:"type"` + Password string `xorm:"varchar(100)" json:"password"` + DisplayName string `xorm:"varchar(100)" json:"displayName"` + Avatar string `xorm:"varchar(255)" json:"avatar"` + Email string `xorm:"varchar(100)" json:"email"` + Phone string `xorm:"varchar(100)" json:"phone"` + Address []string `json:"address"` + Affiliation string `xorm:"varchar(100)" json:"affiliation"` + Tag string `xorm:"varchar(100)" json:"tag"` + Language string `xorm:"varchar(100)" json:"language"` + Score int `json:"score"` + IsAdmin bool `json:"isAdmin"` + IsGlobalAdmin bool `json:"isGlobalAdmin"` + IsForbidden bool `json:"isForbidden"` + SignupApplication string `xorm:"varchar(100)" json:"signupApplication"` + Hash string `xorm:"varchar(100)" json:"hash"` + PreHash string `xorm:"varchar(100)" json:"preHash"` Github string `xorm:"varchar(100)" json:"github"` Google string `xorm:"varchar(100)" json:"google"`