Remove useAPI from DeleteUser and DeleteIDPConfigurationModal (minio#…

…3191)
brandongevat · Jan 17, 2024 · 2474232 · 2474232
1 parent c87ebe4
commit 2474232
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 73 deletions.
diff --git a/api/embedded_spec.go b/api/embedded_spec.go
diff --git a/api/operations/user/check_user_service_accounts_parameters.go b/api/operations/user/check_user_service_accounts_parameters.go
diff --git a/models/selected_users.go b/models/selected_users.go
diff --git a/swagger.yml b/swagger.yml
@@ -25,7 +25,7 @@ securityDefinitions:
     type: apiKey
 # Apply the key security definition to all APIs
 security:
-  - key: []
+  - key: [ ]
 parameters:
   limit:
     name: limit
@@ -54,7 +54,7 @@ paths:
           schema:
             $ref: "#/definitions/ApiError"
       # Exclude this API from the authentication requirement
-      security: []
+      security: [ ]
       tags:
         - Auth
     post:
@@ -74,7 +74,7 @@ paths:
           schema:
             $ref: "#/definitions/ApiError"
       # Exclude this API from the authentication requirement
-      security: []
+      security: [ ]
       tags:
         - Auth
   /login/oauth2/auth:
@@ -94,7 +94,7 @@ paths:
           description: Generic error response.
           schema:
             $ref: "#/definitions/ApiError"
-      security: []
+      security: [ ]
       tags:
         - Auth
 
@@ -295,8 +295,8 @@ paths:
     get:
       summary: List Objects
       security:
-        - key: []
-        - anonymous: []
+        - key: [ ]
+        - anonymous: [ ]
       operationId: ListObjects
       parameters:
         - name: bucket_name
@@ -411,8 +411,8 @@ paths:
     post:
       summary: Uploads an Object.
       security:
-        - key: []
-        - anonymous: []
+        - key: [ ]
+        - anonymous: [ ]
       consumes:
         - multipart/form-data
       parameters:
@@ -438,8 +438,8 @@ paths:
       summary: Download Multiple Objects
       operationId: DownloadMultipleObjects
       security:
-        - key: []
-        - anonymous: []
+        - key: [ ]
+        - anonymous: [ ]
       produces:
         - application/octet-stream
       parameters:
@@ -471,8 +471,8 @@ paths:
       summary: Download Object
       operationId: Download Object
       security:
-        - key: []
-        - anonymous: []
+        - key: [ ]
+        - anonymous: [ ]
       produces:
         - application/octet-stream
       parameters:
@@ -1546,9 +1546,7 @@ paths:
           in: body
           required: true
           schema:
-            type: array
-            items:
-              type: string
+            $ref: "#/definitions/selectedUsers"
       responses:
         200:
           description: A successful response.
@@ -2889,7 +2887,7 @@ paths:
         - name: order
           in: query
           type: string
-          enum: [timeDesc, timeAsc]
+          enum: [ timeDesc, timeAsc ]
           default: timeDesc
         - name: timeStart
           in: query
@@ -3766,6 +3764,10 @@ definitions:
         items:
           $ref: "#/definitions/user"
         title: list of resulting users
+  selectedUsers:
+    type: array
+    items:
+      type: string
   addUserRequest:
     type: object
     required:
@@ -4325,7 +4327,7 @@ definitions:
     properties:
       loginStrategy:
         type: string
-        enum: [form, redirect, service-account, redirect-service-account]
+        enum: [ form, redirect, service-account, redirect-service-account ]
       redirectRules:
         type: array
         items:
@@ -4424,7 +4426,7 @@ definitions:
           type: string
       status:
         type: string
-        enum: [ok]
+        enum: [ ok ]
       operator:
         type: boolean
       distributedMode:
@@ -4455,7 +4457,7 @@ definitions:
           type: string
       values:
         type: array
-        items: {}
+        items: { }
   resultTarget:
     type: object
     properties:
@@ -4911,7 +4913,7 @@ definitions:
         type: string
       service:
         type: string
-        enum: [replication]
+        enum: [ replication ]
       syncMode:
         type: string
       bandwidth:
@@ -5110,7 +5112,7 @@ definitions:
         format: int64
       newer_noncurrent_expiration_versions:
         type: integer
-        format: int64    
+        format: int64
 
   transitionResponse:
     type: object

diff --git a/web-app/src/api/consoleApi.ts b/web-app/src/api/consoleApi.ts
@@ -149,6 +149,8 @@ export interface ListUsersResponse {
   users?: User[];
 }
 
+export type SelectedUsers = string[];
+
 export interface AddUserRequest {
   accessKey: string;
   secretKey: string;
@@ -3242,14 +3244,15 @@ export class Api<
      * @secure
      */
     checkUserServiceAccounts: (
-      selectedUsers: string[],
+      selectedUsers: SelectedUsers,
       params: RequestParams = {},
     ) =>
       this.request<UserServiceAccountSummary, ApiError>({
         path: `/users/service-accounts`,
         method: "POST",
         body: selectedUsers,
         secure: true,
+        type: ContentType.Json,
         format: "json",
         ...params,
       }),
@@ -3635,7 +3638,7 @@ export class Api<
      * @secure
      */
     listUsersForPolicy: (policy: string, params: RequestParams = {}) =>
-      this.request<string[], ApiError>({
+      this.request<SelectedUsers, ApiError>({
         path: `/policies/${policy}/users`,
         method: "GET",
         secure: true,
@@ -3653,7 +3656,7 @@ export class Api<
      * @secure
      */
     listGroupsForPolicy: (policy: string, params: RequestParams = {}) =>
-      this.request<string[], ApiError>({
+      this.request<SelectedUsers, ApiError>({
         path: `/policies/${policy}/groups`,
         method: "GET",
         secure: true,
@@ -3805,7 +3808,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<string[], ApiError>({
+      this.request<SelectedUsers, ApiError>({
         path: `/bucket-users/${bucket}`,
         method: "GET",
         query: query,
@@ -4566,7 +4569,7 @@ export class Api<
      * @secure
      */
     listNodes: (params: RequestParams = {}) =>
-      this.request<string[], ApiError>({
+      this.request<SelectedUsers, ApiError>({
         path: `/nodes`,
         method: "GET",
         secure: true,