Fix: refresh account status

mtojek · mtojek · commit 41ac4d58cce7 · 2023-07-27T12:22:05.000+02:00
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -581,6 +581,12 @@ func createAnotherUserRetry(t *testing.T, client *codersdk.Client, organizationI
 		other.HTTPClient.CloseIdleConnections()
 	})
 
+	if user.Status == codersdk.UserStatusDormant {
+		// Refresh user account which should be active now.
+		user, err = other.User(context.Background(), user.Username)
+		require.NoError(t, err)
+	}
+
 	if len(roles) > 0 {
 		// Find the roles for the org vs the site wide roles
 		orgRoles := make(map[string][]string)
diff --git a/coderd/users.go b/coderd/users.go
@@ -631,7 +631,7 @@ func (api *API) putSuspendUserAccount() func(rw http.ResponseWriter, r *http.Req
 }
 
 // @Summary Mark user account as dormant
-// @ID dormant-user-account
+// @ID mark-user-account-as-dormant
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Users
diff --git a/enterprise/coderd/scim.go b/enterprise/coderd/scim.go
@@ -110,10 +110,9 @@ type SCIMUser struct {
 		Type    string `json:"type"`
 		Display string `json:"display"`
 	} `json:"emails"`
-	Active  bool          `json:"active"`
-	Dormant bool          `json:"dormant"`
-	Groups  []interface{} `json:"groups"`
-	Meta    struct {
+	Active bool          `json:"active"`
+	Groups []interface{} `json:"groups"`
+	Meta   struct {
 		ResourceType string `json:"resourceType"`
 	} `json:"meta"`
 }
@@ -265,8 +264,6 @@ func (api *API) scimPatchUser(rw http.ResponseWriter, r *http.Request) {
 	var status database.UserStatus
 	if sUser.Active {
 		status = database.UserStatusActive
-	} else if sUser.Dormant {
-		status = database.UserStatusDormant
 	} else {
 		status = database.UserStatusSuspended
 	}

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ func (api API) putSuspendUserAccount() func(rw http.ResponseWriter, r http.Req`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`// @Summary Mark user account as dormant`
`634`		`-// @ID dormant-user-account`
	`634`	`+// @ID mark-user-account-as-dormant`
`635`	`635`	`// @Security CoderSessionToken`
`636`	`636`	`// @Produce json`
`637`	`637`	`// @Tags Users`