fix: support enhanced domains

forcedotcom · Dec 16, 2020 · a89ce21 · a89ce21
1 parent 64590cc
commit a89ce21
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/authInfo.ts b/src/authInfo.ts
@@ -225,6 +225,7 @@ function getJwtAudienceUrl(options: OAuth2Options & { createdOrgInstance?: strin
   if (
     createdOrgInstance.startsWith('cs') ||
     createdOrgInstance.endsWith('s') ||
+    options.loginUrl?.includes('sandbox.my.salesforce.com') || // enhanced domains >= 230
     options.loginUrl?.match(/(cs[0-9]+.my.salesforce.com)/g) ||
     (options.loginUrl && urlParse(options.loginUrl).hostname === 'test.salesforce.com')
   ) {

diff --git a/test/unit/authInfoTest.ts b/test/unit/authInfoTest.ts
@@ -1663,6 +1663,17 @@ describe('AuthInfo', () => {
     it('should use the correct audience URL for createdOrgInstance beginning with "gs1"', async () => {
       await runTest({ createdOrgInstance: 'gs1' }, 'https://gs1.salesforce.com');
     });
+
+    it('should use the correct audience URL for production enhanced domains', async () => {
+      await runTest({ loginUrl: 'https://customdomain.my.salesforce.com' }, 'https://login.salesforce.com');
+    });
+
+    it('should use the correct audience URL for sandbox enhanced domains', async () => {
+      await runTest(
+        { loginUrl: 'https://customdomain--sandboxname.sandbox.my.salesforce.com' },
+        'https://test.salesforce.com'
+      );
+    });
   });
 
   describe('getDefaultInstanceUrl', () => {