More tests

mtojek · mtojek · commit c359d9f1991e · 2023-07-26T13:04:35.000+02:00
diff --git a/coderd/users.go b/coderd/users.go
@@ -692,7 +692,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
 			}
 		}
 
-		suspendedUser, err := api.Database.UpdateUserStatus(ctx, database.UpdateUserStatusParams{
+		updatedUser, err := api.Database.UpdateUserStatus(ctx, database.UpdateUserStatusParams{
 			ID:        user.ID,
 			Status:    status,
 			UpdatedAt: database.Now(),
@@ -704,7 +704,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
 			})
 			return
 		}
-		aReq.New = suspendedUser
+		aReq.New = updatedUser
 
 		organizations, err := userOrganizationIDs(ctx, api, user)
 		if err != nil {
@@ -721,7 +721,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
 			// don't fail the HTTP request, since we did write it successfully to the database
 		}
 
-		httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(suspendedUser, organizations))
+		httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(updatedUser, organizations))
 	}
 }
 
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -1048,6 +1048,64 @@ func TestPutUserSuspend(t *testing.T) {
 	})
 }
 
+func TestPutUserDormant(t *testing.T) {
+	t.Parallel()
+
+	t.Run("MarkOwnerAsDormant", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		me := coderdtest.CreateFirstUser(t, client)
+		_, user := coderdtest.CreateAnotherUser(t, client, me.OrganizationID, rbac.RoleOwner())
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		_, err := client.UpdateUserStatus(ctx, user.Username, codersdk.UserStatusDormant)
+		require.Error(t, err, "cannot mark owners as dormant")
+	})
+
+	t.Run("MarkAnotherUserDormant", func(t *testing.T) {
+		t.Parallel()
+		auditor := audit.NewMock()
+		client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
+		numLogs := len(auditor.AuditLogs())
+
+		me := coderdtest.CreateFirstUser(t, client)
+		numLogs++ // add an audit log for user create
+		numLogs++ // add an audit log for login
+
+		_, user := coderdtest.CreateAnotherUser(t, client, me.OrganizationID)
+		numLogs++ // add an audit log for user create
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		user, err := client.UpdateUserStatus(ctx, user.Username, codersdk.UserStatusDormant)
+		require.NoError(t, err)
+		require.Equal(t, user.Status, codersdk.UserStatusDormant)
+		numLogs++ // add an audit log for user update
+
+		require.Len(t, auditor.AuditLogs(), numLogs)
+		require.Equal(t, database.AuditActionWrite, auditor.AuditLogs()[numLogs-1].Action)
+	})
+
+	t.Run("MarkOwnUserDormant", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		coderdtest.CreateFirstUser(t, client)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		client.User(ctx, codersdk.Me)
+		_, err := client.UpdateUserStatus(ctx, codersdk.Me, codersdk.UserStatusDormant)
+
+		require.ErrorContains(t, err, "cannot mark own user as dormant")
+	})
+}
+
+// FIXME Activate dormant account
+
 func TestGetUser(t *testing.T) {
 	t.Parallel()
 

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`
`695`		`- suspendedUser, err := api.Database.UpdateUserStatus(ctx, database.UpdateUserStatusParams{`
	`695`	`+ updatedUser, err := api.Database.UpdateUserStatus(ctx, database.UpdateUserStatusParams{`
`696`	`696`	`ID: user.ID,`
`697`	`697`	`Status: status,`
`698`	`698`	`UpdatedAt: database.Now(),`
`@@ -704,7 +704,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW`
`704`	`704`	`})`
`705`	`705`	`return`
`706`	`706`	`}`
`707`		`- aReq.New = suspendedUser`
	`707`	`+ aReq.New = updatedUser`
`708`	`708`
`709`	`709`	`organizations, err := userOrganizationIDs(ctx, api, user)`
`710`	`710`	`if err != nil {`
`@@ -721,7 +721,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW`
`721`	`721`	`// don't fail the HTTP request, since we did write it successfully to the database`
`722`	`722`	`}`
`723`	`723`
`724`		`- httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(suspendedUser, organizations))`
	`724`	`+ httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(updatedUser, organizations))`
`725`	`725`	`}`
`726`	`726`	`}`
`727`	`727`