@salesforce/plugin-auth 4.3.12 → 4.4.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 +12 -12
- package/lib/commands/org/list/auth.js +19 -2
- package/lib/commands/org/list/auth.js.map +1 -1
- package/lib/commands/org/login/access-token.js +14 -3
- package/lib/commands/org/login/access-token.js.map +1 -1
- package/lib/commands/org/login/jwt.js +12 -2
- package/lib/commands/org/login/jwt.js.map +1 -1
- package/lib/commands/org/login/sfdx-url.js +13 -4
- package/lib/commands/org/login/sfdx-url.js.map +1 -1
- package/lib/commands/org/login/web.js +24 -5
- package/lib/commands/org/login/web.js.map +1 -1
- package/lib/common.d.ts +2 -0
- package/lib/common.js +17 -1
- package/lib/common.js.map +1 -1
- package/messages/secrets-redacted.md +15 -0
- package/messages/sfdxurl.store.md +4 -4
- package/oclif.manifest.json +2 -2
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -107,7 +107,7 @@ EXAMPLES
|
|
|
107
107
|
$ sf org list auth
|
|
108
108
|
```
|
|
109
109
|
|
|
110
|
-
_See code: [src/commands/org/list/auth.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
110
|
+
_See code: [src/commands/org/list/auth.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/list/auth.ts)_
|
|
111
111
|
|
|
112
112
|
## `sf org login access-token`
|
|
113
113
|
|
|
@@ -161,7 +161,7 @@ FLAG DESCRIPTIONS
|
|
|
161
161
|
To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
|
|
162
162
|
```
|
|
163
163
|
|
|
164
|
-
_See code: [src/commands/org/login/access-token.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
164
|
+
_See code: [src/commands/org/login/access-token.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/login/access-token.ts)_
|
|
165
165
|
|
|
166
166
|
## `sf org login jwt`
|
|
167
167
|
|
|
@@ -252,7 +252,7 @@ FLAG DESCRIPTIONS
|
|
|
252
252
|
To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
|
|
253
253
|
```
|
|
254
254
|
|
|
255
|
-
_See code: [src/commands/org/login/jwt.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
255
|
+
_See code: [src/commands/org/login/jwt.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/login/jwt.ts)_
|
|
256
256
|
|
|
257
257
|
## `sf org login sfdx-url`
|
|
258
258
|
|
|
@@ -284,21 +284,21 @@ DESCRIPTION
|
|
|
284
284
|
"https://"). Note that although the SFDX authorization URL starts with "force://", it has nothing to do with the
|
|
285
285
|
actual authorization. Salesforce CLI always communicates with your org using HTTPS.
|
|
286
286
|
|
|
287
|
-
To see
|
|
287
|
+
To see the SFDX authorization URL for an org, run "org auth show-sfdx-auth-url".
|
|
288
288
|
|
|
289
289
|
You have three options when creating the authorization file. The easiest option is to redirect the output of the "sf
|
|
290
|
-
org
|
|
291
|
-
authorized:
|
|
290
|
+
org auth show-sfdx-auth-url --json" command into a file. For example, using an org with alias my-org that you've
|
|
291
|
+
already authorized:
|
|
292
292
|
|
|
293
|
-
$ sf org
|
|
293
|
+
$ sf org auth show-sfdx-auth-url --target-org my-org --json > authFile.json
|
|
294
294
|
|
|
295
295
|
The resulting JSON file contains the URL in the "sfdxAuthUrl" property of the "result" object. You can then reference
|
|
296
296
|
the file when running this command:
|
|
297
297
|
|
|
298
298
|
$ sf org login sfdx-url --sfdx-url-file authFile.json
|
|
299
299
|
|
|
300
|
-
NOTE: The
|
|
301
|
-
flow
|
|
300
|
+
NOTE: The SFDX auth URL is only available for orgs authorized with a web-based OAuth flow, and not the JWT bearer
|
|
301
|
+
flow.
|
|
302
302
|
|
|
303
303
|
You can also create a JSON file that has a top-level property named sfdxAuthUrl whose value is the authorization URL.
|
|
304
304
|
Finally, you can create a normal text file that includes just the URL and nothing else.
|
|
@@ -322,7 +322,7 @@ EXAMPLES
|
|
|
322
322
|
$ echo url | sf org login sfdx-url --sfdx-url-stdin
|
|
323
323
|
```
|
|
324
324
|
|
|
325
|
-
_See code: [src/commands/org/login/sfdx-url.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
325
|
+
_See code: [src/commands/org/login/sfdx-url.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/login/sfdx-url.ts)_
|
|
326
326
|
|
|
327
327
|
## `sf org login web`
|
|
328
328
|
|
|
@@ -427,7 +427,7 @@ FLAG DESCRIPTIONS
|
|
|
427
427
|
To specify a sandbox, set --instance-url to "https://<MyDomainName>--<SandboxName>.sandbox.my.salesforce.com".
|
|
428
428
|
```
|
|
429
429
|
|
|
430
|
-
_See code: [src/commands/org/login/web.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
430
|
+
_See code: [src/commands/org/login/web.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/login/web.ts)_
|
|
431
431
|
|
|
432
432
|
## `sf org logout`
|
|
433
433
|
|
|
@@ -493,6 +493,6 @@ FLAG DESCRIPTIONS
|
|
|
493
493
|
All orgs includes Dev Hubs, sandboxes, DE orgs, and expired, deleted, and unknown-status scratch orgs.
|
|
494
494
|
```
|
|
495
495
|
|
|
496
|
-
_See code: [src/commands/org/logout.ts](https://github.com/salesforcecli/plugin-auth/blob/4.
|
|
496
|
+
_See code: [src/commands/org/logout.ts](https://github.com/salesforcecli/plugin-auth/blob/4.4.0/src/commands/org/logout.ts)_
|
|
497
497
|
|
|
498
498
|
<!-- commandsstop -->
|
|
@@ -14,9 +14,10 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
17
|
-
import { AuthInfo, Messages } from '@salesforce/core';
|
|
17
|
+
import { AuthInfo, envVars, Messages } from '@salesforce/core';
|
|
18
18
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
19
19
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'list');
|
|
20
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
20
21
|
export default class ListAuth extends SfCommand {
|
|
21
22
|
static summary = messages.getMessage('summary');
|
|
22
23
|
static description = messages.getMessage('description');
|
|
@@ -34,10 +35,17 @@ export default class ListAuth extends SfCommand {
|
|
|
34
35
|
this.log(messages.getMessage('noResultsFound'));
|
|
35
36
|
return [];
|
|
36
37
|
}
|
|
38
|
+
// TODO: Remove env var workaround
|
|
39
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
40
|
+
const accessTokenRedacted = secretsMessages.getMessage('redacted.accessToken');
|
|
37
41
|
const mappedAuths = auths.map((auth) => {
|
|
38
42
|
const { aliases, ...rest } = auth;
|
|
39
43
|
// core3 moved to aliases as a string[], revert to alias as a string
|
|
40
|
-
return {
|
|
44
|
+
return {
|
|
45
|
+
...rest,
|
|
46
|
+
alias: aliases ? aliases.join(',') : '',
|
|
47
|
+
accessToken: rest.accessToken ? (showSecretsEnvVarIsSet ? rest.accessToken : accessTokenRedacted) : undefined,
|
|
48
|
+
};
|
|
41
49
|
});
|
|
42
50
|
const hasErrors = auths.filter((auth) => !!auth.error).length > 0;
|
|
43
51
|
this.table({
|
|
@@ -51,6 +59,15 @@ export default class ListAuth extends SfCommand {
|
|
|
51
59
|
})),
|
|
52
60
|
title: 'authenticated orgs',
|
|
53
61
|
});
|
|
62
|
+
// TODO: Remove after env var workaround is removed
|
|
63
|
+
if (this.jsonEnabled()) {
|
|
64
|
+
if (showSecretsEnvVarIsSet) {
|
|
65
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org list auth']));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org list auth']));
|
|
69
|
+
}
|
|
70
|
+
}
|
|
54
71
|
return mappedAuths;
|
|
55
72
|
}
|
|
56
73
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/commands/org/list/auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAoB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/commands/org/list/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,11 +14,13 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
17
|
-
import { AuthInfo, Messages, matchesAccessToken, SfError, StateAggregator } from '@salesforce/core';
|
|
17
|
+
import { AuthInfo, envVars, Messages, matchesAccessToken, SfError, StateAggregator, } from '@salesforce/core';
|
|
18
18
|
import { env } from '@salesforce/kit';
|
|
19
|
+
import common from '../../../common.js';
|
|
19
20
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
20
21
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'accesstoken.store');
|
|
21
22
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
23
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
22
24
|
const ACCESS_TOKEN_FORMAT = '"<org id>!<accesstoken>"';
|
|
23
25
|
export default class LoginAccessToken extends SfCommand {
|
|
24
26
|
static summary = messages.getMessage('summary');
|
|
@@ -84,11 +86,20 @@ export default class LoginAccessToken extends SfCommand {
|
|
|
84
86
|
await this.saveAuthInfo(authInfo);
|
|
85
87
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [
|
|
86
88
|
authInfo.getUsername(),
|
|
87
|
-
authInfo.getFields(
|
|
89
|
+
authInfo.getFields().orgId,
|
|
88
90
|
]);
|
|
89
91
|
this.logSuccess(successMsg);
|
|
90
92
|
}
|
|
91
|
-
|
|
93
|
+
// TODO: Remove env var workaround
|
|
94
|
+
if (this.jsonEnabled()) {
|
|
95
|
+
if (envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false)) {
|
|
96
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org login access-token']));
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org login access-token']));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return common.redactAuthFields(authInfo.getFields(true));
|
|
92
103
|
}
|
|
93
104
|
async saveAuthInfo(authInfo) {
|
|
94
105
|
await authInfo.save();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../src/commands/org/login/access-token.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../src/commands/org/login/access-token.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,11 +14,12 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
17
|
-
import { AuthInfo, AuthRemover, Logger, Messages, SfError } from '@salesforce/core';
|
|
17
|
+
import { AuthInfo, AuthRemover, envVars, Logger, Messages, SfError } from '@salesforce/core';
|
|
18
18
|
import common from '../../../common.js';
|
|
19
19
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
20
20
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'jwt.grant');
|
|
21
21
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
22
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
22
23
|
export default class LoginJwt extends SfCommand {
|
|
23
24
|
static summary = messages.getMessage('summary');
|
|
24
25
|
static description = messages.getMessage('description');
|
|
@@ -111,7 +112,16 @@ export default class LoginJwt extends SfCommand {
|
|
|
111
112
|
}
|
|
112
113
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
113
114
|
this.logSuccess(successMsg);
|
|
114
|
-
|
|
115
|
+
// TODO: Remove env var workaround
|
|
116
|
+
if (this.jsonEnabled()) {
|
|
117
|
+
if (envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false)) {
|
|
118
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org login jwt']));
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org login jwt']));
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return common.redactAuthFields(result);
|
|
115
125
|
}
|
|
116
126
|
async initAuthInfo() {
|
|
117
127
|
const oauth2OptionsBase = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAc,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,13 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import fs from 'node:fs/promises';
|
|
17
17
|
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
18
|
-
import { AuthInfo, Messages } from '@salesforce/core';
|
|
18
|
+
import { AuthInfo, envVars, Messages } from '@salesforce/core';
|
|
19
19
|
import { parseJson } from '@salesforce/kit';
|
|
20
20
|
import common from '../../../common.js';
|
|
21
21
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
22
22
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'sfdxurl.store');
|
|
23
23
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
24
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
24
25
|
const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
|
|
25
26
|
export default class LoginSfdxUrl extends SfCommand {
|
|
26
27
|
static summary = messages.getMessage('summary');
|
|
@@ -101,12 +102,20 @@ export default class LoginSfdxUrl extends SfCommand {
|
|
|
101
102
|
setDefault: flags['set-default'],
|
|
102
103
|
setDefaultDevHub: flags['set-default-dev-hub'],
|
|
103
104
|
});
|
|
104
|
-
|
|
105
|
-
const result = { clientSecret: '', ...authInfo.getFields(true) };
|
|
105
|
+
const result = authInfo.getFields(true);
|
|
106
106
|
await AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
107
107
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
108
108
|
this.logSuccess(successMsg);
|
|
109
|
-
|
|
109
|
+
// TODO: Remove env var workaround
|
|
110
|
+
if (this.jsonEnabled()) {
|
|
111
|
+
if (envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false)) {
|
|
112
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org login sfdx-url']));
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org login sfdx-url']));
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return common.redactAuthFields(result);
|
|
110
119
|
}
|
|
111
120
|
}
|
|
112
121
|
const getUrlFromJson = async (authFile) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAc,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAc,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;AACnF,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AACpF,MAAM,eAAe,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC;AAE7F,MAAM,eAAe,GAAG,gEAAgE,CAAC;AAMzF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAqB;IACtD,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACpF,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,CAAC;IAC7E,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,MAAM,CAAU,KAAK,GAAG;QAC7B,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC3D,QAAQ,EAAE,KAAK;YACf,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,aAAa,CAAC;YACxB,UAAU,EAAE,CAAC,eAAe,EAAE,gBAAgB,CAAC;SAChD,CAAC;QACF,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;YAC5D,QAAQ,EAAE,KAAK;YACf,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,cAAc,CAAC;YACzB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,CAAC,eAAe,EAAE,gBAAgB,CAAC;SAChD,CAAC;QACF,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC;YACnC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,mCAAmC,CAAC;YACvE,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;SAC1D,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,2BAA2B,CAAC;YAC/D,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,oBAAoB,CAAC;SAChC,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACzD,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,UAAU,CAAC;SACtB,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC7D,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,CAAC,UAAU,CAAC;SACtB,CAAC;QACF,QAAQ;KACT,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,MAAM,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC;QAElE,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC1C,IAAI,WAAmB,CAAC;QAExB,IAAI,QAAQ,EAAE,CAAC;YACb,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAEhH,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CACb,sDAAsD,QAAQ,yFAAyF,CACxJ,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACrB,WAAW,GAAG,SAAS,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEtB,MAAM,QAAQ,CAAC,6BAA6B,CAAC;YAC3C,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;YAChC,gBAAgB,EAAE,KAAK,CAAC,qBAAqB,CAAC;SAC/C,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE5B,kCAAkC;QAClC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,IAAI,OAAO,CAAC,UAAU,CAAC,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;YACvF,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;;AAGH,MAAM,cAAc,GAAG,KAAK,EAAE,QAAgB,EAAmB,EAAE;IACjE,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAa,CAAC;IACzD,OAAO,YAAY,CAAC,MAAM,EAAE,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC;AACtE,CAAC,CAAC"}
|
|
@@ -16,12 +16,13 @@
|
|
|
16
16
|
import { createHash } from 'node:crypto';
|
|
17
17
|
import open, { apps } from 'open';
|
|
18
18
|
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
19
|
-
import { AuthInfo, Logger, Messages, SfError, WebOAuthServer } from '@salesforce/core';
|
|
19
|
+
import { AuthInfo, envVars, Logger, Messages, SfError, WebOAuthServer, } from '@salesforce/core';
|
|
20
20
|
import { Env } from '@salesforce/kit';
|
|
21
21
|
import common from '../../../common.js';
|
|
22
22
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
23
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'web.login');
|
|
24
24
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
25
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
25
26
|
export const CODE_BUILDER_STATE_ENV_VAR = 'CODE_BUILDER_STATE';
|
|
26
27
|
export const getVerificationCode = (codeBuilderState) => {
|
|
27
28
|
const hash = createHash('sha256').update(codeBuilderState, 'utf8').digest('hex');
|
|
@@ -115,15 +116,15 @@ export default class LoginWeb extends SfCommand {
|
|
|
115
116
|
if (await common.shouldExitCommand(flags['no-prompt']))
|
|
116
117
|
return {};
|
|
117
118
|
// Add ca/eca to already existing auth info.
|
|
119
|
+
// TODO: deprecate Client App login until use-case arises.
|
|
118
120
|
if (flags['client-app'] && flags.username) {
|
|
119
121
|
// 1. get username authinfo
|
|
120
122
|
const userAuthInfo = await AuthInfo.create({
|
|
121
123
|
username: flags.username,
|
|
122
124
|
});
|
|
123
|
-
const authFields = userAuthInfo.getFields(true);
|
|
124
125
|
// 2. web-auth and save name, clientId, accessToken, and refreshToken in `apps` object
|
|
125
126
|
const oauthConfig = {
|
|
126
|
-
loginUrl:
|
|
127
|
+
loginUrl: userAuthInfo.getFields().loginUrl,
|
|
127
128
|
clientId: flags['client-id'],
|
|
128
129
|
...{ clientSecret: await this.secretPrompt({ message: commonMessages.getMessage('clientSecretStdin') }) },
|
|
129
130
|
};
|
|
@@ -134,7 +135,16 @@ export default class LoginWeb extends SfCommand {
|
|
|
134
135
|
scopes: flags.scopes,
|
|
135
136
|
});
|
|
136
137
|
this.logSuccess(messages.getMessage('linkedClientApp', [flags['client-app'], flags.username]));
|
|
137
|
-
|
|
138
|
+
// TODO: Remove env var workaround
|
|
139
|
+
if (this.jsonEnabled()) {
|
|
140
|
+
if (envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false)) {
|
|
141
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org login web']));
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org login web']));
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return common.redactAuthFields(userAuthInfo.getFields(true));
|
|
138
148
|
}
|
|
139
149
|
const oauthConfig = {
|
|
140
150
|
loginUrl: await common.resolveLoginUrl(flags['instance-url']?.href),
|
|
@@ -159,7 +169,16 @@ export default class LoginWeb extends SfCommand {
|
|
|
159
169
|
await AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
|
|
160
170
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [fields.username, fields.orgId]);
|
|
161
171
|
this.logSuccess(successMsg);
|
|
162
|
-
|
|
172
|
+
// TODO: Remove env var workaround
|
|
173
|
+
if (this.jsonEnabled()) {
|
|
174
|
+
if (envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false)) {
|
|
175
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org login web']));
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org login web']));
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return common.redactAuthFields(fields);
|
|
163
182
|
}
|
|
164
183
|
catch (err) {
|
|
165
184
|
Logger.childFromRoot('LoginWebCommand').debug(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,IAAI,EAAE,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":"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"}
|
package/lib/common.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { AuthFields } from '@salesforce/core';
|
|
1
2
|
declare const _default: {
|
|
2
3
|
shouldExitCommand: (noPrompt?: boolean) => Promise<boolean>;
|
|
3
4
|
resolveLoginUrl: (instanceUrl?: string) => Promise<string>;
|
|
5
|
+
redactAuthFields: (fields: AuthFields) => AuthFields;
|
|
4
6
|
};
|
|
5
7
|
export default _default;
|
package/lib/common.js
CHANGED
|
@@ -13,11 +13,12 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Logger, SfdcUrl, SfProject, Messages, SfError, Global, Mode } from '@salesforce/core';
|
|
16
|
+
import { envVars, Logger, SfdcUrl, SfProject, Messages, SfError, Global, Mode } from '@salesforce/core';
|
|
17
17
|
import { getString, isObject } from '@salesforce/ts-types';
|
|
18
18
|
import { prompts, StandardColors } from '@salesforce/sf-plugins-core';
|
|
19
19
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
20
20
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
21
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-auth', 'secrets-redacted');
|
|
21
22
|
const resolveLoginUrl = async (instanceUrl) => {
|
|
22
23
|
const logger = await Logger.child('Common', { tag: 'resolveLoginUrl' });
|
|
23
24
|
const loginUrl = instanceUrl ?? (await getLoginUrl(logger));
|
|
@@ -49,8 +50,23 @@ const throwIfLightning = (urlString) => {
|
|
|
49
50
|
const shouldExitCommand = async (noPrompt) => Boolean(noPrompt) || Global.getEnvironmentMode() !== Mode.DEMO
|
|
50
51
|
? false
|
|
51
52
|
: !(await prompts.confirm({ message: StandardColors.info(messages.getMessage('warnAuth', ['sf'])), ms: 60_000 }));
|
|
53
|
+
// TODO: Remove env var workaround
|
|
54
|
+
const redactAuthFields = (fields) => {
|
|
55
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
56
|
+
if (showSecretsEnvVarIsSet)
|
|
57
|
+
return fields;
|
|
58
|
+
const redactedAccessToken = secretsMessages.getMessage('redacted.accessToken');
|
|
59
|
+
return {
|
|
60
|
+
...fields,
|
|
61
|
+
accessToken: fields.accessToken ? redactedAccessToken : undefined,
|
|
62
|
+
refreshToken: undefined,
|
|
63
|
+
clientSecret: undefined,
|
|
64
|
+
password: undefined,
|
|
65
|
+
};
|
|
66
|
+
};
|
|
52
67
|
export default {
|
|
53
68
|
shouldExitCommand,
|
|
54
69
|
resolveLoginUrl,
|
|
70
|
+
redactAuthFields,
|
|
55
71
|
};
|
|
56
72
|
//# sourceMappingURL=common.js.map
|
package/lib/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# redacted.accessToken
|
|
2
|
+
|
|
3
|
+
[REDACTED] Use 'sf org auth show-access-token' to view
|
|
4
|
+
|
|
5
|
+
# redacted.sfdxAuthUrl
|
|
6
|
+
|
|
7
|
+
[REDACTED] Use 'sf org auth show-sfdx-auth-url' to view
|
|
8
|
+
|
|
9
|
+
# temp.envVarWorkaround
|
|
10
|
+
|
|
11
|
+
Secrets are now hidden from '%s' command output. Use the 'sf org auth' commands instead. As a temporary workaround, you can set SF_TEMP_SHOW_SECRETS=true to render these secrets. This workaround will be removed in an upcoming release.
|
|
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 in an upcoming CLI release. Switch to use the 'sf org auth' commands to avoid future disruption.
|
|
@@ -6,17 +6,17 @@ Authorize an org using a Salesforce DX authorization URL stored in a file or thr
|
|
|
6
6
|
|
|
7
7
|
You use the Salesforce DX (SFDX) authorization URL to authorize Salesforce CLI to connect to a target org. The URL contains the required data to accomplish the authorization, such as the client ID, client secret, and instance URL. You must specify the SFDX authorization URL in this format: "%s". Replace <clientId>, <clientSecret>, <refreshToken>, and <instanceUrl> with the values specific to your target org. For <instanceUrl>, don't include a protocol (such as "https://"). Note that although the SFDX authorization URL starts with "force://", it has nothing to do with the actual authorization. Salesforce CLI always communicates with your org using HTTPS.
|
|
8
8
|
|
|
9
|
-
To see
|
|
9
|
+
To see the SFDX authorization URL for an org, run "org auth show-sfdx-auth-url".
|
|
10
10
|
|
|
11
|
-
You have three options when creating the authorization file. The easiest option is to redirect the output of the "<%= config.bin %> org
|
|
11
|
+
You have three options when creating the authorization file. The easiest option is to redirect the output of the "<%= config.bin %> org auth show-sfdx-auth-url --json" command into a file. For example, using an org with alias my-org that you've already authorized:
|
|
12
12
|
|
|
13
|
-
$ <%= config.bin %> org
|
|
13
|
+
$ <%= config.bin %> org auth show-sfdx-auth-url --target-org my-org --json > authFile.json
|
|
14
14
|
|
|
15
15
|
The resulting JSON file contains the URL in the "sfdxAuthUrl" property of the "result" object. You can then reference the file when running this command:
|
|
16
16
|
|
|
17
17
|
$ <%= config.bin %> <%= command.id %> --sfdx-url-file authFile.json
|
|
18
18
|
|
|
19
|
-
NOTE: The
|
|
19
|
+
NOTE: The SFDX auth URL is only available for orgs authorized with a web-based OAuth flow, and not the JWT bearer flow.
|
|
20
20
|
|
|
21
21
|
You can also create a JSON file that has a top-level property named sfdxAuthUrl whose value is the authorization URL. Finally, you can create a normal text file that includes just the URL and nothing else.
|
|
22
22
|
|
package/oclif.manifest.json
CHANGED
|
@@ -561,7 +561,7 @@
|
|
|
561
561
|
],
|
|
562
562
|
"args": {},
|
|
563
563
|
"deprecateAliases": true,
|
|
564
|
-
"description": "You use the Salesforce DX (SFDX) authorization URL to authorize Salesforce CLI to connect to a target org. The URL contains the required data to accomplish the authorization, such as the client ID, client secret, and instance URL. You must specify the SFDX authorization URL in this format: \"force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>\". Replace <clientId>, <clientSecret>, <refreshToken>, and <instanceUrl> with the values specific to your target org. For <instanceUrl>, don't include a protocol (such as \"https://\"). Note that although the SFDX authorization URL starts with \"force://\", it has nothing to do with the actual authorization. Salesforce CLI always communicates with your org using HTTPS.\n\nTo see
|
|
564
|
+
"description": "You use the Salesforce DX (SFDX) authorization URL to authorize Salesforce CLI to connect to a target org. The URL contains the required data to accomplish the authorization, such as the client ID, client secret, and instance URL. You must specify the SFDX authorization URL in this format: \"force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>\". Replace <clientId>, <clientSecret>, <refreshToken>, and <instanceUrl> with the values specific to your target org. For <instanceUrl>, don't include a protocol (such as \"https://\"). Note that although the SFDX authorization URL starts with \"force://\", it has nothing to do with the actual authorization. Salesforce CLI always communicates with your org using HTTPS.\n\nTo see the SFDX authorization URL for an org, run \"org auth show-sfdx-auth-url\".\n\nYou have three options when creating the authorization file. The easiest option is to redirect the output of the \"<%= config.bin %> org auth show-sfdx-auth-url --json\" command into a file. For example, using an org with alias my-org that you've already authorized:\n\n $ <%= config.bin %> org auth show-sfdx-auth-url --target-org my-org --json > authFile.json\n\nThe resulting JSON file contains the URL in the \"sfdxAuthUrl\" property of the \"result\" object. You can then reference the file when running this command:\n\n $ <%= config.bin %> <%= command.id %> --sfdx-url-file authFile.json\n\nNOTE: The SFDX auth URL is only available for orgs authorized with a web-based OAuth flow, and not the JWT bearer flow.\n\nYou can also create a JSON file that has a top-level property named sfdxAuthUrl whose value is the authorization URL. Finally, you can create a normal text file that includes just the URL and nothing else.\n\nAlternatively, you can pipe the SFDX authorization URL through standard input by specifying the --sfdx-url-stdin flag.",
|
|
565
565
|
"examples": [
|
|
566
566
|
"Authorize an org using the SFDX authorization URL in the files/authFile.json file:\n<%= config.bin %> <%= command.id %> --sfdx-url-file files/authFile.json",
|
|
567
567
|
"Similar to previous example, but set the org as your default and give it an alias MyDefaultOrg:\n<%= config.bin %> <%= command.id %> --sfdx-url-file files/authFile.json --set-default --alias MyDefaultOrg",
|
|
@@ -944,5 +944,5 @@
|
|
|
944
944
|
]
|
|
945
945
|
}
|
|
946
946
|
},
|
|
947
|
-
"version": "4.
|
|
947
|
+
"version": "4.4.0"
|
|
948
948
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-auth",
|
|
3
3
|
"description": "plugin for sf auth commands",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.4.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"enableO11y": true,
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"open": "^10.2.0"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@oclif/plugin-command-snapshot": "^5.3.
|
|
21
|
+
"@oclif/plugin-command-snapshot": "^5.3.20",
|
|
22
22
|
"@salesforce/cli-plugins-testkit": "^5.3.57",
|
|
23
23
|
"@salesforce/dev-scripts": "^11.0.4",
|
|
24
24
|
"@salesforce/plugin-command-reference": "^3.1.101",
|
|
25
25
|
"@salesforce/ts-sinon": "^1.4.33",
|
|
26
26
|
"eslint-plugin-sf-plugin": "^1.20.33",
|
|
27
|
-
"oclif": "^4.
|
|
27
|
+
"oclif": "^4.23.5",
|
|
28
28
|
"ts-node": "^10.9.2",
|
|
29
29
|
"typescript": "^5.5.4"
|
|
30
30
|
},
|
|
@@ -233,7 +233,7 @@
|
|
|
233
233
|
"exports": "./lib/index.js",
|
|
234
234
|
"type": "module",
|
|
235
235
|
"sfdx": {
|
|
236
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/4.
|
|
237
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/4.
|
|
236
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/4.4.0.crt",
|
|
237
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/4.4.0.sig"
|
|
238
238
|
}
|
|
239
239
|
}
|