feat: falcon usa support w/o createdOrgInstance

forcedotcom · Jan 21, 2021 · ec15d37 · ec15d37
1 parent 2bca84c
commit ec15d37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/authInfo.ts b/src/authInfo.ts
@@ -228,6 +228,7 @@ function getJwtAudienceUrl(options: OAuth2Options & { createdOrgInstance?: strin
     options.loginUrl?.includes('sandbox.my.salesforce.com') || // enhanced domains >= 230
     options.loginUrl?.match(/([Cc][Ss][0-9]+.my.salesforce.com)/g) || // my domains
     options.loginUrl?.match(/([Cc][Ss][0-9]+.salesforce.com)/g) || // instance without my domain
+    options.loginUrl?.match(/((usa)[0-9]+s\..+\.salesforce\.com)/g) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
     (options.loginUrl && urlParse(options.loginUrl).hostname === 'test.salesforce.com')
   ) {
     return SfdcUrl.SANDBOX;

diff --git a/test/unit/authInfoTest.ts b/test/unit/authInfoTest.ts
@@ -1694,6 +1694,14 @@ describe('AuthInfo', () => {
         'https://test.salesforce.com'
       );
     });
+
+    it('returns sandbox audience for falcon domains', async () => {
+      await runTest({ loginUrl: 'https://usa2s.sfdc-yfeipo.salesforce.com/' }, 'https://test.salesforce.com');
+    });
+
+    it('returns prod audience for falcon domains', async () => {
+      await runTest({ loginUrl: 'https://usa2.sfdc-yfeipo.salesforce.com/' }, 'https://login.salesforce.com');
+    });
   });
 
   describe('getDefaultInstanceUrl', () => {