Fix build error

Codeneos · Dec 18, 2019 · 0b3a197 · 0b3a197
1 parent dd6f03b
commit 0b3a197
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 93 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/src/commands/selectOrgCommand.ts b/src/commands/selectOrgCommand.ts
@@ -63,25 +63,21 @@ export default class SelectOrgCommand extends CommandBase {
             this.logger.log(`Set ${selectedAuthInfo.getUsername()} as target org for Vlocity deploy/refresh operations`);
             if (this.vloService.config.sfdxUsername != selectedAuthInfo.getUsername()) {
                 this.vloService.config.sfdxUsername = selectedAuthInfo.getUsername();
-                this.vloService.config.password = undefined;
-                this.vloService.config.username = undefined;
-                this.vloService.config.instanceUrl = undefined;
-                this.vloService.config.loginUrl = undefined;
             } else {
                 await this.vloService.initialize();
             }
         }
     }
 
     protected async authorizeNewOrg() : Promise<AuthInfo | undefined> {        
-        let newOrgType = await vscode.window.showQuickPick(this.salesforceOrgTypes,
+        const newOrgType = await vscode.window.showQuickPick(this.salesforceOrgTypes,
             { placeHolder: 'Select the type of org you want to authorize' });
 
         if (!newOrgType) {
             return;
         }
 
-        let instanceUrl = newOrgType.instanceUrl || await vscode.window.showInputBox({ 
+        const instanceUrl = newOrgType.instanceUrl || await vscode.window.showInputBox({ 
             placeHolder: 'Enter the login URL of the instance the org lives on',
             validateInput: this.salesforceUrlValidator
         });

diff --git a/src/services/vlocodeService.ts b/src/services/vlocodeService.ts
@@ -253,10 +253,10 @@ export default class VlocodeService implements vscode.Disposable, JsForceConnect
         if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length == 0) {
             return this.hideStatus();
         }
-        if (!config.sfdxUsername && !config.username) {
+        if (!config.sfdxUsername ) {
             return this.showStatus(`$(gear) Select Vlocity org`, VlocodeCommand.selectOrg);
         }
-        return this.showStatus(`$(cloud-upload) Vlocode ${config.sfdxUsername || config.username}`, VlocodeCommand.selectOrg);
+        return this.showStatus(`$(cloud-upload) Vlocode ${config.sfdxUsername}`, VlocodeCommand.selectOrg);
     }
 
     public registerDisposable<T extends  {dispose() : any}>(disposable: T) : T {
@@ -287,9 +287,6 @@ export default class VlocodeService implements vscode.Disposable, JsForceConnect
         if (!await this.datapackService.isVlocityPackageInstalled()) {
             return 'The Vlocity managed package is not installed on your Salesforce instance; select a different Salesforce instance or install Vlocity';
         }
-        if (this.config.username || this.config.password) {
-            vscode.window.showWarningMessage('You have have configured an SFDX username but did not remove the Salesforce username or password');
-        }
     }
 
     public validateWorkspaceFolder() : string | undefined {