Revert registerUserKeys back to a synchronous command

Author: winterhazel

api/src/main/java/org/apache/cloudstack/api/BaseAsyncCmd.java

@@ -29,7 +29,6 @@ public abstract class BaseAsyncCmd extends BaseCmd {
     public static final String migrationSyncObject = "migration";
     public static final String snapshotHostSyncObject = "snapshothost";
     public static final String gslbSyncObject = "globalserverloadbalancer";
-    public static final String user = "user";
 
     private Object job;
 

api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserKeysCmd.java

@@ -16,21 +16,20 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.user;
 
-import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import org.apache.cloudstack.acl.apikeypair.ApiKeyPair;
 import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ApiKeyPairResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 
 @APICommand(name = "deleteUserKeys", description = "Deletes a keypair from a user", responseObject = SuccessResponse.class,
         since = "4.23.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class DeleteUserKeysCmd extends BaseAsyncCmd {
+public class DeleteUserKeysCmd extends BaseCmd {
     @ACL
     @Parameter(name = ApiConstants.KEYPAIR_ID, type = CommandType.UUID, entityType = ApiKeyPairResponse.class, required = true, description = "ID of the keypair to be deleted.")
     private Long id;
@@ -60,22 +59,4 @@ public void execute() {
         SuccessResponse response = new SuccessResponse(getCommandName());
         this.setResponseObject(response);
     }
-
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_DELETE_SECRET_API_KEY;
-    }
-
-    @Override
-    public String getEventDescription() {
-        ApiKeyPair keyPair = apiKeyPairService.findById(id);
-        return String.format("Deleting API key pair with ID [%s]%s",
-                keyPair == null ? id : keyPair.getUuid(),
-                keyPair == null ? "." : String.format(" and name [%s].", keyPair.getName()));
-    }
-
-    @Override
-    public Long getSyncObjId() {
-        return getId();
-    }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java

@@ -16,14 +16,13 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.user;
 
-import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.User;
 import org.apache.cloudstack.acl.Rule;
 import org.apache.cloudstack.acl.apikeypair.ApiKeyPair;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.commons.lang3.StringUtils;
 
@@ -43,7 +42,7 @@
             responseObject = ApiKeyPairResponse.class,
             description = "Registers an API key pair (API and secret keys) for a user.",
             requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RegisterUserKeysCmd extends BaseAsyncCmd {
+public class RegisterUserKeysCmd extends BaseCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserResponse.class, required = true, description = "ID of the user.")
     private Long id;
 
@@ -61,7 +60,7 @@ public class RegisterUserKeysCmd extends BaseAsyncCmd {
             ApiConstants.PARAMETER_DESCRIPTION_END_DATE_POSSIBLE_FORMATS)
     private Date endDate;
 
-    @Parameter(name = ApiConstants.RULES, type = CommandType.MAP, description = "The rules of the API key pair. If no rules are informed, " +
+    @Parameter(name = ApiConstants.RULES, type = BaseCmd.CommandType.MAP, description = "The rules of the API key pair. If no rules are informed, " +
             "defaults to allowing all account permissions. Otherwise, only the explicitly informed permissions for the key pair will be " +
             "considered. Lower indexed rules take precedence over higher. Thus, in the following example: " +
             "\"rules[0].rule=deleteUserKeys rules[0].permission=deny rules[1].rule=*UserKey* rules[1].permission=allow\", all rules matching " +
@@ -188,25 +187,4 @@ public void execute() {
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
     }
-
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_REGISTER_FOR_SECRET_API_KEY;
-    }
-
-    @Override
-    public String getEventDescription() {
-        String userUuid = getResourceUuid(ApiConstants.ID);
-        return String.format("Registering API keypair for user [%s].", userUuid == null ? id : userUuid);
-    }
-
-    @Override
-    public String getSyncObjType() {
-        return BaseAsyncCmd.user;
-    }
-
-    @Override
-    public Long getSyncObjId() {
-        return getUserId();
-    }
 }

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -3399,6 +3399,7 @@ private void removeApiKeyPairIfExpired(ApiKeyPair apiKeyPair) {
         }
     }
 
+    @ActionEvent(eventType = EventTypes.EVENT_DELETE_SECRET_API_KEY, eventDescription = "deleting API key pair")
     public void deleteApiKey(DeleteUserKeysCmd cmd) {
         ApiKeyPair keyPair = apiKeyPairService.findById(cmd.getId());
         if (keyPair == null) {

ui/src/components/view/ApiKeyPairsTab.vue

@@ -287,34 +287,17 @@ export default {
       this.fetchLoading = true
       try {
         await Promise.all(keypairs.map(async keypair => {
-          try {
-            const jobId = await this.deleteKeyPair({
-              keypairid: keypair.id
-            })
-            await this.$pollJob({
-              jobId,
-              action: {
-                isFetchData: false
-              },
-              successMethod: () => {
-                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'success' })
-              },
-              catchMethod: () => {
-                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
-              }
-            })
-          } catch (e) {
+          await postAPI('deleteUserKeys', { keypairid: keypair.id }).then(response => {
+            eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'success' })
+          }).catch(error => {
             eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
-          }
+            this.$notifyError(error)
+          })
         }))
       } finally {
         this.fetchLoading = false
       }
     },
-    async deleteKeyPair (args) {
-      const response = await postAPI('deleteUserKeys', args)
-      return response.deleteuserkeysresponse.jobid
-    },
     bulkActionConfirmation () {
       this.showConfirmationAction = true
       this.selectedColumns = this.columns.filter(column => {

ui/src/views/iam/GenerateApiKeyPair.vue

@@ -166,19 +166,12 @@ export default {
         const params = this.buildRequestParams()
         this.loading = true
         postAPI('registerUserKeys', params).then(response => {
-          this.$pollJob({
-            jobId: response.registeruserkeysresponse.jobid,
-            successMessage: this.$t('message.success.register.user.keypair', { user: this.resource.username }),
-            successMethod: () => {
-              this.fetchData()
-            },
-            errorMessage: this.$t('message.register.keypair.failed'),
-            errorMethod: () => {
-              this.fetchData()
-            },
-            loadingMessage: this.$t('label.registering.keypair', { user: this.resource.username }),
-            catchMessage: this.$t('error.fetching.async.job.result')
+          this.$notification.success({
+            message: this.$t('label.action.create.api.key'),
+            description: this.$t('message.success.register.user.keypair', { user: this.resource.username })
           })
+          this.fetchData()
+          this.closeModal()
         }).catch(error => {
           this.$notification.error({
             message: this.$t('message.request.failed'),
@@ -187,7 +180,6 @@ export default {
           })
         }).finally(() => {
           this.loading = false
-          this.closeModal()
         })
       })
     },