@salesforce/plugin-auth 2.8.26 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +67 -67
- package/lib/authBaseCommand.d.ts +0 -2
- package/lib/authBaseCommand.js +9 -25
- package/lib/authBaseCommand.js.map +1 -1
- package/lib/commands/org/list/auth.d.ts +1 -1
- package/lib/commands/org/list/auth.js +16 -17
- package/lib/commands/org/list/auth.js.map +1 -1
- package/lib/commands/org/login/access-token.d.ts +5 -5
- package/lib/commands/org/login/access-token.js +62 -62
- package/lib/commands/org/login/access-token.js.map +1 -1
- package/lib/commands/org/login/device.d.ts +10 -10
- package/lib/commands/org/login/device.js +59 -60
- package/lib/commands/org/login/device.js.map +1 -1
- package/lib/commands/org/login/jwt.d.ts +8 -8
- package/lib/commands/org/login/jwt.js +78 -81
- package/lib/commands/org/login/jwt.js.map +1 -1
- package/lib/commands/org/login/sfdx-url.d.ts +7 -7
- package/lib/commands/org/login/sfdx-url.js +59 -58
- package/lib/commands/org/login/sfdx-url.js.map +1 -1
- package/lib/commands/org/login/web.d.ts +7 -7
- package/lib/commands/org/login/web.js +81 -81
- package/lib/commands/org/login/web.js.map +1 -1
- package/lib/commands/org/logout.d.ts +3 -3
- package/lib/commands/org/logout.js +48 -49
- package/lib/commands/org/logout.js.map +1 -1
- package/lib/common.js +13 -15
- package/lib/common.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/messages/accesstoken.store.md +5 -0
- package/messages/messages.md +0 -5
- package/oclif.lock +7839 -0
- package/oclif.manifest.json +665 -329
- package/package.json +32 -50
|
@@ -1,23 +1,82 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
7
|
+
import { dirname } from 'node:path';
|
|
8
|
+
import { fileURLToPath } from 'node:url';
|
|
9
|
+
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
10
|
+
import { AuthInfo, AuthRemover, Logger, Messages } from '@salesforce/core';
|
|
11
|
+
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
12
|
+
import { Common } from '../../../common.js';
|
|
13
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
14
|
+
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'jwt.grant');
|
|
15
|
+
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
16
|
+
export default class LoginJwt extends AuthBaseCommand {
|
|
17
|
+
static summary = messages.getMessage('summary');
|
|
18
|
+
static description = messages.getMessage('description');
|
|
19
|
+
static examples = messages.getMessages('examples');
|
|
20
|
+
static aliases = ['force:auth:jwt:grant', 'auth:jwt:grant'];
|
|
21
|
+
static flags = {
|
|
22
|
+
username: Flags.string({
|
|
23
|
+
char: 'o',
|
|
24
|
+
summary: messages.getMessage('flags.username.summary'),
|
|
25
|
+
required: true,
|
|
26
|
+
deprecateAliases: true,
|
|
27
|
+
aliases: ['u'],
|
|
28
|
+
}),
|
|
29
|
+
'jwt-key-file': Flags.file({
|
|
30
|
+
char: 'f',
|
|
31
|
+
summary: messages.getMessage('flags.jwt-key-file.summary'),
|
|
32
|
+
required: true,
|
|
33
|
+
deprecateAliases: true,
|
|
34
|
+
aliases: ['jwtkeyfile', 'keyfile'],
|
|
35
|
+
}),
|
|
36
|
+
'client-id': Flags.string({
|
|
37
|
+
char: 'i',
|
|
38
|
+
summary: commonMessages.getMessage('flags.client-id.summary'),
|
|
39
|
+
required: true,
|
|
40
|
+
deprecateAliases: true,
|
|
41
|
+
aliases: ['clientid'],
|
|
42
|
+
}),
|
|
43
|
+
'instance-url': Flags.url({
|
|
44
|
+
char: 'r',
|
|
45
|
+
summary: commonMessages.getMessage('flags.instance-url.summary'),
|
|
46
|
+
description: commonMessages.getMessage('flags.instance-url.description'),
|
|
47
|
+
deprecateAliases: true,
|
|
48
|
+
aliases: ['instanceurl', 'l'],
|
|
49
|
+
}),
|
|
50
|
+
'set-default-dev-hub': Flags.boolean({
|
|
51
|
+
char: 'd',
|
|
52
|
+
summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
|
|
53
|
+
deprecateAliases: true,
|
|
54
|
+
aliases: ['setdefaultdevhub', 'setdefaultdevhubusername', 'v'],
|
|
55
|
+
}),
|
|
56
|
+
'set-default': Flags.boolean({
|
|
57
|
+
char: 's',
|
|
58
|
+
summary: commonMessages.getMessage('flags.set-default.summary'),
|
|
59
|
+
deprecateAliases: true,
|
|
60
|
+
aliases: ['setdefaultusername'],
|
|
61
|
+
}),
|
|
62
|
+
alias: Flags.string({
|
|
63
|
+
char: 'a',
|
|
64
|
+
summary: commonMessages.getMessage('flags.alias.summary'),
|
|
65
|
+
deprecateAliases: true,
|
|
66
|
+
aliases: ['setalias'],
|
|
67
|
+
}),
|
|
68
|
+
'no-prompt': Flags.boolean({
|
|
69
|
+
char: 'p',
|
|
70
|
+
summary: commonMessages.getMessage('flags.no-prompt.summary'),
|
|
71
|
+
required: false,
|
|
72
|
+
hidden: true,
|
|
73
|
+
deprecateAliases: true,
|
|
74
|
+
aliases: ['noprompt'],
|
|
75
|
+
}),
|
|
76
|
+
loglevel,
|
|
77
|
+
};
|
|
78
|
+
flags;
|
|
79
|
+
logger = Logger.childFromRoot(this.constructor.name);
|
|
21
80
|
async run() {
|
|
22
81
|
const { flags } = await this.parse(LoginJwt);
|
|
23
82
|
this.flags = flags;
|
|
@@ -32,7 +91,7 @@ class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
|
|
|
32
91
|
setDefaultDevHub: flags['set-default-dev-hub'],
|
|
33
92
|
});
|
|
34
93
|
result = authInfo.getFields(true);
|
|
35
|
-
await
|
|
94
|
+
await AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
36
95
|
}
|
|
37
96
|
catch (err) {
|
|
38
97
|
if (!(err instanceof Error)) {
|
|
@@ -49,11 +108,11 @@ class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
|
|
|
49
108
|
clientId: this.flags['client-id'],
|
|
50
109
|
privateKeyFile: this.flags['jwt-key-file'],
|
|
51
110
|
};
|
|
52
|
-
const loginUrl = await
|
|
111
|
+
const loginUrl = await Common.resolveLoginUrl(this.flags['instance-url']?.href);
|
|
53
112
|
const oauth2Options = loginUrl ? Object.assign(oauth2OptionsBase, { loginUrl }) : oauth2OptionsBase;
|
|
54
113
|
let authInfo;
|
|
55
114
|
try {
|
|
56
|
-
authInfo = await
|
|
115
|
+
authInfo = await AuthInfo.create({
|
|
57
116
|
username: this.flags.username,
|
|
58
117
|
oauth2Options,
|
|
59
118
|
});
|
|
@@ -62,9 +121,9 @@ class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
|
|
|
62
121
|
const err = error;
|
|
63
122
|
if (err.name === 'AuthInfoOverwriteError') {
|
|
64
123
|
this.logger.debug('Auth file already exists. Removing and starting fresh.');
|
|
65
|
-
const remover = await
|
|
124
|
+
const remover = await AuthRemover.create();
|
|
66
125
|
await remover.removeAuth(this.flags.username);
|
|
67
|
-
authInfo = await
|
|
126
|
+
authInfo = await AuthInfo.create({
|
|
68
127
|
username: this.flags.username,
|
|
69
128
|
oauth2Options,
|
|
70
129
|
});
|
|
@@ -77,66 +136,4 @@ class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
|
|
|
77
136
|
return authInfo;
|
|
78
137
|
}
|
|
79
138
|
}
|
|
80
|
-
LoginJwt.summary = messages.getMessage('summary');
|
|
81
|
-
LoginJwt.description = messages.getMessage('description');
|
|
82
|
-
LoginJwt.examples = messages.getMessages('examples');
|
|
83
|
-
LoginJwt.aliases = ['force:auth:jwt:grant', 'auth:jwt:grant'];
|
|
84
|
-
LoginJwt.flags = {
|
|
85
|
-
username: sf_plugins_core_1.Flags.string({
|
|
86
|
-
char: 'o',
|
|
87
|
-
summary: messages.getMessage('flags.username.summary'),
|
|
88
|
-
required: true,
|
|
89
|
-
deprecateAliases: true,
|
|
90
|
-
aliases: ['u'],
|
|
91
|
-
}),
|
|
92
|
-
'jwt-key-file': sf_plugins_core_1.Flags.file({
|
|
93
|
-
char: 'f',
|
|
94
|
-
summary: messages.getMessage('flags.jwt-key-file.summary'),
|
|
95
|
-
required: true,
|
|
96
|
-
deprecateAliases: true,
|
|
97
|
-
aliases: ['jwtkeyfile', 'keyfile'],
|
|
98
|
-
}),
|
|
99
|
-
'client-id': sf_plugins_core_1.Flags.string({
|
|
100
|
-
char: 'i',
|
|
101
|
-
summary: commonMessages.getMessage('flags.client-id.summary'),
|
|
102
|
-
required: true,
|
|
103
|
-
deprecateAliases: true,
|
|
104
|
-
aliases: ['clientid'],
|
|
105
|
-
}),
|
|
106
|
-
'instance-url': sf_plugins_core_1.Flags.url({
|
|
107
|
-
char: 'r',
|
|
108
|
-
summary: commonMessages.getMessage('flags.instance-url.summary'),
|
|
109
|
-
description: commonMessages.getMessage('flags.instance-url.description'),
|
|
110
|
-
deprecateAliases: true,
|
|
111
|
-
aliases: ['instanceurl', 'l'],
|
|
112
|
-
}),
|
|
113
|
-
'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
|
|
114
|
-
char: 'd',
|
|
115
|
-
summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
|
|
116
|
-
deprecateAliases: true,
|
|
117
|
-
aliases: ['setdefaultdevhub', 'setdefaultdevhubusername', 'v'],
|
|
118
|
-
}),
|
|
119
|
-
'set-default': sf_plugins_core_1.Flags.boolean({
|
|
120
|
-
char: 's',
|
|
121
|
-
summary: commonMessages.getMessage('flags.set-default.summary'),
|
|
122
|
-
deprecateAliases: true,
|
|
123
|
-
aliases: ['setdefaultusername'],
|
|
124
|
-
}),
|
|
125
|
-
alias: sf_plugins_core_1.Flags.string({
|
|
126
|
-
char: 'a',
|
|
127
|
-
summary: commonMessages.getMessage('flags.alias.summary'),
|
|
128
|
-
deprecateAliases: true,
|
|
129
|
-
aliases: ['setalias'],
|
|
130
|
-
}),
|
|
131
|
-
'no-prompt': sf_plugins_core_1.Flags.boolean({
|
|
132
|
-
char: 'p',
|
|
133
|
-
summary: commonMessages.getMessage('flags.no-prompt.summary'),
|
|
134
|
-
required: false,
|
|
135
|
-
hidden: true,
|
|
136
|
-
deprecateAliases: true,
|
|
137
|
-
aliases: ['noprompt'],
|
|
138
|
-
}),
|
|
139
|
-
loglevel: sf_plugins_core_1.loglevel,
|
|
140
|
-
};
|
|
141
|
-
exports.default = LoginJwt;
|
|
142
139
|
//# sourceMappingURL=jwt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { AuthFields } from '@salesforce/core';
|
|
2
|
-
import { AuthBaseCommand } from '../../../authBaseCommand';
|
|
2
|
+
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
3
3
|
export default class LoginSfdxUrl extends AuthBaseCommand<AuthFields> {
|
|
4
4
|
static readonly summary: string;
|
|
5
5
|
static readonly description: string;
|
|
6
6
|
static readonly examples: string[];
|
|
7
7
|
static aliases: string[];
|
|
8
8
|
static readonly flags: {
|
|
9
|
-
'sfdx-url-file': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
10
|
-
'set-default-dev-hub': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
|
-
'set-default': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
|
-
alias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
13
|
-
'no-prompt': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
14
|
-
loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
9
|
+
'sfdx-url-file': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
10
|
+
'set-default-dev-hub': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
11
|
+
'set-default': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
12
|
+
alias: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
13
|
+
'no-prompt': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
14
|
+
loglevel: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
15
15
|
};
|
|
16
16
|
run(): Promise<AuthFields>;
|
|
17
17
|
}
|
|
@@ -1,32 +1,74 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
7
|
+
import { dirname } from 'node:path';
|
|
8
|
+
import { fileURLToPath } from 'node:url';
|
|
9
|
+
import fs from 'node:fs/promises';
|
|
10
|
+
import { Flags, loglevel } from '@salesforce/sf-plugins-core';
|
|
11
|
+
import { AuthInfo, Messages } from '@salesforce/core';
|
|
12
|
+
import { parseJson } from '@salesforce/kit';
|
|
13
|
+
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
14
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
15
|
+
const messages = Messages.loadMessages('@salesforce/plugin-auth', 'sfdxurl.store');
|
|
16
|
+
const commonMessages = Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
17
17
|
const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
|
|
18
|
-
class LoginSfdxUrl extends
|
|
18
|
+
export default class LoginSfdxUrl extends AuthBaseCommand {
|
|
19
|
+
static summary = messages.getMessage('summary');
|
|
20
|
+
static description = messages.getMessage('description', [AUTH_URL_FORMAT]);
|
|
21
|
+
static examples = messages.getMessages('examples');
|
|
22
|
+
static aliases = ['force:auth:sfdxurl:store', 'auth:sfdxurl:store'];
|
|
23
|
+
static flags = {
|
|
24
|
+
'sfdx-url-file': Flags.file({
|
|
25
|
+
char: 'f',
|
|
26
|
+
summary: messages.getMessage('flags.sfdx-url-file.summary'),
|
|
27
|
+
required: true,
|
|
28
|
+
deprecateAliases: true,
|
|
29
|
+
aliases: ['sfdxurlfile'],
|
|
30
|
+
}),
|
|
31
|
+
'set-default-dev-hub': Flags.boolean({
|
|
32
|
+
char: 'd',
|
|
33
|
+
summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
|
|
34
|
+
deprecateAliases: true,
|
|
35
|
+
aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
|
|
36
|
+
}),
|
|
37
|
+
'set-default': Flags.boolean({
|
|
38
|
+
char: 's',
|
|
39
|
+
summary: commonMessages.getMessage('flags.set-default.summary'),
|
|
40
|
+
deprecateAliases: true,
|
|
41
|
+
aliases: ['setdefaultusername'],
|
|
42
|
+
}),
|
|
43
|
+
alias: Flags.string({
|
|
44
|
+
char: 'a',
|
|
45
|
+
summary: commonMessages.getMessage('flags.alias.summary'),
|
|
46
|
+
deprecateAliases: true,
|
|
47
|
+
aliases: ['setalias'],
|
|
48
|
+
}),
|
|
49
|
+
'no-prompt': Flags.boolean({
|
|
50
|
+
char: 'p',
|
|
51
|
+
summary: commonMessages.getMessage('flags.no-prompt.summary'),
|
|
52
|
+
required: false,
|
|
53
|
+
hidden: true,
|
|
54
|
+
deprecateAliases: true,
|
|
55
|
+
aliases: ['noprompt'],
|
|
56
|
+
}),
|
|
57
|
+
loglevel,
|
|
58
|
+
};
|
|
19
59
|
async run() {
|
|
20
60
|
const { flags } = await this.parse(LoginSfdxUrl);
|
|
21
61
|
if (await this.shouldExitCommand(flags['no-prompt']))
|
|
22
62
|
return {};
|
|
23
63
|
const authFile = flags['sfdx-url-file'];
|
|
24
|
-
const sfdxAuthUrl = authFile.endsWith('.json')
|
|
64
|
+
const sfdxAuthUrl = authFile.endsWith('.json')
|
|
65
|
+
? await getUrlFromJson(authFile)
|
|
66
|
+
: await fs.readFile(authFile, 'utf8');
|
|
25
67
|
if (!sfdxAuthUrl) {
|
|
26
68
|
throw new Error(`Error getting the auth URL from file ${authFile}. Please ensure it meets the description shown in the documentation for this command.`);
|
|
27
69
|
}
|
|
28
|
-
const oauth2Options =
|
|
29
|
-
const authInfo = await
|
|
70
|
+
const oauth2Options = AuthInfo.parseSfdxAuthUrl(sfdxAuthUrl);
|
|
71
|
+
const authInfo = await AuthInfo.create({ oauth2Options });
|
|
30
72
|
await authInfo.save();
|
|
31
73
|
await authInfo.handleAliasAndDefaultSettings({
|
|
32
74
|
alias: flags.alias,
|
|
@@ -35,56 +77,15 @@ class LoginSfdxUrl extends authBaseCommand_1.AuthBaseCommand {
|
|
|
35
77
|
});
|
|
36
78
|
// ensure the clientSecret field... even if it is empty
|
|
37
79
|
const result = { clientSecret: '', ...authInfo.getFields(true) };
|
|
38
|
-
await
|
|
80
|
+
await AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
39
81
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
40
82
|
this.logSuccess(successMsg);
|
|
41
83
|
return result;
|
|
42
84
|
}
|
|
43
85
|
}
|
|
44
|
-
LoginSfdxUrl.summary = messages.getMessage('summary');
|
|
45
|
-
LoginSfdxUrl.description = messages.getMessage('description', [AUTH_URL_FORMAT]);
|
|
46
|
-
LoginSfdxUrl.examples = messages.getMessages('examples');
|
|
47
|
-
LoginSfdxUrl.aliases = ['force:auth:sfdxurl:store', 'auth:sfdxurl:store'];
|
|
48
|
-
LoginSfdxUrl.flags = {
|
|
49
|
-
'sfdx-url-file': sf_plugins_core_1.Flags.file({
|
|
50
|
-
char: 'f',
|
|
51
|
-
summary: messages.getMessage('flags.sfdx-url-file.summary'),
|
|
52
|
-
required: true,
|
|
53
|
-
deprecateAliases: true,
|
|
54
|
-
aliases: ['sfdxurlfile'],
|
|
55
|
-
}),
|
|
56
|
-
'set-default-dev-hub': sf_plugins_core_1.Flags.boolean({
|
|
57
|
-
char: 'd',
|
|
58
|
-
summary: commonMessages.getMessage('flags.set-default-dev-hub.summary'),
|
|
59
|
-
deprecateAliases: true,
|
|
60
|
-
aliases: ['setdefaultdevhub', 'setdefaultdevhubusername'],
|
|
61
|
-
}),
|
|
62
|
-
'set-default': sf_plugins_core_1.Flags.boolean({
|
|
63
|
-
char: 's',
|
|
64
|
-
summary: commonMessages.getMessage('flags.set-default.summary'),
|
|
65
|
-
deprecateAliases: true,
|
|
66
|
-
aliases: ['setdefaultusername'],
|
|
67
|
-
}),
|
|
68
|
-
alias: sf_plugins_core_1.Flags.string({
|
|
69
|
-
char: 'a',
|
|
70
|
-
summary: commonMessages.getMessage('flags.alias.summary'),
|
|
71
|
-
deprecateAliases: true,
|
|
72
|
-
aliases: ['setalias'],
|
|
73
|
-
}),
|
|
74
|
-
'no-prompt': sf_plugins_core_1.Flags.boolean({
|
|
75
|
-
char: 'p',
|
|
76
|
-
summary: commonMessages.getMessage('flags.no-prompt.summary'),
|
|
77
|
-
required: false,
|
|
78
|
-
hidden: true,
|
|
79
|
-
deprecateAliases: true,
|
|
80
|
-
aliases: ['noprompt'],
|
|
81
|
-
}),
|
|
82
|
-
loglevel: sf_plugins_core_1.loglevel,
|
|
83
|
-
};
|
|
84
|
-
exports.default = LoginSfdxUrl;
|
|
85
86
|
const getUrlFromJson = async (authFile) => {
|
|
86
|
-
const jsonContents = await
|
|
87
|
-
const authFileJson =
|
|
87
|
+
const jsonContents = await fs.readFile(authFile, 'utf8');
|
|
88
|
+
const authFileJson = parseJson(jsonContents);
|
|
88
89
|
return authFileJson.result?.sfdxAuthUrl ?? authFileJson.sfdxAuthUrl;
|
|
89
90
|
};
|
|
90
91
|
//# sourceMappingURL=sfdx-url.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sfdx-url.js","sourceRoot":"","sources":["../../../../src/commands/org/login/sfdx-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { AuthFields } from '@salesforce/core';
|
|
3
3
|
import { Interfaces } from '@oclif/core';
|
|
4
|
-
import { AuthBaseCommand } from '../../../authBaseCommand';
|
|
4
|
+
import { AuthBaseCommand } from '../../../authBaseCommand.js';
|
|
5
5
|
export default class LoginWeb extends AuthBaseCommand<AuthFields> {
|
|
6
6
|
static readonly summary: string;
|
|
7
7
|
static readonly description: string;
|
|
@@ -9,15 +9,15 @@ export default class LoginWeb extends AuthBaseCommand<AuthFields> {
|
|
|
9
9
|
static readonly deprecateAliases = true;
|
|
10
10
|
static aliases: string[];
|
|
11
11
|
static readonly flags: {
|
|
12
|
-
browser: Interfaces.OptionFlag<string | undefined,
|
|
13
|
-
'client-id': Interfaces.OptionFlag<string | undefined,
|
|
14
|
-
'instance-url': Interfaces.OptionFlag<import("url").URL | undefined,
|
|
12
|
+
browser: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
13
|
+
'client-id': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
14
|
+
'instance-url': Interfaces.OptionFlag<import("url").URL | undefined, Interfaces.CustomOptions>;
|
|
15
15
|
'set-default-dev-hub': Interfaces.BooleanFlag<boolean>;
|
|
16
16
|
'set-default': Interfaces.BooleanFlag<boolean>;
|
|
17
|
-
alias: Interfaces.OptionFlag<string | undefined,
|
|
17
|
+
alias: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
18
18
|
'disable-masking': Interfaces.BooleanFlag<boolean>;
|
|
19
19
|
'no-prompt': Interfaces.BooleanFlag<boolean>;
|
|
20
|
-
loglevel: Interfaces.OptionFlag<string | undefined,
|
|
20
|
+
loglevel: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
|
|
21
21
|
};
|
|
22
22
|
private flags;
|
|
23
23
|
run(): Promise<AuthFields>;
|