From 33493eaeb0fd5861ac1b1502dde9edd9f9448814 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 7 Sep 2022 15:12:12 +0000 Subject: [PATCH 1/3] fix: fix creating users with wrong login type --- coderd/userauth.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coderd/userauth.go b/coderd/userauth.go index c540f4cc213a5..e19e66947a19b 100644 --- a/coderd/userauth.go +++ b/coderd/userauth.go @@ -73,6 +73,8 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) { break } } + + selectedMembership = &github.Membership{} if selectedMembership == nil { httpapi.Write(rw, http.StatusUnauthorized, codersdk.Response{ Message: "You aren't a member of the authorized Github organizations!", @@ -364,7 +366,7 @@ func (api *API) oauthLogin(r *http.Request, params oauthLoginParams) (*http.Cook Username: params.Username, OrganizationID: organizationID, }, - LoginType: database.LoginTypeOIDC, + LoginType: params.LoginType, }) if err != nil { return xerrors.Errorf("create user: %w", err) From e880a1f4e3b357ca0ccbce6582f6525c8b5a0a12 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 7 Sep 2022 15:20:15 +0000 Subject: [PATCH 2/3] remove test code --- coderd/userauth.go | 1 - 1 file changed, 1 deletion(-) diff --git a/coderd/userauth.go b/coderd/userauth.go index e19e66947a19b..d259d86a8e7ce 100644 --- a/coderd/userauth.go +++ b/coderd/userauth.go @@ -74,7 +74,6 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) { } } - selectedMembership = &github.Membership{} if selectedMembership == nil { httpapi.Write(rw, http.StatusUnauthorized, codersdk.Response{ Message: "You aren't a member of the authorized Github organizations!", From b6f21b5490bf1e070a507682baf033b8c54640f2 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 7 Sep 2022 15:20:31 +0000 Subject: [PATCH 3/3] newline --- coderd/userauth.go | 1 - 1 file changed, 1 deletion(-) diff --git a/coderd/userauth.go b/coderd/userauth.go index d259d86a8e7ce..1345e25de8699 100644 --- a/coderd/userauth.go +++ b/coderd/userauth.go @@ -73,7 +73,6 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) { break } } - if selectedMembership == nil { httpapi.Write(rw, http.StatusUnauthorized, codersdk.Response{ Message: "You aren't a member of the authorized Github organizations!",