fix: use getCacheEndpoint instead invoking session token to get api e…

…ndpoint
momentohq · Nov 26, 2024 · f71d5e6 · f71d5e6
1 parent 1434b28
commit f71d5e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 25 deletions.
diff --git a/packages/client-sdk-nodejs/test/integration/integration-setup.ts b/packages/client-sdk-nodejs/test/integration/integration-setup.ts
@@ -204,6 +204,7 @@ export function SetupIntegrationTest(): {
   cacheClientWithBalancedReadConcern: CacheClient;
   cacheClientWithConsistentReadConcern: CacheClient;
   integrationTestCacheName: string;
+  credentialProvider: CredentialProvider;
 } {
   const cacheName = testCacheName();
 
@@ -238,6 +239,7 @@ export function SetupIntegrationTest(): {
     cacheClientWithBalancedReadConcern: clientWithBalancedReadConcern,
     cacheClientWithConsistentReadConcern: clientWithConsistentReadConcern,
     integrationTestCacheName: cacheName,
+    credentialProvider: credsProvider(),
   };
 }
 

diff --git a/packages/client-sdk-nodejs/test/integration/shared/http/http-apis.test.ts b/packages/client-sdk-nodejs/test/integration/shared/http/http-apis.test.ts
@@ -1,7 +1,6 @@
-import {SetupAuthClientIntegrationTest} from '../../integration-setup';
+import {SetupIntegrationTest} from '../../integration-setup';
 import {runHttpApiTest} from '@gomomento/common-integration-tests/dist/src/http/http-apis';
 
-const {mgaAccountSessionTokenAuthClient, cacheName} =
-  SetupAuthClientIntegrationTest();
+const {credentialProvider, integrationTestCacheName} = SetupIntegrationTest();
 
-runHttpApiTest(mgaAccountSessionTokenAuthClient, cacheName);
+runHttpApiTest(credentialProvider, integrationTestCacheName);
diff --git a/packages/client-sdk-web/test/integration/integration-setup.ts b/packages/client-sdk-web/test/integration/integration-setup.ts
@@ -193,6 +193,7 @@ export function SetupIntegrationTest(): {
   cacheClientWithBalancedReadConcern: CacheClient;
   cacheClientWithConsistentReadConcern: CacheClient;
   integrationTestCacheName: string;
+  credentialProvider: CredentialProvider;
 } {
   const cacheName = testCacheName();
 
@@ -224,6 +225,7 @@ export function SetupIntegrationTest(): {
     cacheClientWithBalancedReadConcern: clientWithBalancedReadConcern,
     cacheClientWithConsistentReadConcern: clientWithConsistentReadConcern,
     integrationTestCacheName: cacheName,
+    credentialProvider: credsProvider(),
   };
 }
 

diff --git a/packages/client-sdk-web/test/integration/shared/http/http-api.test.ts b/packages/client-sdk-web/test/integration/shared/http/http-api.test.ts
@@ -1,7 +1,6 @@
-import {SetupAuthClientIntegrationTest} from '../../integration-setup';
+import {SetupIntegrationTest} from '../../integration-setup';
 import {runHttpApiTest} from '@gomomento/common-integration-tests/dist/src/http/http-apis';
 
-const {mgaAccountSessionTokenAuthClient, cacheName} =
-  SetupAuthClientIntegrationTest();
+const {credentialProvider, integrationTestCacheName} = SetupIntegrationTest();
 
-runHttpApiTest(mgaAccountSessionTokenAuthClient, cacheName);
+runHttpApiTest(credentialProvider, integrationTestCacheName);
diff --git a/packages/common-integration-tests/src/http/http-apis.ts b/packages/common-integration-tests/src/http/http-apis.ts
@@ -1,13 +1,7 @@
-import {ExpiresIn, GenerateApiKey, PermissionScope} from '@gomomento/sdk-core';
-import {InternalSuperUserPermissions} from '@gomomento/sdk-core/dist/src/internal/utils';
-import {IAuthClient} from '@gomomento/sdk-core/dist/src/clients/IAuthClient';
+import {CredentialProvider} from '@gomomento/sdk-core';
 import * as https from 'https';
-
 import {v4} from 'uuid';
 
-const SUPER_USER_PERMISSIONS: PermissionScope =
-  new InternalSuperUserPermissions();
-
 function makeRequest(
   method: string,
   hostname: string,
@@ -109,22 +103,18 @@ function encodeValue(value: string): string {
 }
 
 export function runHttpApiTest(
-  sessionTokenAuthClient: IAuthClient,
+  credentialProvider: CredentialProvider,
   cacheName: string
 ) {
   describe('Momento HTTP API', () => {
     let apiKey: string;
     let baseUrl: string;
+    let cacheEndpoint: string;
 
-    beforeAll(async () => {
-      const resp = await sessionTokenAuthClient.generateApiKey(
-        SUPER_USER_PERMISSIONS,
-        ExpiresIn.minutes(5)
-      );
-      expect(resp).toBeInstanceOf(GenerateApiKey.Success);
-      const successResp = resp as GenerateApiKey.Success;
-      apiKey = successResp.apiKey;
-      baseUrl = `api.cache.${successResp.endpoint}`;
+    beforeAll(() => {
+      cacheEndpoint = credentialProvider.getCacheEndpoint();
+      apiKey = credentialProvider.getAuthToken();
+      baseUrl = `api.${cacheEndpoint}`;
     });
 
     it('should return error on non-existing cache', async () => {