@salesforce/plugin-org 6.0.26 → 7.0.0
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 +20 -20
- package/lib/commands/org/create/scratch.js +2 -7
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/display.js +4 -16
- package/lib/commands/org/display.js.map +1 -1
- package/lib/commands/org/list.js +1 -7
- package/lib/commands/org/list.js.map +1 -1
- package/lib/commands/org/resume/scratch.js +2 -7
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/shared/orgListUtil.js +3 -9
- package/lib/shared/orgListUtil.js.map +1 -1
- package/messages/secrets-redacted.md +0 -4
- package/oclif.manifest.json +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -161,7 +161,7 @@ EXAMPLES
|
|
|
161
161
|
$ sf org auth show-access-token --target-org my-org --json
|
|
162
162
|
```
|
|
163
163
|
|
|
164
|
-
_See code: [src/commands/org/auth/show-access-token.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
164
|
+
_See code: [src/commands/org/auth/show-access-token.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/auth/show-access-token.ts)_
|
|
165
165
|
|
|
166
166
|
## `sf org auth show-sfdx-auth-url`
|
|
167
167
|
|
|
@@ -205,7 +205,7 @@ EXAMPLES
|
|
|
205
205
|
$ sf org auth show-sfdx-auth-url --target-org my-org --json
|
|
206
206
|
```
|
|
207
207
|
|
|
208
|
-
_See code: [src/commands/org/auth/show-sfdx-auth-url.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
208
|
+
_See code: [src/commands/org/auth/show-sfdx-auth-url.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/auth/show-sfdx-auth-url.ts)_
|
|
209
209
|
|
|
210
210
|
## `sf org auth show-user-password`
|
|
211
211
|
|
|
@@ -252,7 +252,7 @@ EXAMPLES
|
|
|
252
252
|
$ sf org auth show-user-password --target-org my-org --json
|
|
253
253
|
```
|
|
254
254
|
|
|
255
|
-
_See code: [src/commands/org/auth/show-user-password.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
255
|
+
_See code: [src/commands/org/auth/show-user-password.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/auth/show-user-password.ts)_
|
|
256
256
|
|
|
257
257
|
## `sf org create agent-user`
|
|
258
258
|
|
|
@@ -330,7 +330,7 @@ FLAG DESCRIPTIONS
|
|
|
330
330
|
"agent.user.<GUID>@your-org-domain.com".
|
|
331
331
|
```
|
|
332
332
|
|
|
333
|
-
_See code: [src/commands/org/create/agent-user.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
333
|
+
_See code: [src/commands/org/create/agent-user.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/create/agent-user.ts)_
|
|
334
334
|
|
|
335
335
|
## `sf org create sandbox`
|
|
336
336
|
|
|
@@ -464,7 +464,7 @@ FLAG DESCRIPTIONS
|
|
|
464
464
|
You can specify either --source-sandbox-name or --source-id when cloning an existing sandbox, but not both.
|
|
465
465
|
```
|
|
466
466
|
|
|
467
|
-
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
467
|
+
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/create/sandbox.ts)_
|
|
468
468
|
|
|
469
469
|
## `sf org create scratch`
|
|
470
470
|
|
|
@@ -646,7 +646,7 @@ FLAG DESCRIPTIONS
|
|
|
646
646
|
Omit this flag to have Salesforce generate a unique username for your org.
|
|
647
647
|
```
|
|
648
648
|
|
|
649
|
-
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
649
|
+
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/create/scratch.ts)_
|
|
650
650
|
|
|
651
651
|
## `sf org delete sandbox`
|
|
652
652
|
|
|
@@ -692,7 +692,7 @@ EXAMPLES
|
|
|
692
692
|
$ sf org delete sandbox --target-org my-sandbox --no-prompt
|
|
693
693
|
```
|
|
694
694
|
|
|
695
|
-
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
695
|
+
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/delete/sandbox.ts)_
|
|
696
696
|
|
|
697
697
|
## `sf org delete scratch`
|
|
698
698
|
|
|
@@ -736,7 +736,7 @@ EXAMPLES
|
|
|
736
736
|
$ sf org delete scratch --target-org my-scratch-org --no-prompt
|
|
737
737
|
```
|
|
738
738
|
|
|
739
|
-
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
739
|
+
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/delete/scratch.ts)_
|
|
740
740
|
|
|
741
741
|
## `sf org disable tracking`
|
|
742
742
|
|
|
@@ -775,7 +775,7 @@ EXAMPLES
|
|
|
775
775
|
$ sf org disable tracking
|
|
776
776
|
```
|
|
777
777
|
|
|
778
|
-
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
778
|
+
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/disable/tracking.ts)_
|
|
779
779
|
|
|
780
780
|
## `sf org display`
|
|
781
781
|
|
|
@@ -820,7 +820,7 @@ EXAMPLES
|
|
|
820
820
|
$ sf org display --target-org TestOrg1 --verbose
|
|
821
821
|
```
|
|
822
822
|
|
|
823
|
-
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
823
|
+
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/display.ts)_
|
|
824
824
|
|
|
825
825
|
## `sf org enable tracking`
|
|
826
826
|
|
|
@@ -862,7 +862,7 @@ EXAMPLES
|
|
|
862
862
|
$ sf org enable tracking
|
|
863
863
|
```
|
|
864
864
|
|
|
865
|
-
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
865
|
+
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/enable/tracking.ts)_
|
|
866
866
|
|
|
867
867
|
## `sf org list`
|
|
868
868
|
|
|
@@ -901,7 +901,7 @@ EXAMPLES
|
|
|
901
901
|
$ sf org list --clean
|
|
902
902
|
```
|
|
903
903
|
|
|
904
|
-
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
904
|
+
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/list.ts)_
|
|
905
905
|
|
|
906
906
|
## `sf org list metadata`
|
|
907
907
|
|
|
@@ -968,7 +968,7 @@ FLAG DESCRIPTIONS
|
|
|
968
968
|
Examples of metadata types that use folders are Dashboard, Document, EmailTemplate, and Report.
|
|
969
969
|
```
|
|
970
970
|
|
|
971
|
-
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
971
|
+
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/list/metadata.ts)_
|
|
972
972
|
|
|
973
973
|
## `sf org list metadata-types`
|
|
974
974
|
|
|
@@ -1023,7 +1023,7 @@ FLAG DESCRIPTIONS
|
|
|
1023
1023
|
Override the api version used for api requests made by this command
|
|
1024
1024
|
```
|
|
1025
1025
|
|
|
1026
|
-
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1026
|
+
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/list/metadata-types.ts)_
|
|
1027
1027
|
|
|
1028
1028
|
## `sf org open`
|
|
1029
1029
|
|
|
@@ -1099,7 +1099,7 @@ EXAMPLES
|
|
|
1099
1099
|
$ sf org open --source-file force-app/main/default/bots/Coral_Cloud_Agent/Coral_Cloud_Agent.bot-meta.xml
|
|
1100
1100
|
```
|
|
1101
1101
|
|
|
1102
|
-
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1102
|
+
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/open.ts)_
|
|
1103
1103
|
|
|
1104
1104
|
## `sf org open agent`
|
|
1105
1105
|
|
|
@@ -1163,7 +1163,7 @@ EXAMPLES
|
|
|
1163
1163
|
$ sf org open agent --authoring-bundle Coral_Cloud_Agent --version 1
|
|
1164
1164
|
```
|
|
1165
1165
|
|
|
1166
|
-
_See code: [src/commands/org/open/agent.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1166
|
+
_See code: [src/commands/org/open/agent.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/open/agent.ts)_
|
|
1167
1167
|
|
|
1168
1168
|
## `sf org open authoring-bundle`
|
|
1169
1169
|
|
|
@@ -1209,7 +1209,7 @@ EXAMPLES
|
|
|
1209
1209
|
$ sf org open authoring-bundle --target-org MyTestOrg1 --browser firefox
|
|
1210
1210
|
```
|
|
1211
1211
|
|
|
1212
|
-
_See code: [src/commands/org/open/authoring-bundle.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1212
|
+
_See code: [src/commands/org/open/authoring-bundle.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/open/authoring-bundle.ts)_
|
|
1213
1213
|
|
|
1214
1214
|
## `sf org refresh sandbox`
|
|
1215
1215
|
|
|
@@ -1312,7 +1312,7 @@ FLAG DESCRIPTIONS
|
|
|
1312
1312
|
You can specify either --source-sandbox-name or --source-id when refreshing an existing sandbox, but not both.
|
|
1313
1313
|
```
|
|
1314
1314
|
|
|
1315
|
-
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1315
|
+
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/refresh/sandbox.ts)_
|
|
1316
1316
|
|
|
1317
1317
|
## `sf org resume sandbox`
|
|
1318
1318
|
|
|
@@ -1375,7 +1375,7 @@ FLAG DESCRIPTIONS
|
|
|
1375
1375
|
returns the job ID. To resume checking the sandbox creation, rerun this command.
|
|
1376
1376
|
```
|
|
1377
1377
|
|
|
1378
|
-
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1378
|
+
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/resume/sandbox.ts)_
|
|
1379
1379
|
|
|
1380
1380
|
## `sf org resume scratch`
|
|
1381
1381
|
|
|
@@ -1428,6 +1428,6 @@ FLAG DESCRIPTIONS
|
|
|
1428
1428
|
returns the job ID. To resume checking the scratch creation, rerun this command.
|
|
1429
1429
|
```
|
|
1430
1430
|
|
|
1431
|
-
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/
|
|
1431
|
+
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/7.0.0/src/commands/org/resume/scratch.ts)_
|
|
1432
1432
|
|
|
1433
1433
|
<!-- commandsstop -->
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
17
|
-
import {
|
|
17
|
+
import { Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, SfError, } from '@salesforce/core';
|
|
18
18
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
19
19
|
import { Duration, omit } from '@salesforce/kit';
|
|
20
20
|
import terminalLink from 'terminal-link';
|
|
@@ -224,21 +224,16 @@ export default class OrgCreateScratch extends SfCommand {
|
|
|
224
224
|
else {
|
|
225
225
|
this.logSuccess(messages.getMessage('success'));
|
|
226
226
|
}
|
|
227
|
-
// TODO: Remove env var workaround
|
|
228
|
-
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
229
227
|
const accessTokenRedacted = secretsMessages.getMessage('redacted.accessToken');
|
|
230
228
|
const redactedAuthFields = authFields
|
|
231
229
|
? {
|
|
232
230
|
...authFields,
|
|
233
|
-
accessToken:
|
|
231
|
+
accessToken: accessTokenRedacted,
|
|
234
232
|
refreshToken: undefined,
|
|
235
233
|
clientSecret: undefined,
|
|
236
234
|
}
|
|
237
235
|
: undefined;
|
|
238
236
|
const redactedScratchOrgInfo = omit(scratchOrgInfo, ['AuthCode']);
|
|
239
|
-
if (this.jsonEnabled() && showSecretsEnvVarIsSet) {
|
|
240
|
-
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org create scratch --json']));
|
|
241
|
-
}
|
|
242
237
|
return {
|
|
243
238
|
username,
|
|
244
239
|
scratchOrgInfo: redactedScratchOrgInfo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,13 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Flags, SfCommand, requiredOrgFlagWithDeprecations, loglevel, orgApiVersionFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
|
|
17
|
-
import { AuthInfo,
|
|
17
|
+
import { AuthInfo, Messages, SfError, trimTo15 } from '@salesforce/core';
|
|
18
18
|
import { camelCaseToTitleCase } from '@salesforce/kit';
|
|
19
19
|
import { getAliasByUsername } from '../../shared/utils.js';
|
|
20
20
|
import { getStyledValue } from '../../shared/orgHighlighter.js';
|
|
21
21
|
import { OrgListUtil } from '../../shared/orgListUtil.js';
|
|
22
22
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
23
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'display');
|
|
24
|
-
const sharedMessages = Messages.loadMessages('@salesforce/plugin-org', 'messages');
|
|
25
24
|
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
26
25
|
export class OrgDisplayCommand extends SfCommand {
|
|
27
26
|
static summary = messages.getMessage('summary');
|
|
@@ -43,8 +42,6 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
43
42
|
this.org = flags['target-org'];
|
|
44
43
|
this.org.getConnection(flags['api-version']);
|
|
45
44
|
try {
|
|
46
|
-
// TODO: Once env var is removed, this refresh could be removed.
|
|
47
|
-
// the auth file might have a stale access token. We want to refresh it before getting the fields
|
|
48
45
|
await this.org.refreshAuth();
|
|
49
46
|
}
|
|
50
47
|
catch {
|
|
@@ -54,8 +51,6 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
54
51
|
const accessTokenRedactedMessage = secretsMessages.getMessage('redacted.accessToken');
|
|
55
52
|
const sfdxAuthUrlRedactedMessage = secretsMessages.getMessage('redacted.sfdxAuthUrl');
|
|
56
53
|
const passwordRedactedMessage = secretsMessages.getMessage('redacted.userPassword');
|
|
57
|
-
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
58
|
-
const envVarIsSetWarning = secretsMessages.getMessage('temp.envVarIsSet', ['sf org display']);
|
|
59
54
|
// translate to alias if necessary
|
|
60
55
|
const authInfo = await AuthInfo.create({ username: this.org.getUsername() });
|
|
61
56
|
const fields = authInfo.getFields(true);
|
|
@@ -63,8 +58,7 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
63
58
|
const scratchOrgInfo = isScratchOrg && fields.orgId ? await this.getScratchOrgInformation(fields) : {};
|
|
64
59
|
const getSfdxAuthUrlOutput = () => {
|
|
65
60
|
if (flags.verbose && fields.refreshToken) {
|
|
66
|
-
|
|
67
|
-
return showSecretsEnvVarIsSet ? authInfo.getSfdxAuthUrl() : sfdxAuthUrlRedactedMessage;
|
|
61
|
+
return sfdxAuthUrlRedactedMessage;
|
|
68
62
|
}
|
|
69
63
|
return undefined;
|
|
70
64
|
};
|
|
@@ -75,14 +69,12 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
75
69
|
// copied properties
|
|
76
70
|
apiVersion: fields.instanceApiVersion,
|
|
77
71
|
// Access token will always exist, don't check for value first
|
|
78
|
-
|
|
79
|
-
accessToken: showSecretsEnvVarIsSet ? fields.accessToken : accessTokenRedactedMessage,
|
|
72
|
+
accessToken: accessTokenRedactedMessage,
|
|
80
73
|
instanceUrl: fields.instanceUrl,
|
|
81
74
|
username: fields.username,
|
|
82
75
|
clientId: fields.clientId,
|
|
83
76
|
// Password only exists if it was generated locally, check for value first
|
|
84
|
-
|
|
85
|
-
password: fields.password ? (showSecretsEnvVarIsSet ? fields.password : passwordRedactedMessage) : undefined,
|
|
77
|
+
password: fields.password ? passwordRedactedMessage : undefined,
|
|
86
78
|
...scratchOrgInfo,
|
|
87
79
|
// properties with more complex logic
|
|
88
80
|
connectedStatus: isScratchOrg
|
|
@@ -93,10 +85,6 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
93
85
|
// TODO: deprecate these values
|
|
94
86
|
clientApps: fields.clientApps ? Object.keys(fields.clientApps).join(',') : undefined,
|
|
95
87
|
};
|
|
96
|
-
if (showSecretsEnvVarIsSet) {
|
|
97
|
-
this.warn(envVarIsSetWarning);
|
|
98
|
-
this.warn(sharedMessages.getMessage('SecurityWarning'));
|
|
99
|
-
}
|
|
100
88
|
this.print(returnValue);
|
|
101
89
|
return returnValue;
|
|
102
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../src/commands/org/display.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,EACL,SAAS,EACT,+BAA+B,EAC/B,QAAQ,EACR,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../src/commands/org/display.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/org/list.js
CHANGED
|
@@ -15,13 +15,12 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { EOL } from 'node:os';
|
|
17
17
|
import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
18
|
-
import { AuthInfo, Connection,
|
|
18
|
+
import { AuthInfo, Connection, Org, SfError, Messages, Logger } from '@salesforce/core';
|
|
19
19
|
import ansis from 'ansis';
|
|
20
20
|
import { OrgListUtil, identifyActiveOrgByStatus } from '../../shared/orgListUtil.js';
|
|
21
21
|
import { getStyledObject } from '../../shared/orgHighlighter.js';
|
|
22
22
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
23
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'list');
|
|
24
|
-
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
25
24
|
export const defaultOrgEmoji = '🍁';
|
|
26
25
|
export const defaultHubEmoji = '🌳';
|
|
27
26
|
export class OrgListCommand extends SfCommand {
|
|
@@ -95,11 +94,6 @@ export class OrgListCommand extends SfCommand {
|
|
|
95
94
|
});
|
|
96
95
|
this.info(`
|
|
97
96
|
Legend: ${defaultHubEmoji}=Default DevHub, ${defaultOrgEmoji}=Default Org ${flags.all ? '' : ' Use --all to see expired and deleted scratch orgs'}`);
|
|
98
|
-
// TODO: Remove after env var workaround is removed
|
|
99
|
-
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
100
|
-
if (this.jsonEnabled() && showSecretsEnvVarIsSet) {
|
|
101
|
-
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org list']));
|
|
102
|
-
}
|
|
103
97
|
return result;
|
|
104
98
|
}
|
|
105
99
|
async cleanScratchOrgs(scratchOrgs, prompt) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { strict as assert } from 'node:assert';
|
|
17
17
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
18
|
-
import {
|
|
18
|
+
import { Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, scratchOrgResume, SfError, } from '@salesforce/core';
|
|
19
19
|
import terminalLink from 'terminal-link';
|
|
20
20
|
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
21
21
|
import { capitalCase } from 'change-case';
|
|
@@ -108,21 +108,16 @@ export default class OrgResumeScratch extends SfCommand {
|
|
|
108
108
|
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId, flags.wait);
|
|
109
109
|
this.log();
|
|
110
110
|
this.logSuccess(messages.getMessage('success'));
|
|
111
|
-
// TODO: Remove env var workaround
|
|
112
|
-
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
113
111
|
const accessTokenRedacted = secretsMessages.getMessage('redacted.accessToken');
|
|
114
112
|
const redactedAuthFields = authFields
|
|
115
113
|
? {
|
|
116
114
|
...authFields,
|
|
117
|
-
accessToken:
|
|
115
|
+
accessToken: accessTokenRedacted,
|
|
118
116
|
refreshToken: undefined,
|
|
119
117
|
clientSecret: undefined,
|
|
120
118
|
}
|
|
121
119
|
: undefined;
|
|
122
120
|
const redactedScratchOrgInfo = scratchOrgInfo ? omit(scratchOrgInfo, ['AuthCode']) : undefined;
|
|
123
|
-
if (this.jsonEnabled() && showSecretsEnvVarIsSet) {
|
|
124
|
-
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org resume scratch --json']));
|
|
125
|
-
}
|
|
126
121
|
return {
|
|
127
122
|
username,
|
|
128
123
|
scratchOrgInfo: redactedScratchOrgInfo,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { basename, join } from 'node:path';
|
|
17
17
|
import fs from 'node:fs/promises';
|
|
18
|
-
import { Org, AuthInfo,
|
|
18
|
+
import { Org, AuthInfo, Global, Logger, Messages, SfError, trimTo15, ConfigAggregator, OrgConfigProperties, } from '@salesforce/core';
|
|
19
19
|
import { omit } from '@salesforce/kit';
|
|
20
20
|
import utils, { isDefined } from './utils.js';
|
|
21
21
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
@@ -54,16 +54,10 @@ export class OrgListUtil {
|
|
|
54
54
|
})),
|
|
55
55
|
OrgListUtil.processScratchOrgs(orgs.scratchOrgs),
|
|
56
56
|
]);
|
|
57
|
-
// TODO: Remove env var workaround
|
|
58
|
-
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
59
57
|
const redactSecrets = (org) => ({
|
|
60
58
|
...org,
|
|
61
|
-
accessToken:
|
|
62
|
-
password: org.password
|
|
63
|
-
? showSecretsEnvVarIsSet
|
|
64
|
-
? org.password
|
|
65
|
-
: secretsMessages.getMessage('redacted.userPassword')
|
|
66
|
-
: undefined,
|
|
59
|
+
accessToken: secretsMessages.getMessage('redacted.accessToken'),
|
|
60
|
+
password: org.password ? secretsMessages.getMessage('redacted.userPassword') : undefined,
|
|
67
61
|
});
|
|
68
62
|
const redactedNonScratchOrgs = nonScratchOrgs.map(redactSecrets);
|
|
69
63
|
const redactedScratchOrgs = scratchOrgs.map(redactSecrets);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,3 @@
|
|
|
9
9
|
# redacted.userPassword
|
|
10
10
|
|
|
11
11
|
[REDACTED] Use 'sf org auth show-user-password' to view
|
|
12
|
-
|
|
13
|
-
# temp.envVarIsSet
|
|
14
|
-
|
|
15
|
-
The SF_TEMP_SHOW_SECRETS env var is set. This is a temporary env var to continue to show secrets in the '%s' command output. This workaround will be removed on October 28, 2026. Switch to use the 'sf org auth' commands to avoid future disruption.
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-org",
|
|
3
3
|
"description": "Commands to interact with Salesforce orgs",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "7.0.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"enableO11y": true,
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"terminal-link": "^3.0.0"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@oclif/plugin-command-snapshot": "^6.0.
|
|
24
|
+
"@oclif/plugin-command-snapshot": "^6.0.2",
|
|
25
25
|
"@salesforce/cli-plugins-testkit": "^5.3.68",
|
|
26
26
|
"@salesforce/dev-scripts": "^15.0.0",
|
|
27
27
|
"@salesforce/plugin-command-reference": "^3.1.133",
|
|
@@ -240,7 +240,7 @@
|
|
|
240
240
|
"exports": "./lib/index.js",
|
|
241
241
|
"type": "module",
|
|
242
242
|
"sfdx": {
|
|
243
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/
|
|
244
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/
|
|
243
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/7.0.0.crt",
|
|
244
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/7.0.0.sig"
|
|
245
245
|
}
|
|
246
246
|
}
|