remove disable login

Emyrk · Emyrk · commit d303330b9d80 · 2024-08-23T15:22:10.000-05:00
diff --git a/cli/user_delete_test.go b/cli/user_delete_test.go
@@ -33,7 +33,6 @@ func TestUserDelete(t *testing.T) {
 			Password:        pw,
 			UserLoginType:   codersdk.LoginTypePassword,
 			OrganizationIDs: []uuid.UUID{owner.OrganizationID},
-			DisableLogin:    false,
 		})
 		require.NoError(t, err)
 
@@ -64,7 +63,6 @@ func TestUserDelete(t *testing.T) {
 			Password:        pw,
 			UserLoginType:   codersdk.LoginTypePassword,
 			OrganizationIDs: []uuid.UUID{owner.OrganizationID},
-			DisableLogin:    false,
 		})
 		require.NoError(t, err)
 
@@ -95,7 +93,6 @@ func TestUserDelete(t *testing.T) {
 			Password:        pw,
 			UserLoginType:   codersdk.LoginTypePassword,
 			OrganizationIDs: []uuid.UUID{owner.OrganizationID},
-			DisableLogin:    false,
 		})
 		require.NoError(t, err)
 
@@ -128,7 +125,6 @@ func TestUserDelete(t *testing.T) {
 	// 		Password:       pw,
 	// 		UserLoginType:  codersdk.LoginTypePassword,
 	// 		OrganizationID: aUser.OrganizationID,
-	// 		DisableLogin:   false,
 	// 	})
 	// 	require.NoError(t, err)
 
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -700,7 +700,7 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI
 	require.NoError(t, err)
 
 	var sessionToken string
-	if req.DisableLogin || req.UserLoginType == codersdk.LoginTypeNone {
+	if req.UserLoginType == codersdk.LoginTypeNone {
 		// Cannot log in with a disabled login user. So make it an api key from
 		// the client making this user.
 		token, err := client.CreateToken(context.Background(), user.ID.String(), codersdk.CreateTokenRequest{
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -106,22 +106,6 @@ func TestUserLogin(t *testing.T) {
 		require.ErrorAs(t, err, &apiErr)
 		require.Equal(t, http.StatusUnauthorized, apiErr.StatusCode())
 	})
-	// Password auth should fail if the user is made without password login.
-	t.Run("DisableLoginDeprecatedField", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		anotherClient, anotherUser := coderdtest.CreateAnotherUserMutators(t, client, user.OrganizationID, nil, func(r *codersdk.CreateUserRequestWithOrgs) {
-			r.Password = ""
-			r.DisableLogin = true
-		})
-
-		_, err := anotherClient.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{
-			Email:    anotherUser.Email,
-			Password: "SomeSecurePassword!",
-		})
-		require.Error(t, err)
-	})
 
 	t.Run("LoginTypeNone", func(t *testing.T) {
 		t.Parallel()
diff --git a/codersdk/users_test.go b/codersdk/users_test.go
@@ -114,7 +114,6 @@ func TestCreateUserRequestJSON(t *testing.T) {
 			Name:            coderdtest.RandomName(t),
 			Password:        "",
 			UserLoginType:   codersdk.LoginTypePassword,
-			DisableLogin:    false,
 			OrganizationIDs: []uuid.UUID{uuid.New(), uuid.New()},
 		}
 		marshalTest(t, req)
@@ -129,7 +128,6 @@ func TestCreateUserRequestJSON(t *testing.T) {
 			Name:            coderdtest.RandomName(t),
 			Password:        "",
 			UserLoginType:   codersdk.LoginTypePassword,
-			DisableLogin:    false,
 			OrganizationIDs: []uuid.UUID{uuid.New()},
 		}
 		marshalTest(t, req)
@@ -144,7 +142,6 @@ func TestCreateUserRequestJSON(t *testing.T) {
 			Name:            coderdtest.RandomName(t),
 			Password:        "",
 			UserLoginType:   codersdk.LoginTypePassword,
-			DisableLogin:    false,
 			OrganizationIDs: []uuid.UUID{},
 		}
 		marshalTest(t, req)
