Apr 29, 2022 · Apr 29, 2022
diff --git a/coderd/userauth.go b/coderd/userauth.go
 // Search for existing users with matching and verified emails.
 // If a verified GitHub email matches a Coder user, we will return.
 for _, email := range emails {
 if email.Verified == nil {
 if!email.GetVerified() {
 continue
 }
 user, err = api.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{
 })
 return
 }
 var verifiedEmail *github.UserEmail
 for _, email := range emails {
 if !email.GetPrimary() || !email.GetVerified() {
 continue
 }
 verifiedEmail = email
 break
 }
 if verifiedEmail == nil {
 httpapi.Write(rw, http.StatusPreconditionRequired, httpapi.Response{
 Message: "Your primary email must be verified on GitHub!",
 })
 return
 }
 user, _, err = api.createUser(r.Context(), codersdk.CreateUserRequest{
 Email:          *ghUser.Email,
 Email:          *verifiedEmail.Email,
 Username:       *ghUser.Login,
 OrganizationID: organizationID,
 })
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
 AuthenticatedUser: func(ctx context.Context, client *http.Client) (*github.User, error) {
 return &github.User{
 Login: github.String("kyle"),
 Email: github.String("kyle@coder.com"),
 }, nil
 },
 ListEmails: func(ctx context.Context, client *http.Client) ([]*github.UserEmail, error) {
 return []*github.UserEmail{}, nil
 return []*github.UserEmail{{
 Email:    github.String("kyle@coder.com"),
 Verified: github.Bool(true),
 Primary:  github.Bool(true),
 }}, nil
 },
 },
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,7 +75,7 @@ func (api api) userOAuth2Github(rw http.ResponseWriter, r http.Request) {
		// Search for existing users with matching and verified emails.
		// If a verified GitHub email matches a Coder user, we will return.
		for _, email := range emails {
		if email.Verified == nil {
		if!email.GetVerified() {
		continue
		}
		user, err = api.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{
Expand DownExpand Up		@@ -123,8 +123,22 @@ func (api api) userOAuth2Github(rw http.ResponseWriter, r http.Request) {
		})
		return
		}
		var verifiedEmail *github.UserEmail
		for _, email := range emails {
		if !email.GetPrimary() \|\| !email.GetVerified() {
		continue
		}
		verifiedEmail = email
		break
		}
		if verifiedEmail == nil {
		httpapi.Write(rw, http.StatusPreconditionRequired, httpapi.Response{
		Message: "Your primary email must be verified on GitHub!",
		})
		return
		}
		user, _, err = api.createUser(r.Context(), codersdk.CreateUserRequest{
		Email: *ghUser.Email,
		Email: *verifiedEmail.Email,
		Username: *ghUser.Login,
		OrganizationID: organizationID,
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,11 +142,14 @@ func TestUserOAuth2Github(t *testing.T) {
		AuthenticatedUser: func(ctx context.Context, client http.Client) (github.User, error) {
		return &github.User{
		Login: github.String("kyle"),
		Email: github.String("kyle@coder.com"),
		}, nil
		},
		ListEmails: func(ctx context.Context, client http.Client) ([]github.UserEmail, error) {
		return []*github.UserEmail{}, nil
		return []*github.UserEmail{{
		Email: github.String("kyle@coder.com"),
		Verified: github.Bool(true),
		Primary: github.Bool(true),
		}}, nil
		},
		},
		})
Expand Down