chore: clean up

Author: wobsoriano

packages/backend/src/api/endpoints/MachineTokensApi.ts

@@ -29,39 +29,37 @@ type RevokeMachineTokenParams = WithMachineTokenSecret<{
 }>;
 
 export class MachineTokensApi extends AbstractAPI {
-  /**
-   * Attaches the machine token secret as an Authorization header if present.
-   */
-  #withMachineTokenSecretHeader<T extends WithMachineTokenSecret<unknown>>(
+  #withMachineTokenSecretHeader(
     options: ClerkBackendApiRequestOptions,
-    params: T,
+    machineTokenSecret?: string | null,
   ): ClerkBackendApiRequestOptions {
-    if (params.machineTokenSecret) {
+    if (machineTokenSecret) {
       return {
         ...options,
         headerParams: {
-          Authorization: `Bearer ${params.machineTokenSecret}`,
+          Authorization: `Bearer ${machineTokenSecret}`,
         },
       };
     }
     return options;
   }
 
   async create(params: CreateMachineTokenParams) {
+    const { machineTokenSecret, ...bodyParams } = params;
     return this.request<MachineToken>(
       this.#withMachineTokenSecretHeader(
         {
           method: 'POST',
           path: basePath,
-          bodyParams: params,
+          bodyParams,
         },
-        params,
+        machineTokenSecret,
       ),
     );
   }
 
   async update(params: UpdateMachineTokenParams) {
-    const { m2mTokenId, ...bodyParams } = params;
+    const { m2mTokenId, machineTokenSecret, ...bodyParams } = params;
     this.requireId(m2mTokenId);
     return this.request<MachineToken>(
       this.#withMachineTokenSecretHeader(
@@ -70,13 +68,13 @@ export class MachineTokensApi extends AbstractAPI {
           path: joinPaths(basePath, m2mTokenId),
           bodyParams,
         },
-        params,
+        machineTokenSecret,
       ),
     );
   }
 
   async revoke(params: RevokeMachineTokenParams) {
-    const { m2mTokenId, ...bodyParams } = params;
+    const { m2mTokenId, machineTokenSecret, ...bodyParams } = params;
     this.requireId(m2mTokenId);
     return this.request<MachineToken>(
       this.#withMachineTokenSecretHeader(
@@ -85,7 +83,7 @@ export class MachineTokensApi extends AbstractAPI {
           path: joinPaths(basePath, m2mTokenId, 'revoke'),
           bodyParams,
         },
-        params,
+        machineTokenSecret,
       ),
     );
   }

packages/backend/src/api/factory.ts

@@ -37,22 +37,10 @@ export type ApiClient = ReturnType<typeof createBackendApiClient>;
 export function createBackendApiClient(options: CreateBackendApiOptions) {
   const request = buildRequest(options);
 
-  return {
-    __experimental_accountlessApplications: new AccountlessApplicationAPI(
-      buildRequest({ ...options, requireSecretKey: false }),
-    ),
-    actorTokens: new ActorTokenAPI(request),
-    allowlistIdentifiers: new AllowlistIdentifierAPI(request),
-    betaFeatures: new BetaFeaturesAPI(request),
-    blocklistIdentifiers: new BlocklistIdentifierAPI(request),
-    clients: new ClientAPI(request),
-    domains: new DomainAPI(request),
-    emailAddresses: new EmailAddressAPI(request),
-    instance: new InstanceAPI(request),
-    invitations: new InvitationAPI(request),
-    // Using "/" instead of an actual version since they're bapi-proxy endpoints.
-    // bapi-proxy connects directly to C1 without URL versioning,
-    // while API versioning is handled through the Clerk-API-Version header.
+  // Using "/" instead of an actual version since they're bapi-proxy endpoints.
+  // bapi-proxy connects directly to C1 without URL versioning,
+  // while API versioning is handled through the Clerk-API-Version header.
+  const bapiProxyMethods = {
     machineTokens: new MachineTokensApi(
       buildRequest({
         ...options,
@@ -72,6 +60,21 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
         apiVersion: '/',
       }),
     ),
+  };
+
+  return {
+    __experimental_accountlessApplications: new AccountlessApplicationAPI(
+      buildRequest({ ...options, requireSecretKey: false }),
+    ),
+    actorTokens: new ActorTokenAPI(request),
+    allowlistIdentifiers: new AllowlistIdentifierAPI(request),
+    betaFeatures: new BetaFeaturesAPI(request),
+    blocklistIdentifiers: new BlocklistIdentifierAPI(request),
+    clients: new ClientAPI(request),
+    domains: new DomainAPI(request),
+    emailAddresses: new EmailAddressAPI(request),
+    instance: new InstanceAPI(request),
+    invitations: new InvitationAPI(request),
     jwks: new JwksAPI(request),
     jwtTemplates: new JwtTemplatesApi(request),
     oauthApplications: new OAuthApplicationsApi(request),
@@ -87,5 +90,6 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
     users: new UserAPI(request),
     waitlistEntries: new WaitlistEntryAPI(request),
     webhooks: new WebhookAPI(request),
+    ...bapiProxyMethods,
   };
 }