fix some tests

sreya · sreya · commit 8f63d5cb9de7 · 2022-08-10T00:27:05.000Z
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -206,34 +206,6 @@ func TestUserOAuth2Github(t *testing.T) {
 		resp := oauth2Callback(t, client)
 		require.Equal(t, http.StatusTemporaryRedirect, resp.StatusCode)
 	})
-	t.Run("Login", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, &coderdtest.Options{
-			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config:       &oauth2Config{},
-				AllowOrganizations: []string{"coder"},
-				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
-					return []*github.Membership{{
-						Organization: &github.Organization{
-							Login: github.String("coder"),
-						},
-					}}, nil
-				},
-				AuthenticatedUser: func(ctx context.Context, client *http.Client) (*github.User, error) {
-					return &github.User{}, nil
-				},
-				ListEmails: func(ctx context.Context, client *http.Client) ([]*github.UserEmail, error) {
-					return []*github.UserEmail{{
-						Email:    github.String("testuser@coder.com"),
-						Verified: github.Bool(true),
-					}}, nil
-				},
-			},
-		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		resp := oauth2Callback(t, client)
-		require.Equal(t, http.StatusTemporaryRedirect, resp.StatusCode)
-	})
 	t.Run("SignupAllowedTeam", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, &coderdtest.Options{
@@ -361,6 +333,7 @@ func TestUserOIDC(t *testing.T) {
 				user, err := client.User(ctx, "me")
 				require.NoError(t, err)
 				require.Equal(t, tc.Username, user.Username)
+				require.Equal(t, "https://coder.com||hello", user.LinkedID)
 			}
 		})
 	}
@@ -404,6 +377,27 @@ func TestUserOIDC(t *testing.T) {
 		resp := oidcCallback(t, client)
 		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
 	})
+
+	// Test that we do not allow collisions with pre-existing accounts
+	// of differing login types.
+	t.Run("InvalidLoginType", func(t *testing.T) {
+		t.Parallel()
+		config := createOIDCConfig(t, jwt.MapClaims{
+			"email":              "kyle@kwc.io",
+			"email_verified":     true,
+			"preferred_username": "kyle",
+		})
+
+		client := coderdtest.New(t, &coderdtest.Options{
+			OIDCConfig: config,
+		})
+
+		config.AllowSignups = true
+		config.EmailDomain = "kwc.io"
+
+		resp := oidcCallback(t, client)
+		assert.Equal(t, http.StatusConflict, resp.StatusCode)
+	})
 }
 
 // createOIDCConfig generates a new OIDCConfig that returns a static token
@@ -415,11 +409,13 @@ func createOIDCConfig(t *testing.T, claims jwt.MapClaims) *coderd.OIDCConfig {
 
 	// https://datatracker.ietf.org/doc/html/rfc7519#section-4.1
 	claims["exp"] = time.Now().Add(time.Hour).UnixMilli()
+	claims["iss"] = "https://coder.com"
+	claims["sub"] = "hello"
 
 	signed, err := jwt.NewWithClaims(jwt.SigningMethodRS256, claims).SignedString(key)
 	require.NoError(t, err)
 
-	verifier := oidc.NewVerifier("", &oidc.StaticKeySet{
+	verifier := oidc.NewVerifier("https://coder.com", &oidc.StaticKeySet{
 		PublicKeys: []crypto.PublicKey{key.Public()},
 	}, &oidc.Config{
 		SkipClientIDCheck: true,
@@ -480,3 +476,7 @@ func oidcCallback(t *testing.T, client *codersdk.Client) *http.Response {
 	t.Log(string(data))
 	return res
 }
+
+func i64ptr(i int64) *int64 {
+	return &i
+}
diff --git a/coderd/users.go b/coderd/users.go
@@ -966,6 +966,8 @@ func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User
 		Status:          codersdk.UserStatus(user.Status),
 		OrganizationIDs: organizationIDs,
 		Roles:           make([]codersdk.Role, 0),
+		LoginType:       codersdk.LoginType(user.LoginType),
+		LinkedID:        user.LinkedID,
 	}
 
 	for _, roleName := range user.RBACRoles {
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -27,6 +27,7 @@ type LoginType string
 const (
 	LoginTypePassword LoginType = "password"
 	LoginTypeGithub   LoginType = "github"
+	LoginTypeOIDC     LoginType = "oidc"
 )
 
 type UsersRequest struct {
@@ -49,6 +50,8 @@ type User struct {
 	Status          UserStatus  `json:"status"`
 	OrganizationIDs []uuid.UUID `json:"organization_ids"`
 	Roles           []Role      `json:"roles"`
+	LoginType       LoginType   `json:"login_type"`
+	LinkedID        string      `json:"linked_id"`
 }
 
 type APIKey struct {

Original file line number	Diff line number	Diff line change
`@@ -966,6 +966,8 @@ func convertUser(user database.User, organizationIDs []uuid.UUID) codersdk.User`
`966`	`966`	`Status: codersdk.UserStatus(user.Status),`
`967`	`967`	`OrganizationIDs: organizationIDs,`
`968`	`968`	`Roles: make([]codersdk.Role, 0),`
	`969`	`+ LoginType: codersdk.LoginType(user.LoginType),`
	`970`	`+ LinkedID: user.LinkedID,`
`969`	`971`	`}`
`970`	`972`
`971`	`973`	`for _, roleName := range user.RBACRoles {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ type LoginType string`
`27`	`27`	`const (`
`28`	`28`	`LoginTypePassword LoginType = "password"`
`29`	`29`	`LoginTypeGithub LoginType = "github"`
	`30`	`+ LoginTypeOIDC LoginType = "oidc"`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`type UsersRequest struct {`
`@@ -49,6 +50,8 @@ type User struct {`
`49`	`50`	Status UserStatus `json:"status"`
`50`	`51`	OrganizationIDs []uuid.UUID `json:"organization_ids"`
`51`	`52`	Roles []Role `json:"roles"`
	`53`	+ LoginType LoginType `json:"login_type"`
	`54`	+ LinkedID string `json:"linked_id"`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`type APIKey struct {`