Mar 20, 2025 · Mar 20, 2025
diff --git a/coderd/userauth.go b/coderd/userauth.go
 }
 // If the user is logging in with github.com we update their associated
 // GitHub user ID to the new one.
 if externalauth.IsGithubDotComURL(api.GithubOAuth2Config.AuthCodeURL("")) && user.GithubComUserID.Int64 != ghUser.GetID() {
 // We use AuthCodeURL from the OAuth2Config field instead of the one on
 // GithubOAuth2Config because when device flow is configured, AuthCodeURL
 // is overridden and returns a value that doesn't pass the URL check.
 if externalauth.IsGithubDotComURL(api.GithubOAuth2Config.OAuth2Config.AuthCodeURL("")) && user.GithubComUserID.Int64 != ghUser.GetID() {
 err = api.Database.UpdateUserGithubComUserID(ctx, database.UpdateUserGithubComUserIDParams{
 ID: user.ID,
 GithubComUserID: sql.NullInt64{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1096,7 +1096,10 @@ func (api API) userOAuth2Github(rw http.ResponseWriter, r http.Request) {
		}
		// If the user is logging in with github.com we update their associated
		// GitHub user ID to the new one.
		if externalauth.IsGithubDotComURL(api.GithubOAuth2Config.AuthCodeURL("")) && user.GithubComUserID.Int64 != ghUser.GetID() {
		// We use AuthCodeURL from the OAuth2Config field instead of the one on
		// GithubOAuth2Config because when device flow is configured, AuthCodeURL
		// is overridden and returns a value that doesn't pass the URL check.
		if externalauth.IsGithubDotComURL(api.GithubOAuth2Config.OAuth2Config.AuthCodeURL("")) && user.GithubComUserID.Int64 != ghUser.GetID() {
hugodutka marked this conversation as resolved. Show resolvedHide resolved
		err = api.Database.UpdateUserGithubComUserID(ctx, database.UpdateUserGithubComUserIDParams{
		ID: user.ID,
		GithubComUserID: sql.NullInt64{
Expand Down