Commit23e5636

authored

fix: Use verified and primary email for GitHub signup (#1230)

This was causing a panic due to nil pointer dereference.It required all users signing up had a public email,which is an unreasonable requirement!

1 parent021e4cd commit23e5636Copy full SHA for 23e5636

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func (api api) userOAuth2Github(rw http.ResponseWriter, r http.Request) {`
`75`	`75`	`// Search for existing users with matching and verified emails.`
`76`	`76`	`// If a verified GitHub email matches a Coder user, we will return.`
`77`	`77`	`for_,email:=rangeemails {`
`78`		`-ifemail.Verified==nil {`
	`78`	`+if!email.GetVerified() {`
`79`	`79`	`continue`
`80`	`80`	`}`
`81`	`81`	`user,err=api.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{`
`@@ -123,8 +123,22 @@ func (api api) userOAuth2Github(rw http.ResponseWriter, r http.Request) {`
`123`	`123`	`})`
`124`	`124`	`return`
`125`	`125`	`}`
	`126`	`+varverifiedEmail*github.UserEmail`
	`127`	`+for_,email:=rangeemails {`
	`128`	`+if!email.GetPrimary()\|\|!email.GetVerified() {`
	`129`	`+continue`
	`130`	`+}`
	`131`	`+verifiedEmail=email`
	`132`	`+break`
	`133`	`+}`
	`134`	`+ifverifiedEmail==nil {`
	`135`	`+httpapi.Write(rw,http.StatusPreconditionRequired, httpapi.Response{`
	`136`	`+Message:"Your primary email must be verified on GitHub!",`
	`137`	`+})`
	`138`	`+return`
	`139`	`+}`
`126`	`140`	`user,_,err=api.createUser(r.Context(), codersdk.CreateUserRequest{`
`127`		`-Email:*ghUser.Email,`
	`141`	`+Email:*verifiedEmail.Email,`
`128`	`142`	`Username:*ghUser.Login,`
`129`	`143`	`OrganizationID:organizationID,`
`130`	`144`	`})`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,14 @@ func TestUserOAuth2Github(t *testing.T) {`
`142`	`142`	`AuthenticatedUser:func(ctx context.Context,clienthttp.Client) (github.User,error) {`
`143`	`143`	`return&github.User{`
`144`	`144`	`Login:github.String("kyle"),`
`145`		`-Email:github.String("kyle@coder.com"),`
`146`	`145`	`},nil`
`147`	`146`	`},`
`148`	`147`	`ListEmails:func(ctx context.Context,clienthttp.Client) ([]github.UserEmail,error) {`
`149`		`-return []*github.UserEmail{},nil`
	`148`	`+return []*github.UserEmail{{`
	`149`	`+Email:github.String("kyle@coder.com"),`
	`150`	`+Verified:github.Bool(true),`
	`151`	`+Primary:github.Bool(true),`
	`152`	`+}},nil`
`150`	`153`	`},`
`151`	`154`	`},`
`152`	`155`	`})`

Comments

(0)