fixup! feat: add audit logs for dormancy events

coadler · coadler · commit 388111b16b09 · 2024-10-30T21:48:22.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7711,7 +7711,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 
 	status := database.UserStatusDormant
 	if arg.Status != "" {
-		status = arg.Status
+		status = database.UserStatus(arg.Status)
 	}
 
 	user := database.User{
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -71,7 +71,7 @@ INSERT INTO
 		status
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, NULLIF(@status::user_status, '')) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, NULLIF(@status::text, '')::user_status) RETURNING *;
 
 -- name: UpdateUserProfile :one
 UPDATE
diff --git a/coderd/users.go b/coderd/users.go
@@ -195,6 +195,7 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
 			OrganizationIDs: []uuid.UUID{defaultOrg.ID},
 		},
 		LoginType:          database.LoginTypePassword,
+		Status:             database.UserStatusActive,
 		accountCreatorName: "coder",
 	})
 	if err != nil {
@@ -1355,7 +1356,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:    req.Status,
+			Status:    string(req.Status),
 		}
 		// If a user signs up with OAuth, they can have no password!
 		if req.Password != "" {

Original file line number	Diff line number	Diff line change
`@@ -7711,7 +7711,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam`
`7711`	`7711`
`7712`	`7712`	`status := database.UserStatusDormant`
`7713`	`7713`	`if arg.Status != "" {`
`7714`		`- status = arg.Status`
	`7714`	`+ status = database.UserStatus(arg.Status)`
`7715`	`7715`	`}`
`7716`	`7716`
`7717`	`7717`	`user := database.User{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ INSERT INTO`
`71`	`71`	`status`
`72`	`72`	`)`
`73`	`73`	`VALUES`
`74`		`- ($1, $2, $3, $4, $5, $6, $7, $8, $9, NULLIF(@status::user_status, '')) RETURNING *;`
	`74`	`+ ($1, $2, $3, $4, $5, $6, $7, $8, $9, NULLIF(@status::text, '')::user_status) RETURNING *;`
`75`	`75`
`76`	`76`	`-- name: UpdateUserProfile :one`
`77`	`77`	`UPDATE`