fixup! feat: add audit logs for dormancy events

coadler · coadler · commit 68adf8addc4b · 2024-10-30T23:11:40.000Z
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -721,7 +721,7 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI
 		OrganizationIDs: organizationIDs,
 		// Always create users as active in tests to ignore an extra audit log
 		// when logging in.
-		UserStatus: codersdk.UserStatusActive,
+		UserStatus: ptr.Ref(codersdk.UserStatusActive),
 	}
 	for _, m := range mutators {
 		m(&req)
diff --git a/coderd/users.go b/coderd/users.go
@@ -28,6 +28,7 @@ import (
 	"github.com/coder/coder/v2/coderd/searchquery"
 	"github.com/coder/coder/v2/coderd/telemetry"
 	"github.com/coder/coder/v2/coderd/userpassword"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 )
@@ -192,7 +193,7 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
 			Username:        createUser.Username,
 			Name:            createUser.Name,
 			Password:        createUser.Password,
-			UserStatus:      codersdk.UserStatusActive,
+			UserStatus:      ptr.Ref(codersdk.UserStatusActive),
 			OrganizationIDs: []uuid.UUID{defaultOrg.ID},
 		},
 		LoginType: database.LoginTypePassword,
@@ -1346,6 +1347,10 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
 	err := store.InTx(func(tx database.Store) error {
 		orgRoles := make([]string, 0)
 
+		status := ""
+		if req.UserStatus != nil {
+			status = string(*req.UserStatus)
+		}
 		params := database.InsertUserParams{
 			ID:             uuid.New(),
 			Email:          req.Email,
@@ -1357,7 +1362,7 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
 			// All new users are defaulted to members of the site.
 			RBACRoles: []string{},
 			LoginType: req.LoginType,
-			Status:    string(req.UserStatus),
+			Status:    status,
 		}
 		// If a user signs up with OAuth, they can have no password!
 		if req.Password != "" {
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
@@ -724,7 +725,7 @@ func TestPostUsers(t *testing.T) {
 			Email:           "another@user.org",
 			Username:        "someone-else",
 			Password:        "SomeSecurePassword!",
-			UserStatus:      codersdk.UserStatusActive,
+			UserStatus:      ptr.Ref(codersdk.UserStatusActive),
 		})
 		require.NoError(t, err)
 
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -140,7 +140,7 @@ type CreateUserRequestWithOrgs struct {
 	// UserLoginType defaults to LoginTypePassword.
 	UserLoginType LoginType `json:"login_type"`
 	// UserStatus defaults to UserStatusDormant.
-	UserStatus UserStatus `json:"user_status"`
+	UserStatus *UserStatus `json:"user_status"`
 	// OrganizationIDs is a list of organization IDs that the user should be a member of.
 	OrganizationIDs []uuid.UUID `json:"organization_ids" validate:"" format:"uuid"`
 }
diff --git a/site/e2e/api.ts b/site/e2e/api.ts
@@ -37,7 +37,6 @@ export const createUser = async (orgId: string) => {
 		password: "s3cure&password!",
 		login_type: "password",
 		organization_ids: [orgId],
-		user_status: "dormant"
 	});
 	return user;
 };
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI`
`721`	`721`	`OrganizationIDs: organizationIDs,`
`722`	`722`	`// Always create users as active in tests to ignore an extra audit log`
`723`	`723`	`// when logging in.`
`724`		`- UserStatus: codersdk.UserStatusActive,`
	`724`	`+ UserStatus: ptr.Ref(codersdk.UserStatusActive),`
`725`	`725`	`}`
`726`	`726`	`for _, m := range mutators {`
`727`	`727`	`m(&req)`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ type CreateUserRequestWithOrgs struct {`
`140`	`140`	`// UserLoginType defaults to LoginTypePassword.`
`141`	`141`	UserLoginType LoginType `json:"login_type"`
`142`	`142`	`// UserStatus defaults to UserStatusDormant.`
`143`		- UserStatus UserStatus `json:"user_status"`
	`143`	+ UserStatus *UserStatus `json:"user_status"`
`144`	`144`	`// OrganizationIDs is a list of organization IDs that the user should be a member of.`
`145`	`145`	OrganizationIDs []uuid.UUID `json:"organization_ids" validate:"" format:"uuid"`
`146`	`146`	`}`