Merge pull request #1131 from forcedotcom/sm/workspaces-support

feat: workspaces support for myDomain checks
forcedotcom · Aug 29, 2024 · 7bb65a4 · 7bb65a4
2 parents 3409db2 + 81dcfb3
commit 7bb65a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/util/sfdcUrl.ts b/src/util/sfdcUrl.ts
@@ -135,6 +135,7 @@ export class SfdcUrl extends URL {
       '.stm.salesforce.ms',
       '.pc-rnd.force.com',
       '.pc-rnd.salesforce.com',
+      '.wc.crm.dev', // workspaces container
     ];
     return (
       this.origin.startsWith('https://gs1.') ||

diff --git a/test/unit/util/sfdcUrl.test.ts b/test/unit/util/sfdcUrl.test.ts
@@ -179,6 +179,11 @@ describe('util/sfdcUrl', () => {
       expect(url.isInternalUrl()).to.equal(true);
       expect(url.isLocalUrl()).to.equal(true);
     });
+    it('workspaces with port is internal but not local', () => {
+      const url = new SfdcUrl('https://dev.salesforce-com.shane-mclaughlin-0lrfx7zp3l121.wc.crm.dev:6101/');
+      expect(url.isInternalUrl()).to.equal(true);
+      expect(url.isLocalUrl()).to.equal(false);
+    });
   });
 
   describe('checkLightningDomain', () => {