[v15] Do not send "assume role" usage event when dropping access request

web/packages/teleterm/src/ui/AccessRequestCheckout/useAccessRequestCheckout.ts

@@ -107,8 +107,8 @@ export default function useAccessRequestCheckout() {
 
     const data = getPendingAccessRequestsPerResource(pendingAccessRequest);
     runFetchResourceRoles(() =>
-      retryWithRelogin(ctx, clusterUri, () =>
-        ctx.clustersService.getRequestableRoles({
+      retryWithRelogin(ctx, clusterUri, async () => {
+        const { response } = await ctx.tshd.getRequestableRoles({
           clusterUri: rootClusterUri,
           resourceIds: data
             .filter(d => d.kind !== 'role')
@@ -121,8 +121,7 @@ export default function useAccessRequestCheckout() {
               clusterName: d.clusterName,
               subResourceName: '',
             })),
-        })
-      ).then(response => {
+        });
         setResourceRequestRoles(response.applicableRoles);
         setSelectedResourceRequestRoles(response.applicableRoles);
       })

web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.ts

@@ -50,11 +50,7 @@ export function useAssumedRolesBar(assumedRequest: AssumedRequest) {
     return retryWithRelogin(
       ctx,
       rootClusterUri,
-      () =>
-        // only passing the 'unassumed' role id as the backend will
-        // persist any other access requests currently available that
-        // are not present in the dropIds array
-        ctx.clustersService.assumeRole(rootClusterUri, [], [assumedRequest.id])
+      () => ctx.clustersService.dropRoles(rootClusterUri, [assumedRequest.id])
       // TODO(gzdunek): We should refresh the resources,
       // the same as after assuming a role in `useAssumeAccess`.
       // Unfortunately, we can't do this because we don't have access to `ResourcesContext`.

web/packages/teleterm/src/ui/DocumentAccessRequests/ReviewAccessRequest/useReviewAccessRequest.ts

@@ -70,9 +70,12 @@ export function useReviewAccessRequest({
     )
   );
   const [deleteRequestAttempt, runDeleteRequest] = useAsync(() =>
-    retry(() =>
-      ctx.clustersService.deleteAccessRequest(rootClusterUri, requestId)
-    )
+    retry(async () => {
+      await ctx.tshd.deleteAccessRequest({
+        rootClusterUri,
+        accessRequestId: requestId,
+      });
+    })
   );
   const [submitReviewAttempt, runSubmitReview] = useAsync(
     (review: SubmitReview) =>

web/packages/teleterm/src/ui/DocumentAccessRequests/useAccessRequests.tsx

@@ -74,9 +74,10 @@ export default function useAccessRequests(doc: types.DocumentAccessRequests) {
 
   const getRequests = async () => {
     try {
-      const response = await retryWithRelogin(ctx, clusterUri, () =>
-        ctx.clustersService.getAccessRequests(rootClusterUri)
-      );
+      const response = await retryWithRelogin(ctx, clusterUri, async () => {
+        const { response } = await ctx.tshd.getAccessRequests({ clusterUri });
+        return response.requests;
+      });
       setAttempt({ status: 'success' });
       // transform tshd access request to the webui access request and add flags
       const requests = response.map(r => makeUiAccessRequest(r));

web/packages/teleterm/src/ui/DocumentAccessRequests/useAssumeAccess.ts

@@ -34,7 +34,7 @@ export function useAssumeAccess() {
 
   const [assumeRoleAttempt, runAssumeRole] = useAsync((requestId: string) =>
     retryWithRelogin(ctx, clusterUri, async () => {
-      await ctx.clustersService.assumeRole(rootClusterUri, [requestId], []);
+      await ctx.clustersService.assumeRoles(rootClusterUri, [requestId]);
       // refresh the current resource tabs
       requestResourcesRefresh();
     })

web/packages/teleterm/src/ui/services/clusters/clustersService.ts

@@ -32,7 +32,6 @@ import { Server } from 'gen-proto-ts/teleport/lib/teleterm/v1/server_pb';
 import { Database } from 'gen-proto-ts/teleport/lib/teleterm/v1/database_pb';
 import {
   CreateAccessRequestRequest,
-  GetRequestableRolesRequest,
   ReviewAccessRequestRequest,
   PromoteAccessRequestRequest,
   PasswordlessPrompt,
@@ -337,90 +336,42 @@ export class ClustersService extends ImmutableStore<types.ClustersServiceState>
     return response.clusters;
   }
 
-  async getRequestableRoles(params: GetRequestableRolesRequest) {
-    const cluster = this.state.clusters.get(params.clusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. This check should be done earlier in the
-    // UI rather than be repeated in each ClustersService method.
-    if (!cluster.connected) {
-      return;
-    }
-
-    const { response } = await this.client.getRequestableRoles(params);
-
-    return response;
-  }
-
   getAssumedRequests(rootClusterUri: uri.RootClusterUri) {
     const cluster = this.state.clusters.get(rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster?.connected) {
-      return {};
-    }
-
-    return cluster.loggedInUser?.assumedRequests || {};
-  }
-
-  getAssumedRequest(rootClusterUri: uri.RootClusterUri, requestId: string) {
-    return this.getAssumedRequests(rootClusterUri)[requestId];
-  }
-
-  async getAccessRequests(rootClusterUri: uri.RootClusterUri) {
-    const cluster = this.state.clusters.get(rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
-
-    const { response } = await this.client.getAccessRequests({
-      clusterUri: rootClusterUri,
-    });
-    return response.requests;
+    return cluster?.loggedInUser?.assumedRequests || {};
   }
 
-  async deleteAccessRequest(
+  /** Assumes roles for the given requests. */
+  async assumeRoles(
     rootClusterUri: uri.RootClusterUri,
-    requestId: string
-  ) {
-    const cluster = this.state.clusters.get(rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
-    await this.client.deleteAccessRequest({
+    requestIds: string[]
+  ): Promise<void> {
+    await this.client.assumeRole({
       rootClusterUri,
-      accessRequestId: requestId,
+      accessRequestIds: requestIds,
+      dropRequestIds: [],
     });
+    this.usageService.captureAccessRequestAssumeRole(rootClusterUri);
+    await this.syncRootCluster(rootClusterUri);
   }
 
-  async assumeRole(
+  /** Drops roles for the given requests. */
+  async dropRoles(
     rootClusterUri: uri.RootClusterUri,
-    requestIds: string[],
-    dropIds: string[]
-  ) {
-    const cluster = this.state.clusters.get(rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
+    requestIds: string[]
+  ): Promise<void> {
     await this.client.assumeRole({
       rootClusterUri,
-      accessRequestIds: requestIds,
-      dropRequestIds: dropIds,
+      accessRequestIds: [],
+      dropRequestIds: requestIds,
     });
-    this.usageService.captureAccessRequestAssumeRole(rootClusterUri);
-    return this.syncRootCluster(rootClusterUri);
+    await this.syncRootCluster(rootClusterUri);
   }
 
   async getAccessRequest(
     rootClusterUri: uri.RootClusterUri,
     requestId: string
   ) {
-    const cluster = this.state.clusters.get(rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
-
     const { response } = await this.client.getAccessRequest({
       clusterUri: rootClusterUri,
       accessRequestId: requestId,
@@ -430,12 +381,6 @@ export class ClustersService extends ImmutableStore<types.ClustersServiceState>
   }
 
   async reviewAccessRequest(params: ReviewAccessRequestRequest) {
-    const cluster = this.state.clusters.get(params.rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
-
     const { response } = await this.client.reviewAccessRequest(params);
     this.usageService.captureAccessRequestReview(params.rootClusterUri);
     return response.request;
@@ -448,12 +393,6 @@ export class ClustersService extends ImmutableStore<types.ClustersServiceState>
   }
 
   async createAccessRequest(params: CreateAccessRequestRequest) {
-    const cluster = this.state.clusters.get(params.rootClusterUri);
-    // TODO(ravicious): Remove check for cluster.connected. See the comment in getRequestableRoles.
-    if (!cluster.connected) {
-      return;
-    }
-
     const response = await this.client.createAccessRequest(params);
     if (!params.dryRun) {
       this.usageService.captureAccessRequestCreate(