Add unit test for oidc and no login type create

Emyrk · Emyrk · commit 11b7a67cbc23 · 2023-08-09T10:32:20.000-05:00
diff --git a/cli/usercreate.go b/cli/usercreate.go
@@ -57,12 +57,12 @@ func (r *RootCmd) userCreate() *clibase.Cmd {
 				}
 			}
 			userLoginType := codersdk.LoginTypePassword
+			if disableLogin && loginType != "" {
+				return xerrors.New("You cannot specify both --disable-login and --login-type")
+			}
 			if disableLogin {
 				userLoginType = codersdk.LoginTypeNone
 			} else if loginType != "" {
-				if disableLogin {
-					return xerrors.New("You cannot specify both --disable-login and --login-type")
-				}
 				userLoginType = codersdk.LoginType(loginType)
 			}
 
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang-jwt/jwt"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -565,6 +566,71 @@ func TestPostUsers(t *testing.T) {
 			}
 		}
 	})
+
+	t.Run("CreateNoneLoginType", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		first := coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		user, err := client.CreateUser(ctx, codersdk.CreateUserRequest{
+			OrganizationID: first.OrganizationID,
+			Email:          "another@user.org",
+			Username:       "someone-else",
+			Password:       "",
+			UserLoginType:  codersdk.LoginTypeNone,
+		})
+		require.NoError(t, err)
+
+		found, err := client.User(ctx, user.ID.String())
+		require.NoError(t, err)
+		require.Equal(t, found.LoginType, codersdk.LoginTypeNone)
+	})
+
+	t.Run("CreateOIDCLoginType", func(t *testing.T) {
+		t.Parallel()
+		email := "another@user.org"
+		conf := coderdtest.NewOIDCConfig(t, "")
+		config := conf.OIDCConfig(t, jwt.MapClaims{
+			"email": email,
+		})
+		config.AllowSignups = false
+		config.IgnoreUserInfo = true
+
+		client := coderdtest.New(t, &coderdtest.Options{
+			OIDCConfig: config,
+		})
+		first := coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		_, err := client.CreateUser(ctx, codersdk.CreateUserRequest{
+			OrganizationID: first.OrganizationID,
+			Email:          email,
+			Username:       "someone-else",
+			Password:       "",
+			UserLoginType:  codersdk.LoginTypeOIDC,
+		})
+		require.NoError(t, err)
+
+		// Try to log in with OIDC.
+		userClient := codersdk.New(client.URL)
+		resp := oidcCallback(t, userClient, conf.EncodeClaims(t, jwt.MapClaims{
+			"email": email,
+		}))
+		require.Equal(t, resp.StatusCode, http.StatusTemporaryRedirect)
+		// Set the client to use this OIDC context
+		authCookie := authCookieValue(resp.Cookies())
+		userClient.SetSessionToken(authCookie)
+		_ = resp.Body.Close()
+
+		found, err := userClient.User(ctx, "me")
+		require.NoError(t, err)
+		require.Equal(t, found.LoginType, codersdk.LoginTypeOIDC)
+	})
 }
 
 func TestUpdateUserProfile(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,12 @@ func (r RootCmd) userCreate() clibase.Cmd {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`userLoginType := codersdk.LoginTypePassword`
	`60`	`+ if disableLogin && loginType != "" {`
	`61`	`+ return xerrors.New("You cannot specify both --disable-login and --login-type")`
	`62`	`+ }`
`60`	`63`	`if disableLogin {`
`61`	`64`	`userLoginType = codersdk.LoginTypeNone`
`62`	`65`	`} else if loginType != "" {`
`63`		`- if disableLogin {`
`64`		`- return xerrors.New("You cannot specify both --disable-login and --login-type")`
`65`		`- }`
`66`	`66`	`userLoginType = codersdk.LoginType(loginType)`
`67`	`67`	`}`
`68`	`68`