fix: correct retURL to startURL for OTP URLs W-18077630 (#1387)

* fix: correct retURL to startURL for OTP URLs

* chore: only encode agent urls for OTP

Author: WillieRuemmele

src/commands/org/open/agent.ts

@@ -57,7 +57,7 @@ export class OrgOpenAgent extends OrgOpenCommandBase<OrgOpenOutput> {
       buildRetUrl(this.connection, flags.name),
     ]);
 
-    return this.openOrgUI(flags, frontDoorUrl, retUrl);
+    return this.openOrgUI(flags, frontDoorUrl, encodeURIComponent(retUrl));
   }
 }
 

src/shared/orgOpenCommandBase.ts

@@ -36,7 +36,9 @@ export abstract class OrgOpenCommandBase<T> extends SfCommand<T> {
 
   protected async openOrgUI(flags: OrgOpenFlags, frontDoorUrl: string, retUrl?: string): Promise<OrgOpenOutput> {
     const orgId = this.org.getOrgId();
-    const url = `${frontDoorUrl}${retUrl ? `&retURL=${retUrl}` : ''}`;
+    const url = `${frontDoorUrl}${
+      retUrl ? `&${frontDoorUrl.includes('.jsp?otp=') ? `startURL=${retUrl}` : `retURL=${retUrl}`}` : ''
+    }`;
 
     // TODO: better typings in sfdx-core for orgs read from auth files
     const username = this.org.getUsername() as string;

test/unit/org/open.test.ts

@@ -7,8 +7,9 @@
 import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import { join } from 'node:path';
+import * as process from 'node:process';
 import { assert, expect } from 'chai';
-import { SfdcUrl, Messages, Connection, SfError } from '@salesforce/core';
+import { Connection, Messages, SfdcUrl, SfError } from '@salesforce/core';
 import { stubMethod } from '@salesforce/ts-sinon';
 import { MockTestOrgData, shouldThrow, TestContext } from '@salesforce/core/testSetup';
 import { stubSfCommandUx, stubSpinner, stubUx } from '@salesforce/sf-plugins-core';