Convert withAuthDetails to use promises for failure

ably · Dec 8, 2023 · cb4184d · cb4184d
1 parent 817ab7f
commit cb4184d
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/common/lib/client/resource.ts b/src/common/lib/client/resource.ts
@@ -8,23 +8,18 @@ import BaseClient from './baseclient';
 import { MsgPack } from 'common/types/msgpack';
 import { RequestCallbackHeaders } from 'common/types/http';
 
-function withAuthDetails(
+async function withAuthDetails(
   client: BaseClient,
   headers: RequestCallbackHeaders | undefined,
   params: Record<string, any>,
-  errCallback: Function,
   opCallback: Function
-) {
+): Promise<void> {
   if (client.http.supportsAuthHeaders) {
-    Utils.whenPromiseSettles(client.auth.getAuthHeaders(), function (err: Error, authHeaders: Record<string, string>) {
-      if (err) errCallback(err);
-      else opCallback(Utils.mixin(authHeaders, headers), params);
-    });
+    const authHeaders = await client.auth.getAuthHeaders();
+    opCallback(Utils.mixin(authHeaders, headers), params);
   } else {
-    Utils.whenPromiseSettles(client.auth.getAuthParams(), function (err: Error, authParams: Record<string, string>) {
-      if (err) errCallback(err);
-      else opCallback(headers, Utils.mixin(authParams, params));
-    });
+    const authParams = await client.auth.getAuthParams();
+    opCallback(headers, Utils.mixin(authParams, params));
   }
 }
 
@@ -254,15 +249,15 @@ class Resource {
               return;
             }
             /* retry ... */
-            withAuthDetails(client, headers, params, callback, doRequest);
+            withAuthDetails(client, headers, params, doRequest).catch((err) => callback(err));
           });
           return;
         }
         callback(err as ErrorInfo, res as T | undefined, headers, unpacked, statusCode);
       });
     }
 
-    withAuthDetails(client, headers, params, callback, doRequest);
+    withAuthDetails(client, headers, params, doRequest).catch((err) => callback(err));
   }
 }