@salesforce/plugin-org 2.11.8 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +114 -114
- package/lib/commands/force/org/clone.d.ts +8 -8
- package/lib/commands/force/org/clone.js +65 -66
- package/lib/commands/force/org/clone.js.map +1 -1
- package/lib/commands/force/org/create.d.ts +18 -42
- package/lib/commands/force/org/create.js +104 -106
- package/lib/commands/force/org/create.js.map +1 -1
- package/lib/commands/force/org/delete.d.ts +5 -5
- package/lib/commands/force/org/delete.js +42 -44
- package/lib/commands/force/org/delete.js.map +1 -1
- package/lib/commands/force/org/status.d.ts +7 -7
- package/lib/commands/force/org/status.js +48 -50
- package/lib/commands/force/org/status.js.map +1 -1
- package/lib/commands/org/create/sandbox.d.ts +11 -11
- package/lib/commands/org/create/sandbox.js +106 -106
- package/lib/commands/org/create/sandbox.js.map +1 -1
- package/lib/commands/org/create/scratch.d.ts +20 -20
- package/lib/commands/org/create/scratch.js +140 -142
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/delete/sandbox.d.ts +2 -2
- package/lib/commands/org/delete/sandbox.js +27 -28
- package/lib/commands/org/delete/sandbox.js.map +1 -1
- package/lib/commands/org/delete/scratch.d.ts +2 -2
- package/lib/commands/org/delete/scratch.js +26 -27
- package/lib/commands/org/delete/scratch.js.map +1 -1
- package/lib/commands/org/display.d.ts +5 -5
- package/lib/commands/org/display.js +33 -34
- package/lib/commands/org/display.js.map +1 -1
- package/lib/commands/org/list/metadata-types.d.ts +5 -5
- package/lib/commands/org/list/metadata-types.js +38 -40
- package/lib/commands/org/list/metadata-types.js.map +1 -1
- package/lib/commands/org/list/metadata.d.ts +6 -6
- package/lib/commands/org/list/metadata.js +39 -41
- package/lib/commands/org/list/metadata.js.map +1 -1
- package/lib/commands/org/list.d.ts +2 -2
- package/lib/commands/org/list.js +56 -57
- package/lib/commands/org/list.js.map +1 -1
- package/lib/commands/org/open.d.ts +7 -7
- package/lib/commands/org/open.js +61 -61
- package/lib/commands/org/open.js.map +1 -1
- package/lib/commands/org/resume/sandbox.d.ts +6 -6
- package/lib/commands/org/resume/sandbox.js +61 -61
- package/lib/commands/org/resume/sandbox.js.map +1 -1
- package/lib/commands/org/resume/scratch.d.ts +3 -3
- package/lib/commands/org/resume/scratch.js +35 -36
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/shared/flags.d.ts +4 -1
- package/lib/shared/flags.js +10 -11
- package/lib/shared/flags.js.map +1 -1
- package/lib/shared/orgHighlighter.d.ts +1 -1
- package/lib/shared/orgHighlighter.js +4 -9
- package/lib/shared/orgHighlighter.js.map +1 -1
- package/lib/shared/orgHooks.js +1 -2
- package/lib/shared/orgHooks.js.map +1 -1
- package/lib/shared/orgListUtil.d.ts +1 -1
- package/lib/shared/orgListUtil.js +27 -31
- package/lib/shared/orgListUtil.js.map +1 -1
- package/lib/shared/orgTypes.js +2 -5
- package/lib/shared/orgTypes.js.map +1 -1
- package/lib/shared/sandboxCommandBase.d.ts +2 -2
- package/lib/shared/sandboxCommandBase.js +33 -28
- package/lib/shared/sandboxCommandBase.js.map +1 -1
- package/lib/shared/sandboxProgress.d.ts +1 -1
- package/lib/shared/sandboxProgress.js +11 -17
- package/lib/shared/sandboxProgress.js.map +1 -1
- package/lib/shared/sandboxReporter.js +5 -9
- package/lib/shared/sandboxReporter.js.map +1 -1
- package/lib/shared/sandboxRequest.d.ts +5 -0
- package/lib/shared/sandboxRequest.js +21 -20
- package/lib/shared/sandboxRequest.js.map +1 -1
- package/lib/shared/scratchOrgOutput.js +20 -31
- package/lib/shared/scratchOrgOutput.js.map +1 -1
- package/lib/shared/scratchOrgRequest.d.ts +1 -1
- package/lib/shared/scratchOrgRequest.js +4 -8
- package/lib/shared/scratchOrgRequest.js.map +1 -1
- package/lib/shared/stagedProgress.d.ts +1 -1
- package/lib/shared/stagedProgress.js +19 -19
- package/lib/shared/stagedProgress.js.map +1 -1
- package/lib/shared/timeUtils.js +10 -16
- package/lib/shared/timeUtils.js.map +1 -1
- package/lib/shared/utils.d.ts +9 -2
- package/lib/shared/utils.js +13 -14
- package/lib/shared/utils.js.map +1 -1
- package/oclif.lock +7993 -0
- package/oclif.manifest.json +1089 -687
- package/package.json +26 -23
package/lib/commands/org/list.js
CHANGED
|
@@ -1,33 +1,61 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const messages =
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
class OrgListCommand extends
|
|
7
|
+
import { dirname } from 'node:path';
|
|
8
|
+
import { fileURLToPath } from 'node:url';
|
|
9
|
+
import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
10
|
+
import { AuthInfo, Connection, Org, SfError, Messages, Logger } from '@salesforce/core';
|
|
11
|
+
import chalk from 'chalk';
|
|
12
|
+
import { OrgListUtil, identifyActiveOrgByStatus } from '../../shared/orgListUtil.js';
|
|
13
|
+
import { getStyledObject } from '../../shared/orgHighlighter.js';
|
|
14
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
15
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'list');
|
|
16
|
+
export const defaultOrgEmoji = '🍁';
|
|
17
|
+
export const defaultHubEmoji = '🌳';
|
|
18
|
+
export class OrgListCommand extends SfCommand {
|
|
19
|
+
static summary = messages.getMessage('summary');
|
|
20
|
+
static examples = messages.getMessages('examples');
|
|
21
|
+
static aliases = ['force:org:list'];
|
|
22
|
+
static deprecateAliases = true;
|
|
23
|
+
static flags = {
|
|
24
|
+
verbose: Flags.boolean({
|
|
25
|
+
summary: messages.getMessage('flags.verbose.summary'),
|
|
26
|
+
}),
|
|
27
|
+
all: Flags.boolean({
|
|
28
|
+
summary: messages.getMessage('flags.all.summary'),
|
|
29
|
+
}),
|
|
30
|
+
clean: Flags.boolean({
|
|
31
|
+
summary: messages.getMessage('flags.clean.summary'),
|
|
32
|
+
}),
|
|
33
|
+
'no-prompt': Flags.boolean({
|
|
34
|
+
char: 'p',
|
|
35
|
+
summary: messages.getMessage('flags.no-prompt.summary'),
|
|
36
|
+
dependsOn: ['clean'],
|
|
37
|
+
aliases: ['noprompt'],
|
|
38
|
+
deprecateAliases: true,
|
|
39
|
+
}),
|
|
40
|
+
'skip-connection-status': Flags.boolean({
|
|
41
|
+
summary: messages.getMessage('flags.skip-connection-status.summary'),
|
|
42
|
+
aliases: ['skipconnectionstatus'],
|
|
43
|
+
deprecateAliases: true,
|
|
44
|
+
}),
|
|
45
|
+
loglevel,
|
|
46
|
+
};
|
|
47
|
+
flags;
|
|
20
48
|
async run() {
|
|
21
49
|
const [{ flags }, fileNames] = await Promise.all([this.parse(OrgListCommand), getAuthFileNames()]);
|
|
22
50
|
this.flags = flags;
|
|
23
|
-
const metaConfigs = await
|
|
51
|
+
const metaConfigs = await OrgListUtil.readLocallyValidatedMetaConfigsGroupedByOrgType(fileNames, flags['skip-connection-status']);
|
|
24
52
|
const groupedSortedOrgs = {
|
|
25
53
|
devHubs: metaConfigs.devHubs.map(decorateWithDefaultStatus).sort(comparator),
|
|
26
54
|
other: metaConfigs.other.map(decorateWithDefaultStatus).sort(comparator),
|
|
27
55
|
sandboxes: metaConfigs.sandboxes.map(decorateWithDefaultStatus).sort(comparator),
|
|
28
56
|
nonScratchOrgs: metaConfigs.nonScratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
|
|
29
57
|
scratchOrgs: metaConfigs.scratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
|
|
30
|
-
expiredScratchOrgs: metaConfigs.scratchOrgs.filter((org) => !
|
|
58
|
+
expiredScratchOrgs: metaConfigs.scratchOrgs.filter((org) => !identifyActiveOrgByStatus(org)),
|
|
31
59
|
};
|
|
32
60
|
if (flags.clean && groupedSortedOrgs.expiredScratchOrgs.length > 0) {
|
|
33
61
|
await this.cleanScratchOrgs(groupedSortedOrgs.expiredScratchOrgs, !flags['no-prompt']);
|
|
@@ -42,7 +70,7 @@ class OrgListCommand extends sf_plugins_core_1.SfCommand {
|
|
|
42
70
|
devHubs: groupedSortedOrgs.devHubs,
|
|
43
71
|
scratchOrgs: flags.all
|
|
44
72
|
? groupedSortedOrgs.scratchOrgs
|
|
45
|
-
: groupedSortedOrgs.scratchOrgs.filter(
|
|
73
|
+
: groupedSortedOrgs.scratchOrgs.filter(identifyActiveOrgByStatus),
|
|
46
74
|
};
|
|
47
75
|
this.printOrgTable({
|
|
48
76
|
devHubs: result.devHubs,
|
|
@@ -52,7 +80,7 @@ class OrgListCommand extends sf_plugins_core_1.SfCommand {
|
|
|
52
80
|
skipconnectionstatus: flags['skip-connection-status'],
|
|
53
81
|
});
|
|
54
82
|
this.info(`
|
|
55
|
-
Legend: ${
|
|
83
|
+
Legend: ${defaultHubEmoji}=Default DevHub, ${defaultOrgEmoji}=Default Org ${flags.all ? '' : ' Use --all to see expired and deleted scratch orgs'}`);
|
|
56
84
|
return result;
|
|
57
85
|
}
|
|
58
86
|
async cleanScratchOrgs(scratchOrgs, prompt) {
|
|
@@ -61,21 +89,21 @@ Legend: ${exports.defaultHubEmoji}=Default DevHub, ${exports.defaultOrgEmoji}=D
|
|
|
61
89
|
}
|
|
62
90
|
await Promise.all(scratchOrgs.map(async (fields) => {
|
|
63
91
|
try {
|
|
64
|
-
const authInfo = await
|
|
65
|
-
const connection = await
|
|
92
|
+
const authInfo = await AuthInfo.create({ username: fields.username });
|
|
93
|
+
const connection = await Connection.create({
|
|
66
94
|
authInfo,
|
|
67
95
|
configAggregator: {
|
|
68
96
|
// Force an api version to prevent connection check with the server for expired orgs.
|
|
69
97
|
getInfo: () => ({ value: '47.0' }),
|
|
70
98
|
},
|
|
71
99
|
});
|
|
72
|
-
const org = await
|
|
100
|
+
const org = await Org.create({ aliasOrUsername: fields.username, connection });
|
|
73
101
|
await org.remove();
|
|
74
102
|
}
|
|
75
103
|
catch (e) {
|
|
76
104
|
this.warn(messages.getMessage('cleanWarning', [fields.username, this.config.bin, fields.username]));
|
|
77
105
|
if (e instanceof Error) {
|
|
78
|
-
const logger = await
|
|
106
|
+
const logger = await Logger.child('org:list');
|
|
79
107
|
logger.debug(`Error cleaning org ${fields.username}: ${e.message}`);
|
|
80
108
|
}
|
|
81
109
|
}
|
|
@@ -90,21 +118,21 @@ Legend: ${exports.defaultHubEmoji}=Default DevHub, ${exports.defaultOrgEmoji}=D
|
|
|
90
118
|
...devHubs
|
|
91
119
|
.map(addType('DevHub'))
|
|
92
120
|
.map(colorEveryFieldButConnectedStatus(chalk.cyanBright))
|
|
93
|
-
.map((row) =>
|
|
121
|
+
.map((row) => getStyledObject(row))
|
|
94
122
|
.map(statusToEmoji),
|
|
95
123
|
...other
|
|
96
124
|
.map(colorEveryFieldButConnectedStatus(chalk.magentaBright))
|
|
97
|
-
.map((row) =>
|
|
125
|
+
.map((row) => getStyledObject(row))
|
|
98
126
|
.map(statusToEmoji),
|
|
99
127
|
...sandboxes
|
|
100
128
|
.map(addType('Sandbox'))
|
|
101
129
|
.map(colorEveryFieldButConnectedStatus(chalk.yellowBright))
|
|
102
|
-
.map((row) =>
|
|
130
|
+
.map((row) => getStyledObject(row))
|
|
103
131
|
.map(statusToEmoji),
|
|
104
132
|
...scratchOrgs
|
|
105
133
|
.map((row) => ({ ...row, type: 'Scratch' }))
|
|
106
134
|
.map(convertScratchOrgStatus)
|
|
107
|
-
.map((row) =>
|
|
135
|
+
.map((row) => getStyledObject(row))
|
|
108
136
|
.map(statusToEmoji),
|
|
109
137
|
];
|
|
110
138
|
this.table(allOrgs.map((org) => Object.fromEntries(Object.entries(org).filter(fieldFilter))), {
|
|
@@ -134,35 +162,6 @@ Legend: ${exports.defaultHubEmoji}=Default DevHub, ${exports.defaultOrgEmoji}=D
|
|
|
134
162
|
});
|
|
135
163
|
}
|
|
136
164
|
}
|
|
137
|
-
exports.OrgListCommand = OrgListCommand;
|
|
138
|
-
OrgListCommand.summary = messages.getMessage('summary');
|
|
139
|
-
OrgListCommand.examples = messages.getMessages('examples');
|
|
140
|
-
OrgListCommand.aliases = ['force:org:list'];
|
|
141
|
-
OrgListCommand.deprecateAliases = true;
|
|
142
|
-
OrgListCommand.flags = {
|
|
143
|
-
verbose: sf_plugins_core_1.Flags.boolean({
|
|
144
|
-
summary: messages.getMessage('flags.verbose.summary'),
|
|
145
|
-
}),
|
|
146
|
-
all: sf_plugins_core_1.Flags.boolean({
|
|
147
|
-
summary: messages.getMessage('flags.all.summary'),
|
|
148
|
-
}),
|
|
149
|
-
clean: sf_plugins_core_1.Flags.boolean({
|
|
150
|
-
summary: messages.getMessage('flags.clean.summary'),
|
|
151
|
-
}),
|
|
152
|
-
'no-prompt': sf_plugins_core_1.Flags.boolean({
|
|
153
|
-
char: 'p',
|
|
154
|
-
summary: messages.getMessage('flags.no-prompt.summary'),
|
|
155
|
-
dependsOn: ['clean'],
|
|
156
|
-
aliases: ['noprompt'],
|
|
157
|
-
deprecateAliases: true,
|
|
158
|
-
}),
|
|
159
|
-
'skip-connection-status': sf_plugins_core_1.Flags.boolean({
|
|
160
|
-
summary: messages.getMessage('flags.skip-connection-status.summary'),
|
|
161
|
-
aliases: ['skipconnectionstatus'],
|
|
162
|
-
deprecateAliases: true,
|
|
163
|
-
}),
|
|
164
|
-
loglevel: sf_plugins_core_1.loglevel,
|
|
165
|
-
};
|
|
166
165
|
const decorateWithDefaultStatus = (val) => ({
|
|
167
166
|
...val,
|
|
168
167
|
...(val.isDefaultDevHubUsername ? { defaultMarker: '(D)' } : {}),
|
|
@@ -171,7 +170,7 @@ const decorateWithDefaultStatus = (val) => ({
|
|
|
171
170
|
});
|
|
172
171
|
const statusToEmoji = (val) => ({
|
|
173
172
|
...val,
|
|
174
|
-
defaultMarker: val.defaultMarker?.replace('(D)',
|
|
173
|
+
defaultMarker: val.defaultMarker?.replace('(D)', defaultHubEmoji)?.replace('(U)', defaultOrgEmoji),
|
|
175
174
|
});
|
|
176
175
|
const EMPTIES_LAST = 'zzzzzzzzzz';
|
|
177
176
|
// sort by alias then username
|
|
@@ -181,12 +180,12 @@ const comparator = (a, b) => {
|
|
|
181
180
|
};
|
|
182
181
|
const getAuthFileNames = async () => {
|
|
183
182
|
try {
|
|
184
|
-
return ((await
|
|
183
|
+
return ((await AuthInfo.listAllAuthorizations()) ?? []).map((auth) => auth.username);
|
|
185
184
|
}
|
|
186
185
|
catch (err) {
|
|
187
186
|
const error = err;
|
|
188
187
|
if (error.name === 'NoAuthInfoFound') {
|
|
189
|
-
throw new
|
|
188
|
+
throw new SfError(messages.getMessage('noOrgsFound'), 'noOrgsFound', [messages.getMessage('noOrgsFoundAction')]);
|
|
190
189
|
}
|
|
191
190
|
else {
|
|
192
191
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,13 @@ export declare class OrgOpenCommand extends SfCommand<OrgOpenOutput> {
|
|
|
7
7
|
static readonly aliases: string[];
|
|
8
8
|
static deprecateAliases: boolean;
|
|
9
9
|
static readonly flags: {
|
|
10
|
-
'target-org': import("@oclif/core/lib/interfaces").OptionFlag<Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
11
|
-
'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
12
|
-
browser: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
13
|
-
path: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
14
|
-
'url-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
15
|
-
loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
16
|
-
'source-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
10
|
+
'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
11
|
+
'api-version': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
12
|
+
browser: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
13
|
+
path: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
14
|
+
'url-only': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
15
|
+
loglevel: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
16
|
+
'source-file': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
17
17
|
};
|
|
18
18
|
private org;
|
|
19
19
|
private conn;
|
package/lib/commands/org/open.js
CHANGED
|
@@ -1,29 +1,66 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const messages =
|
|
19
|
-
const sharedMessages =
|
|
20
|
-
class OrgOpenCommand extends
|
|
7
|
+
import path from 'node:path';
|
|
8
|
+
import { dirname } from 'node:path';
|
|
9
|
+
import { fileURLToPath } from 'node:url';
|
|
10
|
+
import { Flags, loglevel, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, SfCommand, } from '@salesforce/sf-plugins-core';
|
|
11
|
+
import { Logger, Messages, Org, SfdcUrl, SfError } from '@salesforce/core';
|
|
12
|
+
import { Duration, Env } from '@salesforce/kit';
|
|
13
|
+
import { MetadataResolver } from '@salesforce/source-deploy-retrieve';
|
|
14
|
+
import { apps } from 'open';
|
|
15
|
+
import utils from '../../shared/utils.js';
|
|
16
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
17
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'open');
|
|
18
|
+
const sharedMessages = Messages.loadMessages('@salesforce/plugin-org', 'messages');
|
|
19
|
+
export class OrgOpenCommand extends SfCommand {
|
|
20
|
+
static summary = messages.getMessage('summary');
|
|
21
|
+
static description = messages.getMessage('description');
|
|
22
|
+
static examples = messages.getMessages('examples');
|
|
23
|
+
static aliases = ['force:org:open', 'force:source:open'];
|
|
24
|
+
static deprecateAliases = true;
|
|
25
|
+
static flags = {
|
|
26
|
+
'target-org': requiredOrgFlagWithDeprecations,
|
|
27
|
+
'api-version': orgApiVersionFlagWithDeprecations,
|
|
28
|
+
browser: Flags.string({
|
|
29
|
+
char: 'b',
|
|
30
|
+
summary: messages.getMessage('flags.browser.summary'),
|
|
31
|
+
options: ['chrome', 'edge', 'firefox'],
|
|
32
|
+
exclusive: ['url-only'],
|
|
33
|
+
}),
|
|
34
|
+
path: Flags.string({
|
|
35
|
+
char: 'p',
|
|
36
|
+
summary: messages.getMessage('flags.path.summary'),
|
|
37
|
+
env: 'FORCE_OPEN_URL',
|
|
38
|
+
exclusive: ['source-file'],
|
|
39
|
+
parse: (input) => Promise.resolve(encodeURIComponent(decodeURIComponent(input))),
|
|
40
|
+
}),
|
|
41
|
+
'url-only': Flags.boolean({
|
|
42
|
+
char: 'r',
|
|
43
|
+
summary: messages.getMessage('flags.url-only.summary'),
|
|
44
|
+
aliases: ['urlonly'],
|
|
45
|
+
deprecateAliases: true,
|
|
46
|
+
}),
|
|
47
|
+
loglevel,
|
|
48
|
+
'source-file': Flags.file({
|
|
49
|
+
char: 'f',
|
|
50
|
+
aliases: ['sourcefile'],
|
|
51
|
+
exclusive: ['path'],
|
|
52
|
+
deprecateAliases: true,
|
|
53
|
+
summary: messages.getMessage('flags.source-file.summary'),
|
|
54
|
+
}),
|
|
55
|
+
};
|
|
56
|
+
org;
|
|
57
|
+
conn;
|
|
21
58
|
async run() {
|
|
22
59
|
const { flags } = await this.parse(OrgOpenCommand);
|
|
23
60
|
this.org = flags['target-org'];
|
|
24
61
|
this.conn = this.org.getConnection(flags['api-version']);
|
|
25
62
|
let url = await this.buildFrontdoorUrl();
|
|
26
|
-
const env = new
|
|
63
|
+
const env = new Env();
|
|
27
64
|
if (flags['source-file']) {
|
|
28
65
|
url += `&retURL=${await this.generateFileUrl(flags['source-file'])}`;
|
|
29
66
|
}
|
|
@@ -56,7 +93,7 @@ class OrgOpenCommand extends sf_plugins_core_1.SfCommand {
|
|
|
56
93
|
// we actually need to open the org
|
|
57
94
|
try {
|
|
58
95
|
this.spinner.start(messages.getMessage('domainWaiting'));
|
|
59
|
-
const sfdcUrl = new
|
|
96
|
+
const sfdcUrl = new SfdcUrl(url);
|
|
60
97
|
await sfdcUrl.checkLightningDomain();
|
|
61
98
|
this.spinner.stop();
|
|
62
99
|
}
|
|
@@ -65,32 +102,32 @@ class OrgOpenCommand extends sf_plugins_core_1.SfCommand {
|
|
|
65
102
|
if (err.message.includes('timeout')) {
|
|
66
103
|
const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.[1]}.lightning.force.com`;
|
|
67
104
|
const domainRetryTimeout = env.getNumber('SF_DOMAIN_RETRY') ?? env.getNumber('SFDX_DOMAIN_RETRY', 240);
|
|
68
|
-
const timeout = new
|
|
69
|
-
const logger = await
|
|
105
|
+
const timeout = new Duration(domainRetryTimeout, Duration.Unit.SECONDS);
|
|
106
|
+
const logger = await Logger.child(this.constructor.name);
|
|
70
107
|
logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
|
|
71
|
-
throw new
|
|
108
|
+
throw new SfError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError');
|
|
72
109
|
}
|
|
73
|
-
throw
|
|
110
|
+
throw SfError.wrap(err);
|
|
74
111
|
}
|
|
75
112
|
throw err;
|
|
76
113
|
}
|
|
77
114
|
const openOptions = flags.browser
|
|
78
115
|
? // assertion can be removed once oclif option flag typings are fixed
|
|
79
|
-
{ app: { name:
|
|
116
|
+
{ app: { name: apps[flags.browser] } }
|
|
80
117
|
: {};
|
|
81
|
-
await
|
|
118
|
+
await utils.openUrl(url, openOptions);
|
|
82
119
|
return output;
|
|
83
120
|
}
|
|
84
121
|
async buildFrontdoorUrl() {
|
|
85
122
|
await this.org.refreshAuth(); // we need a live accessToken for the frontdoor url
|
|
86
123
|
const accessToken = this.conn.accessToken;
|
|
87
|
-
const instanceUrl = this.org.getField(
|
|
124
|
+
const instanceUrl = this.org.getField(Org.Fields.INSTANCE_URL);
|
|
88
125
|
const instanceUrlClean = instanceUrl.replace(/\/$/, '');
|
|
89
126
|
return `${instanceUrlClean}/secur/frontdoor.jsp?sid=${accessToken}`;
|
|
90
127
|
}
|
|
91
128
|
async generateFileUrl(file) {
|
|
92
129
|
try {
|
|
93
|
-
const metadataResolver = new
|
|
130
|
+
const metadataResolver = new MetadataResolver();
|
|
94
131
|
const components = metadataResolver.getComponentsFromPath(file);
|
|
95
132
|
const typeName = components[0]?.type?.name;
|
|
96
133
|
if (typeName === 'FlexiPage') {
|
|
@@ -115,43 +152,6 @@ class OrgOpenCommand extends sf_plugins_core_1.SfCommand {
|
|
|
115
152
|
}
|
|
116
153
|
}
|
|
117
154
|
}
|
|
118
|
-
exports.OrgOpenCommand = OrgOpenCommand;
|
|
119
|
-
OrgOpenCommand.summary = messages.getMessage('summary');
|
|
120
|
-
OrgOpenCommand.description = messages.getMessage('description');
|
|
121
|
-
OrgOpenCommand.examples = messages.getMessages('examples');
|
|
122
|
-
OrgOpenCommand.aliases = ['force:org:open', 'force:source:open'];
|
|
123
|
-
OrgOpenCommand.deprecateAliases = true;
|
|
124
|
-
OrgOpenCommand.flags = {
|
|
125
|
-
'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
|
|
126
|
-
'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
|
|
127
|
-
browser: sf_plugins_core_1.Flags.string({
|
|
128
|
-
char: 'b',
|
|
129
|
-
summary: messages.getMessage('flags.browser.summary'),
|
|
130
|
-
options: ['chrome', 'edge', 'firefox'],
|
|
131
|
-
exclusive: ['url-only'],
|
|
132
|
-
}),
|
|
133
|
-
path: sf_plugins_core_1.Flags.string({
|
|
134
|
-
char: 'p',
|
|
135
|
-
summary: messages.getMessage('flags.path.summary'),
|
|
136
|
-
env: 'FORCE_OPEN_URL',
|
|
137
|
-
exclusive: ['source-file'],
|
|
138
|
-
parse: (input) => Promise.resolve(encodeURIComponent(decodeURIComponent(input))),
|
|
139
|
-
}),
|
|
140
|
-
'url-only': sf_plugins_core_1.Flags.boolean({
|
|
141
|
-
char: 'r',
|
|
142
|
-
summary: messages.getMessage('flags.url-only.summary'),
|
|
143
|
-
aliases: ['urlonly'],
|
|
144
|
-
deprecateAliases: true,
|
|
145
|
-
}),
|
|
146
|
-
loglevel: sf_plugins_core_1.loglevel,
|
|
147
|
-
'source-file': sf_plugins_core_1.Flags.file({
|
|
148
|
-
char: 'f',
|
|
149
|
-
aliases: ['sourcefile'],
|
|
150
|
-
exclusive: ['path'],
|
|
151
|
-
deprecateAliases: true,
|
|
152
|
-
summary: messages.getMessage('flags.source-file.summary'),
|
|
153
|
-
}),
|
|
154
|
-
};
|
|
155
155
|
/** query the rest API to turn a flow's filepath into a FlowId (starts with 301) */
|
|
156
156
|
const flowFileNameToId = async (conn, filePath) => {
|
|
157
157
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/commands/org/open.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/commands/org/open.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Org, SandboxProcessObject } from '@salesforce/core';
|
|
2
2
|
import { Duration } from '@salesforce/kit';
|
|
3
|
-
import
|
|
4
|
-
import { SandboxCommandBase } from '../../../shared/sandboxCommandBase';
|
|
3
|
+
import { Interfaces } from '@oclif/core';
|
|
4
|
+
import { SandboxCommandBase } from '../../../shared/sandboxCommandBase.js';
|
|
5
5
|
export default class ResumeSandbox extends SandboxCommandBase<SandboxProcessObject> {
|
|
6
6
|
static summary: string;
|
|
7
7
|
static description: string;
|
|
@@ -9,11 +9,11 @@ export default class ResumeSandbox extends SandboxCommandBase<SandboxProcessObje
|
|
|
9
9
|
static readonly aliases: string[];
|
|
10
10
|
static readonly deprecateAliases = true;
|
|
11
11
|
static flags: {
|
|
12
|
-
wait: Interfaces.OptionFlag<Duration
|
|
13
|
-
name: Interfaces.OptionFlag<string | undefined,
|
|
14
|
-
'job-id': Interfaces.OptionFlag<string | undefined,
|
|
12
|
+
wait: Interfaces.OptionFlag<Duration, Interfaces.CustomOptions>;
|
|
13
|
+
name: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
14
|
+
'job-id': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
15
15
|
'use-most-recent': Interfaces.BooleanFlag<boolean>;
|
|
16
|
-
'target-org': Interfaces.OptionFlag<Org
|
|
16
|
+
'target-org': Interfaces.OptionFlag<Org, Interfaces.CustomOptions>;
|
|
17
17
|
};
|
|
18
18
|
private flags;
|
|
19
19
|
run(): Promise<SandboxProcessObject>;
|