update test client

SalesforceCommerceCloud · Oct 1, 2024 · fc34ee3 · fc34ee3
1 parent 7dc6a31
commit fc34ee3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -177,11 +177,11 @@
   "bundlesize": [
     {
       "path": "lib/**/*.js",
-      "maxSize": "53 kB"
+      "maxSize": "50 kB"
     },
     {
       "path": "commerce-sdk-isomorphic-with-deps.tgz",
-      "maxSize": "450 kB"
+      "maxSize": "430 kB"
     }
   ],
   "proxy": "https://SHORTCODE.api.commercecloud.salesforce.com"

diff --git a/src/static/helpers/slasHelper.test.ts b/src/static/helpers/slasHelper.test.ts
@@ -261,22 +261,15 @@ test('throws error on 400 response', async () => {
 describe('Authorize IDP User', () => {
   test('returns authorization url for 3rd party idp login', async () => {
     const mockSlasClient = createMockSlasClient();
-    const {shortCode, organizationId} = mockSlasClient.clientConfig.parameters;
-
-    // slasClient is copied and tries to make an actual API call
-    nock(`https://${shortCode}.api.commercecloud.salesforce.com`)
-      .get(`/shopper/auth/v1/organizations/${organizationId}/oauth2/authorize`)
-      .query(true)
-      .reply(303, {response_body: 'response_body'}, {location: url});
+    mockSlasClient.clientConfig.baseUri = 'https://{shortCode}.api.commercecloud.salesforce.com/shopper/auth/{version}';
 
     const authResponse = await slasHelper.authorizeIDP(
       mockSlasClient,
       parameters
     );
     const expectedAuthURL =
-      'https://short_code.api.commercecloud.salesforce.com/shopper/auth/v1/organizations/organization_id/oauth2/authorize?redirect_uri=redirect_uri&response_type=code&client_id=client_id&usid=usid&hint=hint&channel_id=site_id&code_challenge=';
-    expect(authResponse.url.replace(/code_challenge=[^&]*/, '')).toBe(
-      expectedAuthURL.replace(/code_challenge=[^&]*/, '')
+      'https://short_code.api.commercecloud.salesforce.com/shopper/auth/v1/organizations/organization_id/oauth2/authorize?client_id=client_id&channel_id=site_id&hint=hint&redirect_uri=redirect_uri&response_type=code&usid=usid';
+    expect(authResponse.url.replace(/[&?]code_challenge=[^&]*/, '')).toBe(      expectedAuthURL
     );
   });
 });

diff --git a/src/static/helpers/slasHelper.ts b/src/static/helpers/slasHelper.ts
@@ -18,6 +18,7 @@ import {
 } from '../../lib/shopperLogin';
 import ResponseError from '../responseError';
 import TemplateURL from '../templateUrl';
+import {BaseUriParameters} from './types';
 
 export const stringToBase64 = isBrowser
   ? btoa
@@ -189,6 +190,7 @@ export async function authorizeIDP(
     organizationId: string;
     clientId: string;
     siteId: string;
+    version?: string;
   }>,
   parameters: {
     redirectURI: string;
@@ -206,13 +208,13 @@ export async function authorizeIDP(
     clientOptions.codeChallenge = await generateCodeChallenge(codeVerifier);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
+  // eslint-disable-next-line
   const apiPath = ShopperLogin.apiPaths.authorizeCustomer;
-
-  const pathParams: ShopperLoginPathParameters = {
+  const pathParams: ShopperLoginPathParameters & Required<BaseUriParameters> = {
     organizationId: slasClient.clientConfig.parameters.organizationId,
+    shortCode: slasClient.clientConfig.parameters.shortCode,
+    version: slasClient.clientConfig.parameters.version || 'v1',
   };
-
   const queryParams: ShopperLoginQueryParameters = {
     client_id: slasClient.clientConfig.parameters.clientId,
     channel_id: slasClient.clientConfig.parameters.siteId,