@salesforce/plugin-auth 3.2.0 → 3.3.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 +7 -7
- package/lib/commands/org/list/auth.js +2 -4
- package/lib/commands/org/list/auth.js.map +1 -1
- package/lib/commands/org/login/access-token.d.ts +9 -10
- package/lib/commands/org/login/access-token.js +8 -5
- package/lib/commands/org/login/access-token.js.map +1 -1
- package/lib/commands/org/login/device.d.ts +3 -4
- package/lib/commands/org/login/device.js +5 -12
- package/lib/commands/org/login/device.js.map +1 -1
- package/lib/commands/org/login/jwt.d.ts +3 -3
- package/lib/commands/org/login/jwt.js +6 -6
- package/lib/commands/org/login/jwt.js.map +1 -1
- package/lib/commands/org/login/sfdx-url.d.ts +3 -3
- package/lib/commands/org/login/sfdx-url.js +4 -4
- package/lib/commands/org/login/sfdx-url.js.map +1 -1
- package/lib/commands/org/login/web.d.ts +10 -13
- package/lib/commands/org/login/web.js +17 -27
- package/lib/commands/org/login/web.js.map +1 -1
- package/lib/commands/org/logout.d.ts +9 -12
- package/lib/commands/org/logout.js +71 -116
- package/lib/commands/org/logout.js.map +1 -1
- package/lib/common.d.ts +5 -3
- package/lib/common.js +30 -23
- package/lib/common.js.map +1 -1
- package/messages/messages.md +0 -4
- package/oclif.lock +1345 -274
- package/oclif.manifest.json +7 -24
- package/package.json +12 -10
- package/lib/authBaseCommand.d.ts +0 -9
- package/lib/authBaseCommand.js +0 -46
- package/lib/authBaseCommand.js.map +0 -1
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/3.
|
|
110
|
+
_See code: [src/commands/org/list/auth.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/list/auth.ts)_
|
|
111
111
|
|
|
112
112
|
## `sf org login access-token`
|
|
113
113
|
|
|
@@ -160,7 +160,7 @@ FLAG DESCRIPTIONS
|
|
|
160
160
|
To specify a sandbox, set --instance-url to https://MyDomainName--SandboxName.sandbox.my.salesforce.com.
|
|
161
161
|
```
|
|
162
162
|
|
|
163
|
-
_See code: [src/commands/org/login/access-token.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
163
|
+
_See code: [src/commands/org/login/access-token.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/login/access-token.ts)_
|
|
164
164
|
|
|
165
165
|
## `sf org login device`
|
|
166
166
|
|
|
@@ -219,7 +219,7 @@ FLAG DESCRIPTIONS
|
|
|
219
219
|
To specify a sandbox, set --instance-url to https://MyDomainName--SandboxName.sandbox.my.salesforce.com.
|
|
220
220
|
```
|
|
221
221
|
|
|
222
|
-
_See code: [src/commands/org/login/device.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
222
|
+
_See code: [src/commands/org/login/device.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/login/device.ts)_
|
|
223
223
|
|
|
224
224
|
## `sf org login jwt`
|
|
225
225
|
|
|
@@ -308,7 +308,7 @@ FLAG DESCRIPTIONS
|
|
|
308
308
|
To specify a sandbox, set --instance-url to https://MyDomainName--SandboxName.sandbox.my.salesforce.com.
|
|
309
309
|
```
|
|
310
310
|
|
|
311
|
-
_See code: [src/commands/org/login/jwt.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
311
|
+
_See code: [src/commands/org/login/jwt.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/login/jwt.ts)_
|
|
312
312
|
|
|
313
313
|
## `sf org login sfdx-url`
|
|
314
314
|
|
|
@@ -375,7 +375,7 @@ EXAMPLES
|
|
|
375
375
|
$ echo url | sf org login sfdx-url --sfdx-url-stdin -
|
|
376
376
|
```
|
|
377
377
|
|
|
378
|
-
_See code: [src/commands/org/login/sfdx-url.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
378
|
+
_See code: [src/commands/org/login/sfdx-url.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/login/sfdx-url.ts)_
|
|
379
379
|
|
|
380
380
|
## `sf org login web`
|
|
381
381
|
|
|
@@ -460,7 +460,7 @@ FLAG DESCRIPTIONS
|
|
|
460
460
|
To specify a sandbox, set --instance-url to https://MyDomainName--SandboxName.sandbox.my.salesforce.com.
|
|
461
461
|
```
|
|
462
462
|
|
|
463
|
-
_See code: [src/commands/org/login/web.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
463
|
+
_See code: [src/commands/org/login/web.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/login/web.ts)_
|
|
464
464
|
|
|
465
465
|
## `sf org logout`
|
|
466
466
|
|
|
@@ -520,6 +520,6 @@ FLAG DESCRIPTIONS
|
|
|
520
520
|
All orgs includes Dev Hubs, sandboxes, DE orgs, and expired, deleted, and unknown-status scratch orgs.
|
|
521
521
|
```
|
|
522
522
|
|
|
523
|
-
_See code: [src/commands/org/logout.ts](https://github.com/salesforcecli/plugin-auth/blob/3.
|
|
523
|
+
_See code: [src/commands/org/logout.ts](https://github.com/salesforcecli/plugin-auth/blob/3.3.1/src/commands/org/logout.ts)_
|
|
524
524
|
|
|
525
525
|
<!-- commandsstop -->
|
|
@@ -31,16 +31,14 @@ export default class ListAuth extends SfCommand {
|
|
|
31
31
|
return { ...rest, alias: aliases ? aliases.join(',') : '' };
|
|
32
32
|
});
|
|
33
33
|
const hasErrors = auths.filter((auth) => !!auth.error).length > 0;
|
|
34
|
-
|
|
34
|
+
const columns = {
|
|
35
35
|
alias: { header: 'ALIAS' },
|
|
36
36
|
username: { header: 'USERNAME' },
|
|
37
37
|
orgId: { header: 'ORG ID' },
|
|
38
38
|
instanceUrl: { header: 'INSTANCE URL' },
|
|
39
39
|
oauthMethod: { header: 'AUTH METHOD' },
|
|
40
|
+
...(hasErrors ? { error: { header: 'ERROR' } } : {}),
|
|
40
41
|
};
|
|
41
|
-
if (hasErrors) {
|
|
42
|
-
columns = { ...columns, ...{ error: { header: 'ERROR' } } };
|
|
43
|
-
}
|
|
44
42
|
this.styledHeader('authenticated orgs');
|
|
45
43
|
this.table(mappedAuths, columns);
|
|
46
44
|
return mappedAuths;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/commands/org/list/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/commands/org/list/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAoB,MAAM,kBAAkB,CAAC;AAGxE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAE1E,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,SAA0B;IACvD,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IACxC,MAAM,CAAU,OAAO,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAE3D,MAAM,CAAU,KAAK,GAAG;QAC7B,QAAQ;KACT,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,qBAAqB,EAAE,CAAC;YACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,MAAM,WAAW,GAAoB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAsB,EAAE,EAAE;gBACxE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;gBAClC,oEAAoE;gBACpE,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC9D,CAAC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAClE,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;gBAC1B,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;gBAChC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;gBAC3B,WAAW,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACvC,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;gBACtC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrD,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACjC,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC"}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
3
|
import { AuthFields } from '@salesforce/core';
|
|
3
|
-
|
|
4
|
-
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
5
|
-
export default class LoginAccessToken extends AuthBaseCommand<AuthFields> {
|
|
4
|
+
export default class LoginAccessToken extends SfCommand<AuthFields> {
|
|
6
5
|
static readonly summary: string;
|
|
7
6
|
static readonly description: string;
|
|
8
7
|
static readonly examples: string[];
|
|
9
8
|
static readonly deprecateAliases = true;
|
|
10
|
-
static aliases: string[];
|
|
9
|
+
static readonly aliases: string[];
|
|
11
10
|
static readonly flags: {
|
|
12
|
-
'instance-url':
|
|
13
|
-
'set-default-dev-hub':
|
|
14
|
-
'set-default':
|
|
15
|
-
alias:
|
|
16
|
-
'no-prompt':
|
|
17
|
-
loglevel:
|
|
11
|
+
'instance-url': import("@oclif/core/lib/interfaces").OptionFlag<import("url").URL, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
12
|
+
'set-default-dev-hub': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
13
|
+
'set-default': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
14
|
+
alias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
15
|
+
'no-prompt': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
16
|
+
loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
18
17
|
};
|
|
19
18
|
private flags;
|
|
20
19
|
run(): Promise<AuthFields>;
|
|
@@ -4,15 +4,14 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
7
|
+
import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
8
8
|
import { AuthInfo, Messages, matchesAccessToken, SfError, StateAggregator } from '@salesforce/core';
|
|
9
9
|
import { env } from '@salesforce/kit';
|
|
10
|
-
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
11
10
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
12
11
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'accesstoken.store');
|
|
13
12
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
14
13
|
const ACCESS_TOKEN_FORMAT = '"<org id>!<accesstoken>"';
|
|
15
|
-
export default class LoginAccessToken extends
|
|
14
|
+
export default class LoginAccessToken extends SfCommand {
|
|
16
15
|
static summary = messages.getMessage('summary');
|
|
17
16
|
static description = messages.getMessage('description');
|
|
18
17
|
static examples = messages.getMessages('examples');
|
|
@@ -95,13 +94,17 @@ export default class LoginAccessToken extends AuthBaseCommand {
|
|
|
95
94
|
if (!this.flags['no-prompt']) {
|
|
96
95
|
const stateAggregator = await StateAggregator.getInstance();
|
|
97
96
|
if (await stateAggregator.orgs.exists(username)) {
|
|
98
|
-
return this.confirm(messages.getMessage('overwriteAccessTokenAuthUserFile', [username]));
|
|
97
|
+
return this.confirm({ message: messages.getMessage('overwriteAccessTokenAuthUserFile', [username]) });
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
100
|
return true;
|
|
102
101
|
}
|
|
103
102
|
async getAccessToken() {
|
|
104
|
-
const accessToken = env.getString('SF_ACCESS_TOKEN') ??
|
|
103
|
+
const accessToken = env.getString('SF_ACCESS_TOKEN') ??
|
|
104
|
+
env.getString('SFDX_ACCESS_TOKEN') ??
|
|
105
|
+
(this.flags['no-prompt'] === true
|
|
106
|
+
? '' // will throw when validating
|
|
107
|
+
: await this.secretPrompt({ message: commonMessages.getMessage('accessTokenStdin') }));
|
|
105
108
|
if (!matchesAccessToken(accessToken)) {
|
|
106
109
|
throw new SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
|
|
107
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../src/commands/org/login/access-token.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../src/commands/org/login/access-token.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { AuthFields } from '@salesforce/core';
|
|
3
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
4
|
import { DeviceCodeResponse } from '@salesforce/core/lib/deviceOauthService.js';
|
|
4
|
-
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
5
5
|
export type DeviceLoginResult = (AuthFields & DeviceCodeResponse) | Record<string, never>;
|
|
6
|
-
export default class LoginDevice extends
|
|
6
|
+
export default class LoginDevice extends SfCommand<DeviceLoginResult> {
|
|
7
7
|
static readonly summary: string;
|
|
8
8
|
static readonly description: string;
|
|
9
9
|
static readonly examples: string[];
|
|
10
|
-
static aliases: string[];
|
|
10
|
+
static readonly aliases: string[];
|
|
11
11
|
static readonly deprecateAliases = true;
|
|
12
12
|
static readonly flags: {
|
|
13
13
|
'client-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
@@ -15,7 +15,6 @@ export default class LoginDevice extends AuthBaseCommand<DeviceLoginResult> {
|
|
|
15
15
|
'set-default-dev-hub': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
16
16
|
'set-default': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
17
17
|
alias: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
18
|
-
'disable-masking': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
19
18
|
loglevel: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
20
19
|
};
|
|
21
20
|
run(): Promise<DeviceLoginResult>;
|
|
@@ -5,14 +5,13 @@
|
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
7
|
import { AuthInfo, DeviceOauthService, Messages } from '@salesforce/core';
|
|
8
|
-
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
8
|
+
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
9
9
|
import { ux } from '@oclif/core';
|
|
10
|
-
import
|
|
11
|
-
import { Common } from '../../../common.js';
|
|
10
|
+
import common from '../../../common.js';
|
|
12
11
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
13
12
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'device.login');
|
|
14
13
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
15
|
-
export default class LoginDevice extends
|
|
14
|
+
export default class LoginDevice extends SfCommand {
|
|
16
15
|
static summary = messages.getMessage('summary');
|
|
17
16
|
static description = messages.getMessage('description');
|
|
18
17
|
static examples = messages.getMessages('examples');
|
|
@@ -50,20 +49,14 @@ export default class LoginDevice extends AuthBaseCommand {
|
|
|
50
49
|
deprecateAliases: true,
|
|
51
50
|
aliases: ['setalias'],
|
|
52
51
|
}),
|
|
53
|
-
'disable-masking': Flags.boolean({
|
|
54
|
-
summary: commonMessages.getMessage('flags.disable-masking.summary'),
|
|
55
|
-
hidden: true,
|
|
56
|
-
deprecateAliases: true,
|
|
57
|
-
aliases: ['disablemasking'],
|
|
58
|
-
}),
|
|
59
52
|
loglevel,
|
|
60
53
|
};
|
|
61
54
|
async run() {
|
|
62
55
|
const { flags } = await this.parse(LoginDevice);
|
|
63
|
-
if (await
|
|
56
|
+
if (await common.shouldExitCommand(false))
|
|
64
57
|
return {};
|
|
65
58
|
const oauthConfig = {
|
|
66
|
-
loginUrl: await
|
|
59
|
+
loginUrl: await common.resolveLoginUrl(flags['instance-url']?.href),
|
|
67
60
|
clientId: flags['client-id'],
|
|
68
61
|
};
|
|
69
62
|
const deviceOauthService = await DeviceOauthService.create(oauthConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAc,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAgB,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
3
|
import { AuthFields } from '@salesforce/core';
|
|
3
4
|
import { Interfaces } from '@oclif/core';
|
|
4
|
-
|
|
5
|
-
export default class LoginJwt extends AuthBaseCommand<AuthFields> {
|
|
5
|
+
export default class LoginJwt extends SfCommand<AuthFields> {
|
|
6
6
|
static readonly summary: string;
|
|
7
7
|
static readonly description: string;
|
|
8
8
|
static readonly examples: string[];
|
|
9
|
-
static aliases: string[];
|
|
9
|
+
static readonly aliases: string[];
|
|
10
10
|
static readonly deprecateAliases = true;
|
|
11
11
|
static readonly flags: {
|
|
12
12
|
username: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
|
|
@@ -4,14 +4,13 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
7
|
+
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
8
8
|
import { AuthInfo, AuthRemover, Logger, Messages } from '@salesforce/core';
|
|
9
|
-
import
|
|
10
|
-
import { Common } from '../../../common.js';
|
|
9
|
+
import common from '../../../common.js';
|
|
11
10
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
12
11
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'jwt.grant');
|
|
13
12
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
14
|
-
export default class LoginJwt extends
|
|
13
|
+
export default class LoginJwt extends SfCommand {
|
|
15
14
|
static summary = messages.getMessage('summary');
|
|
16
15
|
static description = messages.getMessage('description');
|
|
17
16
|
static examples = messages.getMessages('examples');
|
|
@@ -19,6 +18,7 @@ export default class LoginJwt extends AuthBaseCommand {
|
|
|
19
18
|
static deprecateAliases = true;
|
|
20
19
|
static flags = {
|
|
21
20
|
username: Flags.string({
|
|
21
|
+
// eslint-disable-next-line sf-plugin/dash-o
|
|
22
22
|
char: 'o',
|
|
23
23
|
summary: messages.getMessage('flags.username.summary'),
|
|
24
24
|
required: true,
|
|
@@ -80,7 +80,7 @@ export default class LoginJwt extends AuthBaseCommand {
|
|
|
80
80
|
const { flags } = await this.parse(LoginJwt);
|
|
81
81
|
this.flags = flags;
|
|
82
82
|
let result = {};
|
|
83
|
-
if (await
|
|
83
|
+
if (await common.shouldExitCommand(flags['no-prompt']))
|
|
84
84
|
return {};
|
|
85
85
|
try {
|
|
86
86
|
const authInfo = await this.initAuthInfo();
|
|
@@ -107,7 +107,7 @@ export default class LoginJwt extends AuthBaseCommand {
|
|
|
107
107
|
clientId: this.flags['client-id'],
|
|
108
108
|
privateKeyFile: this.flags['jwt-key-file'],
|
|
109
109
|
};
|
|
110
|
-
const loginUrl = await
|
|
110
|
+
const loginUrl = await common.resolveLoginUrl(this.flags['instance-url']?.href);
|
|
111
111
|
const oauth2Options = loginUrl ? Object.assign(oauth2OptionsBase, { loginUrl }) : oauth2OptionsBase;
|
|
112
112
|
let authInfo;
|
|
113
113
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
1
2
|
import { AuthFields } from '@salesforce/core';
|
|
2
|
-
|
|
3
|
-
export default class LoginSfdxUrl extends AuthBaseCommand<AuthFields> {
|
|
3
|
+
export default class LoginSfdxUrl extends SfCommand<AuthFields> {
|
|
4
4
|
static readonly summary: string;
|
|
5
5
|
static readonly description: string;
|
|
6
6
|
static readonly examples: string[];
|
|
7
|
-
static aliases: string[];
|
|
7
|
+
static readonly aliases: string[];
|
|
8
8
|
static readonly deprecateAliases = true;
|
|
9
9
|
static readonly flags: {
|
|
10
10
|
'sfdx-url-file': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
@@ -5,15 +5,15 @@
|
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
7
|
import fs from 'node:fs/promises';
|
|
8
|
-
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
8
|
+
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
9
9
|
import { AuthInfo, Messages } from '@salesforce/core';
|
|
10
10
|
import { parseJson } from '@salesforce/kit';
|
|
11
|
-
import
|
|
11
|
+
import common from '../../../common.js';
|
|
12
12
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
13
13
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'sfdxurl.store');
|
|
14
14
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
15
15
|
const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
|
|
16
|
-
export default class LoginSfdxUrl extends
|
|
16
|
+
export default class LoginSfdxUrl extends SfCommand {
|
|
17
17
|
static summary = messages.getMessage('summary');
|
|
18
18
|
static description = messages.getMessage('description', [AUTH_URL_FORMAT]);
|
|
19
19
|
static examples = messages.getMessages('examples');
|
|
@@ -67,7 +67,7 @@ export default class LoginSfdxUrl extends AuthBaseCommand {
|
|
|
67
67
|
};
|
|
68
68
|
async run() {
|
|
69
69
|
const { flags } = await this.parse(LoginSfdxUrl);
|
|
70
|
-
if (await
|
|
70
|
+
if (await common.shouldExitCommand(flags['no-prompt']))
|
|
71
71
|
return {};
|
|
72
72
|
const authFile = flags['sfdx-url-file'];
|
|
73
73
|
const authStdin = flags['sfdx-url-stdin'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,22 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
3
|
import { AuthFields } from '@salesforce/core';
|
|
3
|
-
|
|
4
|
-
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
5
|
-
export default class LoginWeb extends AuthBaseCommand<AuthFields> {
|
|
4
|
+
export default class LoginWeb extends SfCommand<AuthFields> {
|
|
6
5
|
static readonly summary: string;
|
|
7
6
|
static readonly description: string;
|
|
8
7
|
static readonly examples: string[];
|
|
9
8
|
static readonly deprecateAliases = true;
|
|
10
9
|
static readonly aliases: string[];
|
|
11
10
|
static readonly flags: {
|
|
12
|
-
browser:
|
|
13
|
-
'client-id':
|
|
14
|
-
'instance-url':
|
|
15
|
-
'set-default-dev-hub':
|
|
16
|
-
'set-default':
|
|
17
|
-
alias:
|
|
18
|
-
'
|
|
19
|
-
|
|
20
|
-
loglevel: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
11
|
+
browser: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
12
|
+
'client-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
13
|
+
'instance-url': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("url").URL | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
14
|
+
'set-default-dev-hub': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
15
|
+
'set-default': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
16
|
+
alias: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
17
|
+
'no-prompt': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
18
|
+
loglevel: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
21
19
|
};
|
|
22
|
-
private flags;
|
|
23
20
|
run(): Promise<AuthFields>;
|
|
24
21
|
private executeLoginFlow;
|
|
25
22
|
}
|
|
@@ -5,27 +5,26 @@
|
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
7
|
import open, { apps } from 'open';
|
|
8
|
-
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
8
|
+
import { Flags, SfCommand, loglevel } from '@salesforce/sf-plugins-core';
|
|
9
9
|
import { AuthInfo, Logger, Messages, SfError, WebOAuthServer } from '@salesforce/core';
|
|
10
10
|
import { Env } from '@salesforce/kit';
|
|
11
|
-
import
|
|
12
|
-
import { Common } from '../../../common.js';
|
|
11
|
+
import common from '../../../common.js';
|
|
13
12
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
14
13
|
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'web.login');
|
|
15
14
|
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
16
|
-
export default class LoginWeb extends
|
|
15
|
+
export default class LoginWeb extends SfCommand {
|
|
17
16
|
static summary = messages.getMessage('summary');
|
|
18
17
|
static description = messages.getMessage('description');
|
|
19
18
|
static examples = messages.getMessages('examples');
|
|
20
19
|
static deprecateAliases = true;
|
|
21
20
|
static aliases = ['force:auth:web:login', 'auth:web:login'];
|
|
22
21
|
static flags = {
|
|
23
|
-
browser: Flags.
|
|
22
|
+
browser: Flags.option({
|
|
24
23
|
char: 'b',
|
|
25
24
|
summary: messages.getMessage('flags.browser.summary'),
|
|
26
25
|
description: messages.getMessage('flags.browser.description'),
|
|
27
26
|
options: ['chrome', 'edge', 'firefox'], // These are ones supported by "open" package
|
|
28
|
-
}),
|
|
27
|
+
})(),
|
|
29
28
|
'client-id': Flags.string({
|
|
30
29
|
char: 'i',
|
|
31
30
|
summary: commonMessages.getMessage('flags.client-id.summary'),
|
|
@@ -57,12 +56,6 @@ export default class LoginWeb extends AuthBaseCommand {
|
|
|
57
56
|
deprecateAliases: true,
|
|
58
57
|
aliases: ['setalias'],
|
|
59
58
|
}),
|
|
60
|
-
'disable-masking': Flags.boolean({
|
|
61
|
-
summary: commonMessages.getMessage('flags.disable-masking.summary'),
|
|
62
|
-
hidden: true,
|
|
63
|
-
deprecateAliases: true,
|
|
64
|
-
aliases: ['disablemasking'],
|
|
65
|
-
}),
|
|
66
59
|
'no-prompt': Flags.boolean({
|
|
67
60
|
char: 'p',
|
|
68
61
|
summary: commonMessages.getMessage('flags.no-prompt.summary'),
|
|
@@ -73,24 +66,22 @@ export default class LoginWeb extends AuthBaseCommand {
|
|
|
73
66
|
}),
|
|
74
67
|
loglevel,
|
|
75
68
|
};
|
|
76
|
-
flags;
|
|
77
69
|
async run() {
|
|
78
70
|
const { flags } = await this.parse(LoginWeb);
|
|
79
|
-
this.flags = flags;
|
|
80
71
|
if (isSFDXContainerMode()) {
|
|
81
72
|
throw new SfError(messages.getMessage('deviceWarning'), 'DEVICE_WARNING');
|
|
82
73
|
}
|
|
83
|
-
if (await
|
|
74
|
+
if (await common.shouldExitCommand(flags['no-prompt']))
|
|
84
75
|
return {};
|
|
85
76
|
const oauthConfig = {
|
|
86
|
-
loginUrl: await
|
|
77
|
+
loginUrl: await common.resolveLoginUrl(flags['instance-url']?.href),
|
|
87
78
|
clientId: flags['client-id'],
|
|
79
|
+
...(flags['client-id']
|
|
80
|
+
? { clientSecret: await this.secretPrompt({ message: commonMessages.getMessage('clientSecretStdin') }) }
|
|
81
|
+
: {}),
|
|
88
82
|
};
|
|
89
|
-
if (flags['client-id']) {
|
|
90
|
-
oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
|
|
91
|
-
}
|
|
92
83
|
try {
|
|
93
|
-
const authInfo = await this.executeLoginFlow(oauthConfig);
|
|
84
|
+
const authInfo = await this.executeLoginFlow(oauthConfig, flags.browser);
|
|
94
85
|
await authInfo.handleAliasAndDefaultSettings({
|
|
95
86
|
alias: flags.alias,
|
|
96
87
|
setDefault: flags['set-default'],
|
|
@@ -103,20 +94,19 @@ export default class LoginWeb extends AuthBaseCommand {
|
|
|
103
94
|
return fields;
|
|
104
95
|
}
|
|
105
96
|
catch (err) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
throw new SfError(messages.getMessage('invalidClientId', [error.message]), undefined, undefined, error);
|
|
97
|
+
Logger.childFromRoot('LoginWebCommand').debug(err);
|
|
98
|
+
if (err instanceof Error && err.name === 'AuthCodeExchangeError') {
|
|
99
|
+
throw new SfError(messages.getMessage('invalidClientId', [err.message]), undefined, undefined, err);
|
|
110
100
|
}
|
|
111
|
-
throw
|
|
101
|
+
throw err;
|
|
112
102
|
}
|
|
113
103
|
}
|
|
114
104
|
// leave it because it's stubbed in the test
|
|
115
105
|
// eslint-disable-next-line class-methods-use-this
|
|
116
|
-
async executeLoginFlow(oauthConfig) {
|
|
106
|
+
async executeLoginFlow(oauthConfig, browser) {
|
|
117
107
|
const oauthServer = await WebOAuthServer.create({ oauthConfig });
|
|
118
108
|
await oauthServer.start();
|
|
119
|
-
const app =
|
|
109
|
+
const app = browser && browser in apps ? browser : undefined;
|
|
120
110
|
const openOptions = app ? { app: { name: apps[app] }, wait: false } : { wait: false };
|
|
121
111
|
await open(oauthServer.getAuthorizationUrl(), openOptions);
|
|
122
112
|
return oauthServer.authorizeAndSave();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,EAAE,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":"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"}
|