mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: add github.com user id association (#14045)
* chore: add github.com user id association This will eventually be used to show an indicator in the UI to star the repository if you've been using Coder for a while and have not starred the repo. If you have, we'll never show a thing! * gen * Fix model query * Fix linting * Ignore auditing github.com user id * Add test * Fix gh url var name * Update migration * Update coderd/database/dbauthz/dbauthz.go Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com> * Fix updating to when the token changes * Fix migration --------- Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>
This commit is contained in:
co-authored by
Steven Masley
parent
4d4d27c509
commit
6e36082b0f
@@ -660,11 +660,12 @@ func ConvertUser(dbUser database.User) User {
|
||||
emailHashed = fmt.Sprintf("%x%s", hash[:], dbUser.Email[atSymbol:])
|
||||
}
|
||||
return User{
|
||||
ID: dbUser.ID,
|
||||
EmailHashed: emailHashed,
|
||||
RBACRoles: dbUser.RBACRoles,
|
||||
CreatedAt: dbUser.CreatedAt,
|
||||
Status: dbUser.Status,
|
||||
ID: dbUser.ID,
|
||||
EmailHashed: emailHashed,
|
||||
RBACRoles: dbUser.RBACRoles,
|
||||
CreatedAt: dbUser.CreatedAt,
|
||||
Status: dbUser.Status,
|
||||
GithubComUserID: dbUser.GithubComUserID.Int64,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -836,10 +837,11 @@ type User struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
// Email is only filled in for the first/admin user!
|
||||
Email *string `json:"email"`
|
||||
EmailHashed string `json:"email_hashed"`
|
||||
RBACRoles []string `json:"rbac_roles"`
|
||||
Status database.UserStatus `json:"status"`
|
||||
Email *string `json:"email"`
|
||||
EmailHashed string `json:"email_hashed"`
|
||||
RBACRoles []string `json:"rbac_roles"`
|
||||
Status database.UserStatus `json:"status"`
|
||||
GithubComUserID int64 `json:"github_com_user_id"`
|
||||
}
|
||||
|
||||
type Group struct {
|
||||
|
||||
Reference in New Issue
Block a user