fix: test for lightning instance url

salesforcecli · Apr 5, 2021 · d997e96 · d997e96
1 parent a8a8f33
commit d997e96
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/messages/messages.json b/messages/messages.json
@@ -28,5 +28,6 @@
   "warnAuth": "Logging in to a business or production org is not recommended on a demo or shared machine. Please run \"sfdx auth:logout --targetusername <your username> --noprompt\" when finished using this org, which is similar to logging out of the org in the browser.\n\nDo you want to authorize this org for use with the Salesforce CLI (y/n)?",
   "noPromptAuth": "do not prompt for auth confirmation in demo mode",
   "disableMasking": "disable masking of user input (for use with problematic terminals)",
-  "clientSecretStdin": "OAuth client secret of personal connected app?"
+  "clientSecretStdin": "OAuth client secret of personal connected app?",
+  "invalidInstanceUrl": "Invalid instance URL. Specify a Salesforce instance URL using the format <domainname>.salesforce.com"
 }
diff --git a/src/common.ts b/src/common.ts
@@ -5,9 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthInfo, Logger, SfdcUrl, SfdxProject } from '@salesforce/core';
+import { AuthInfo, Logger, SfdcUrl, SfdxProject, Messages, SfdxError } from '@salesforce/core';
 import { getString, isObject, Optional } from '@salesforce/ts-types';
 
+Messages.importMessagesDirectory(__dirname);
+const messages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
+
 interface Flags {
   setalias?: string;
   setdefaultdevhubusername?: boolean;
@@ -40,6 +43,10 @@ export class Common {
       logger.debug(`error occurred while trying to determine loginUrl: ${message}`);
       loginUrl = SfdcUrl.PRODUCTION;
     }
+    if (loginUrl.includes('lightning.force.com')) {
+      logger.warn(messages.getMessage('invalidInstanceUrl'));
+      throw new SfdxError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
+    }
     logger.debug(`loginUrl: ${loginUrl}`);
     return loginUrl;
   }

diff --git a/test/common.test.ts b/test/common.test.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { SfdcUrl, SfdxProject } from '@salesforce/core';
+import { SfdcUrl, SfdxProject, SfdxError } from '@salesforce/core';
 import sinon = require('sinon');
 import { expect } from '@salesforce/command/lib/test';
 import { restoreContext, testSetup } from '@salesforce/core/lib/testSetup';
@@ -56,6 +56,24 @@ describe('common unit tests', () => {
       const loginUrl = await Common.resolveLoginUrl(undefined);
       expect(loginUrl).to.equal(SfdcUrl.PRODUCTION);
     });
+    it('should throw on lightning login URL', async () => {
+      sandbox.stub(SfdxProject.prototype, 'resolveProjectConfig').resolves({
+        packageDirectories: [
+          {
+            path: 'force-app',
+            default: true,
+          },
+        ],
+        sfdcLoginUrl: 'https://shanedevhub.lightning.force.com',
+        sourceApiVersion: '50.0',
+      });
+      try {
+        await Common.resolveLoginUrl(undefined);
+      } catch (error) {
+        const err = error as SfdxError;
+        expect(err.name).to.equal('URL_WARNING');
+      }
+    });
   });
   describe('custom login url', () => {
     const INSTANCE_URL_1 = 'https://example.com';