change 'active' route to 'activate'

- Remove "activate" button
coder · Emyrk · May 31, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit df96f3da464c017d59407ba161ade02a8ae5021d
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -236,7 +236,7 @@ func New(options *Options) *API {
 					r.Put("/profile", api.putUserProfile)
 					r.Route("/status", func(r chi.Router) {
 						r.Put("/suspend", api.putUserStatus(database.UserStatusSuspended))
-						r.Put("/active", api.putUserStatus(database.UserStatusActive))
+						r.Put("/activate", api.putUserStatus(database.UserStatusActive))
 					})
 					r.Route("/password", func(r chi.Router) {
 						r.Put("/", api.putUserPassword)

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -96,11 +96,18 @@ func TestPostLogin(t *testing.T) {
 		_, err = client.UpdateUserStatus(context.Background(), memberUser.Username, codersdk.UserStatusSuspended)
 		require.NoError(t, err, "suspend member")
 
+		// Test an existing session
+		_, err = member.User(context.Background(), codersdk.Me)
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, http.StatusUnauthorized, apiErr.StatusCode())
+		require.Contains(t, apiErr.Message, "contact an admin")
+
+		// Test a new session
 		_, err = client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{
 			Email:    memberUser.Email,
 			Password: "testpass",
 		})
-		var apiErr *codersdk.Error
 		require.ErrorAs(t, err, &apiErr)
 		require.Equal(t, http.StatusUnauthorized, apiErr.StatusCode())
 		require.Contains(t, apiErr.Message, "suspended")

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -218,7 +218,7 @@ func (c *Client) UpdateUserStatus(ctx context.Context, user string, status UserS
 	path := fmt.Sprintf("/api/v2/users/%s/status/", user)
 	switch status {
 	case UserStatusActive:
-		path += "active"
+		path += "activate"
 	case UserStatusSuspended:
 		path += "suspend"
 	default:

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -219,7 +219,7 @@ export const updateProfile = async (
 }
 
 export const activateUser = async (userId: TypesGen.User["id"]): Promise<TypesGen.User> => {
-  const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/active`)
+  const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/activate`)
   return response.data
 }
 

diff --git a/site/src/components/UsersTable/UsersTable.tsx b/site/src/components/UsersTable/UsersTable.tsx
@@ -92,12 +92,12 @@ export const UsersTable: React.FC<UsersTableProps> = ({
                             },
                           ]
                         : [
-                            {
-                              label: Language.activateMenuItem,
-                              // TODO: Activate user
-                              // eslint-disable-next-line @typescript-eslint/no-empty-function
-                              onClick: function () {},
-                            },
+                            // TODO: Uncomment this and add activate user functionality.
+                            // {
+                            //   label: Language.activateMenuItem,
+                            //   // eslint-disable-next-line @typescript-eslint/no-empty-function
+                            //   onClick: function () {},
+                            // },
                           ]
                       ).concat({
                         label: Language.resetPasswordMenuItem,