feat: do not display url for basic org:open

Author: mshanemc

messages/open.json

@@ -12,6 +12,7 @@
   "urlonly": "display navigation URL, but don’t launch browser",
   "containerAction": "You are in a headless environment. To access the org %s, open this URL in a browser:\n\n%s",
   "humanSuccess": "Access org %s as user %s with the following URL: %s",
+  "humanSuccessNoUrl": "Opening org %s as user %s",
   "domainWaiting": "Waiting to resolve the Lightning Experience-enabled custom domain...",
   "domainTimeoutError": "The Lightning Experience-enabled custom domain is unavailable.",
   "domainTimeoutAction": "The Lightning Experience-enabled custom domain may take a few more minutes to resolve. Try the \"force:org:open\" command again."

src/commands/force/org/open.ts

@@ -45,22 +45,28 @@ export class OrgOpenCommand extends SfdxCommand {
     const orgId = this.org.getOrgId();
     const username = this.org.getUsername();
     const output = { orgId, url, username };
+    const containerMode = new Env().getBoolean('SFDX_CONTAINER_MODE');
 
-    this.ux.warn(sharedMessages.getMessage('SecurityWarning'));
-    this.ux.log('');
+    // security warning only for --json OR --urlonly OR containerMode
+    if (this.flags.urlonly || this.flags.json || containerMode) {
+      this.ux.warn(sharedMessages.getMessage('SecurityWarning'));
+      this.ux.log('');
+    }
 
-    if (new Env().getBoolean('SFDX_CONTAINER_MODE')) {
+    if (containerMode) {
       // instruct the user that they need to paste the URL into the browser
       this.ux.styledHeader('Action Required!');
       this.ux.log(messages.getMessage('containerAction', [orgId, url]));
       return output;
     }
 
-    this.ux.log(messages.getMessage('humanSuccess', [orgId, username, url]));
-
     if (this.flags.urlonly) {
+      // this includes the URL
+      this.ux.log(messages.getMessage('humanSuccess', [orgId, username, url]));
       return output;
     }
+
+    this.ux.log(messages.getMessage('humanSuccessNoUrl', [orgId, username]));
     // we actually need to open the org
     try {
       this.ux.startSpinner(messages.getMessage('domainWaiting'));
@@ -79,9 +85,8 @@ export class OrgOpenCommand extends SfdxCommand {
       throw SfdxError.wrap(err);
     }
 
-    const openOptions = this.flags.browser
-      ? { app: { name: open.apps[this.flags.browser as string] as open.AppName } }
-      : {};
+    const openOptions =
+      typeof this.flags.browser === 'string' ? { app: { name: open.apps[this.flags.browser] as open.AppName } } : {};
 
     await openUrl(url, openOptions);
     return output;

test/commands/force/org/open.test.ts

@@ -11,6 +11,7 @@ import * as utils from '../../../../src/shared/utils';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'open');
+const sharedMessages = Messages.loadMessages('@salesforce/plugin-org', 'messages');
 
 const orgId = '000000000000000';
 const username = '[email protected]';
@@ -54,6 +55,7 @@ describe('open commands', () => {
         expect(response.status).to.equal(0);
         expect(testJsonStructure(response.result)).to.be.true;
         expect(response.result.url).to.equal(expectedDefaultUrl);
+        expect(response.warnings).to.include(sharedMessages.getMessage('SecurityWarning'));
       });
 
     test
@@ -64,6 +66,7 @@ describe('open commands', () => {
         expect(response.status).to.equal(0);
         expect(testJsonStructure(response.result)).to.be.true;
         expect(response.result.url).to.equal(expectedUrl);
+        expect(response.warnings).to.include(sharedMessages.getMessage('SecurityWarning'));
       });
 
     test
@@ -141,7 +144,7 @@ describe('open commands', () => {
         expect(response.status).to.equal(0);
         expect(testJsonStructure(response.result)).to.be.true;
         expect(response.result.url).to.equal(expectedUrl);
-
+        expect(response.warnings).to.include(sharedMessages.getMessage('SecurityWarning'));
         expect(spies.get('resolver').callCount).to.equal(0);
       });
 
@@ -169,12 +172,22 @@ describe('open commands', () => {
       })
       .stdout()
       .command(['force:org:open', '--targetusername', username, '--path', testPath])
-      .it('calls open and outputs proper success message', (ctx) => {
-        expect(ctx.stdout).to.include(messages.getMessage('humanSuccess', [orgId, username, expectedUrl]));
+      .it('calls open and outputs proper success message (no url)', (ctx) => {
+        expect(ctx.stdout).to.include(messages.getMessage('humanSuccessNoUrl', [orgId, username]));
         expect(spies.get('resolver').callCount).to.equal(1);
         expect(spies.get('open').callCount).to.equal(1);
       });
 
+    test
+      .do(() => {
+        spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').resolves('1.1.1.1'));
+      })
+      .stdout()
+      .command(['force:org:open', '--targetusername', username, '--path', testPath, '--urlonly'])
+      .it('outputs proper warning and message (includes url for --urlonly)', (ctx) => {
+        expect(ctx.stdout).to.include(messages.getMessage('humanSuccess', [orgId, username, expectedUrl]));
+      });
+
     test
       .do(() => {
         spies.set(