Skip to content

chore: add github.com user id association #14045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 2, 2024
Merged

chore: add github.com user id association #14045

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a394a8f
chore: add github.com user id association
kylecarbs Jul 29, 2024
8f6a654
gen
kylecarbs Jul 29, 2024
86c3f28
Fix model query
kylecarbs Jul 29, 2024
8b5e866
Fix linting
kylecarbs Jul 29, 2024
5bae8ef
Ignore auditing github.com user id
kylecarbs Jul 29, 2024
78d2bcc
Add test
kylecarbs Jul 29, 2024
b1229f5
Fix gh url var name
kylecarbs Jul 30, 2024
ff84b73
Update migration
kylecarbs Jul 31, 2024
f9214ed
Update coderd/database/dbauthz/dbauthz.go
kylecarbs Jul 31, 2024
f6bed73
Fix updating to when the token changes
kylecarbs Jul 31, 2024
7f4f9fc
Fix migration
kylecarbs Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix updating to when the token changes
  • Loading branch information
@kylecarbs
kylecarbs committed Aug 2, 2024
commit f6bed7302331ed56ad3c7902dc9fe8f3e5ddfd78
24 changes: 12 additions & 12 deletions coderd/externalauth/externalauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,19 +189,19 @@ validate:
return updatedAuthLink, xerrors.Errorf("update external auth link: %w", err)
}
externalAuthLink = updatedAuthLink
}

// Update the associated users github.com username if the token is for github.com.
if IsGithubDotComURL(c.AuthCodeURL("")) && user != nil {
err = db.UpdateUserGithubComUserID(ctx, database.UpdateUserGithubComUserIDParams{
ID: externalAuthLink.UserID,
GithubComUserID: sql.NullInt64{
Int64: user.ID,
Valid: true,
},
})
if err != nil {
return externalAuthLink, xerrors.Errorf("update user github com user id: %w", err)
// Update the associated users github.com username if the token is for github.com.
if IsGithubDotComURL(c.AuthCodeURL("")) && user != nil {
err = db.UpdateUserGithubComUserID(ctx, database.UpdateUserGithubComUserIDParams{
ID: externalAuthLink.UserID,
GithubComUserID: sql.NullInt64{
Int64: user.ID,
Valid: true,
},
})
if err != nil {
return externalAuthLink, xerrors.Errorf("update user github com user id: %w", err)
}
}
}

Expand Down