small refactor

Author: jimmyjames

client.ts

@@ -679,7 +679,7 @@ export class OpenFgaClient extends BaseAPI {
       maxBatchSize = DEFAULT_MAX_BATCH_SIZE,
       maxParallelRequests = DEFAULT_MAX_METHOD_PARALLEL_REQS,
     } = options;
-  
+
     // TODO this right? Do it here?
     setHeaderIfNotSet(headers, CLIENT_METHOD_HEADER, "BatchCheck");
     setHeaderIfNotSet(headers, CLIENT_BULK_REQUEST_ID_HEADER, generateRandomIdWithNonUniqueFallback());
@@ -718,22 +718,16 @@ export class OpenFgaClient extends BaseAPI {
 
     // Execute batch checks in parallel with a limit of maxParallelRequests
     const results: ClientBatchCheckSingleResponse[] = [];
-    
-    const executeBatch = async (batch: BatchCheckItem[]) => {
-      // Prepare request payload
+    const batchResponses = asyncPool(maxParallelRequests, batchedChecks, async (batch: BatchCheckItem[]) => {
       const batchRequest: BatchCheckRequest = {
         checks: batch,
-        authorization_model_id: options.authorizationModelId, // TODO this right here?
+        authorization_model_id: options.authorizationModelId,
         consistency: options.consistency,
       };
-  
-      // Make API call to execute the batch check
+
       const response = await this.singleBatchCheck(batchRequest, options);
       return response.result;
-    };
-  
-    // Use asyncPool to process batches concurrently, but limit to maxParallelRequests
-    const batchResponses = asyncPool(maxParallelRequests, batchedChecks, executeBatch);
+    });
 
     // Collect the responses and associate them with their correlation IDs
     for await (const response of batchResponses) {
@@ -752,7 +746,6 @@ export class OpenFgaClient extends BaseAPI {
       }
     }
 
-    // Return the final response in the expected format
     return { responses: results };
   }
 

tests/client.test.ts

@@ -598,7 +598,7 @@ describe("OpenFGA Client", () => {
             },
           },
         };
-        const scope = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse, undefined, ConsistencyPreference.HigherConsistency);
+        const scope = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse, undefined, ConsistencyPreference.HigherConsistency, "01GAHCE4YVKPQEKZQHT2R89MQV");
 
         expect(scope.isDone()).toBe(false);
         const response = await fgaClient.batchCheck({
@@ -661,8 +661,8 @@ describe("OpenFGA Client", () => {
           },
         };
 
-        const scope0 = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse0, undefined, ConsistencyPreference.HigherConsistency);
-        const scope1 = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse1, undefined, ConsistencyPreference.HigherConsistency);
+        const scope0 = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse0, undefined, ConsistencyPreference.HigherConsistency, "01GAHCE4YVKPQEKZQHT2R89MQV");
+        const scope1 = nocks.singleBatchCheck(baseConfig.storeId!, mockedResponse1, undefined, ConsistencyPreference.HigherConsistency, "01GAHCE4YVKPQEKZQHT2R89MQV");
 
         expect(scope0.isDone()).toBe(false);
         expect(scope1.isDone()).toBe(false);
@@ -730,6 +730,33 @@ describe("OpenFGA Client", () => {
         expect(resp2?.error?.inputError).toBe(ErrorCode.RelationNotFound);
         expect(resp2?.error?.message).toBe("relation not found");
       });
+      // it("should throw an error if auth fails", async () => {
+      //   const tuples = [{
+      //     user: "user:81684243-9356-4421-8fbf-a4f8d36aa31b",
+      //     relation: "admin",
+      //     object: "workspace:1",
+      //   }];
+
+      //   const scope0 = nocks.check(baseConfig.storeId!, tuples[0], defaultConfiguration.getBasePath(), {} as any,401);
+      //   const scope1 = nock(defaultConfiguration.getBasePath())
+      //     .get(`/stores/${defaultConfiguration.storeId!}/authorization-models`)
+      //     .query({ page_size: 1 })
+      //     .reply(401, {
+      //       authorization_models: [],
+      //     });
+      //   try {
+      //     await fgaClient.listRelations({
+      //       user: "user:81684243-9356-4421-8fbf-a4f8d36aa31b",
+      //       object: "workspace:1",
+      //       relations: ["admin"],
+      //     });
+      //   } catch (err) {
+      //     expect(err).toBeInstanceOf(FgaApiAuthenticationError);
+      //   } finally {
+      //     expect(scope0.isDone()).toBe(true);
+      //     expect(scope1.isDone()).toBe(false);
+      //   }
+      // });
     });
 
     describe("Expand", () => {

tests/helpers/nocks.ts

@@ -219,10 +219,12 @@ export const getNocks = ((nock: typeof Nock) => ({
     responseBody: BatchCheckResponse,
     basePath = defaultConfiguration.getBasePath(),
     consistency: ConsistencyPreference|undefined | undefined,
+    authorizationModelId = "auth-model-id",
   ) => {
     return nock(basePath)
       .post(`/stores/${storeId}/batch-check`, (body: BatchCheckRequest) =>
-        body.consistency === consistency
+        body.consistency === consistency &&
+        body.authorization_model_id === authorizationModelId
       )
       .reply(200, responseBody);
   },