fix: catch lightning urls when passed via -r attribute

Author: maggiben

src/common.ts

@@ -29,10 +29,14 @@ export class Common {
     }
   }
   public static async resolveLoginUrl(instanceUrl: Optional<string>): Promise<Optional<string>> {
+    const logger = await Logger.child('Common', { tag: 'resolveLoginUrl' });
     if (instanceUrl) {
+      if (instanceUrl.includes('lightning.force.com')) {
+        logger.warn(messages.getMessage('invalidInstanceUrl'));
+        throw new SfdxError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
+      }
       return instanceUrl;
     }
-    const logger = await Logger.child('Common', { tag: 'resolveLoginUrl' });
     let loginUrl: string;
     try {
       const project = await SfdxProject.resolve();

test/common.test.ts

@@ -56,7 +56,7 @@ describe('common unit tests', () => {
       const loginUrl = await Common.resolveLoginUrl(undefined);
       expect(loginUrl).to.equal(SfdcUrl.PRODUCTION);
     });
-    it('should throw on lightning login URL', async () => {
+    it('should throw on lightning login URL in sfdcLoginUrl propery', async () => {
       sandbox.stub(SfdxProject.prototype, 'resolveProjectConfig').resolves({
         packageDirectories: [
           {
@@ -69,7 +69,16 @@ describe('common unit tests', () => {
       });
       try {
         await Common.resolveLoginUrl(undefined);
-        expect(1).to.equal('This test is failing because it is expecting an error that is never thrown');
+        sinon.assert.fail('This test is failing because it is expecting an error that is never thrown');
+      } catch (error) {
+        const err = error as SfdxError;
+        expect(err.name).to.equal('URL_WARNING');
+      }
+    });
+    it('should throw on lightning login URL passed in to resolveLoginUrl()', async () => {
+      try {
+        await Common.resolveLoginUrl('https://shanedevhub.lightning.force.com');
+        sinon.assert.fail('This test is failing because it is expecting an error that is never thrown');
       } catch (error) {
         const err = error as SfdxError;
         expect(err.name).to.equal('URL_WARNING');