@salesforce/plugin-auth 1.8.0 → 2.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/CHANGELOG.md +21 -0
- package/LICENSE.txt +1 -1
- package/README.md +385 -125
- package/lib/commands/auth/accesstoken/store.js +17 -10
- package/lib/commands/auth/accesstoken/store.js.map +1 -1
- package/lib/commands/auth/device/login.js +6 -2
- package/lib/commands/auth/device/login.js.map +1 -1
- package/lib/commands/auth/jwt/grant.js +7 -3
- package/lib/commands/auth/jwt/grant.js.map +1 -1
- package/lib/commands/auth/list.d.ts +2 -2
- package/lib/commands/auth/list.js +16 -9
- package/lib/commands/auth/list.js.map +1 -1
- package/lib/commands/auth/logout.js +24 -11
- package/lib/commands/auth/logout.js.map +1 -1
- package/lib/commands/auth/sfdxurl/store.js +13 -5
- package/lib/commands/auth/sfdxurl/store.js.map +1 -1
- package/lib/commands/auth/web/login.js +8 -4
- package/lib/commands/auth/web/login.js.map +1 -1
- package/lib/common.d.ts +0 -10
- package/lib/common.js +3 -60
- package/lib/common.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +20 -14
|
@@ -12,7 +12,6 @@ const core_1 = require("@salesforce/core");
|
|
|
12
12
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
13
13
|
const kit_1 = require("@salesforce/kit");
|
|
14
14
|
const prompts_1 = require("../../../prompts");
|
|
15
|
-
const common_1 = require("../../../common");
|
|
16
15
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
16
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'accesstoken.store');
|
|
18
17
|
const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
@@ -40,16 +39,24 @@ class Store extends command_1.SfdxCommand {
|
|
|
40
39
|
}
|
|
41
40
|
async saveAuthInfo(authInfo) {
|
|
42
41
|
await authInfo.save();
|
|
43
|
-
await
|
|
44
|
-
|
|
42
|
+
await authInfo.handleAliasAndDefaultSettings({
|
|
43
|
+
alias: this.flags.setalias,
|
|
44
|
+
setDefault: this.flags.setdefaultusername,
|
|
45
|
+
setDefaultDevHub: this.flags.setdefaultdevhubusername,
|
|
46
|
+
});
|
|
47
|
+
await core_1.AuthInfo.identifyPossibleScratchOrgs(authInfo.getFields(true), authInfo);
|
|
45
48
|
}
|
|
46
49
|
async overwriteAuthInfo(username) {
|
|
47
50
|
if (!this.flags.noprompt) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
/**
|
|
52
|
+
* This must remain a `GlobalInfo.create()` call
|
|
53
|
+
* the AuthInfo.create call in this.getUserInfo will persist the new auth information to GlobalInfo in memory,
|
|
54
|
+
* so if we call GlobalInfo.getInstance it already has that user stored in memory, so when we ask info.orgs.has(username)
|
|
55
|
+
* it has that username in memory, but it hasn't been saved to the file yet - which is what we really want. If this
|
|
56
|
+
* is changed to GlobalInfo.getInstance, it will prompt the user to override an existing file, which doesn't exist yet
|
|
57
|
+
*/
|
|
58
|
+
const info = await core_1.GlobalInfo.create();
|
|
59
|
+
if (info.orgs.has(username)) {
|
|
53
60
|
return prompts_1.Prompts.askOverwriteAuthFile(this.ux, username);
|
|
54
61
|
}
|
|
55
62
|
}
|
|
@@ -64,7 +71,7 @@ class Store extends command_1.SfdxCommand {
|
|
|
64
71
|
accessToken = await prompts_1.Prompts.askForAccessToken(this.ux);
|
|
65
72
|
}
|
|
66
73
|
if (!core_1.sfdc.matchesAccessToken(accessToken)) {
|
|
67
|
-
throw new core_1.
|
|
74
|
+
throw new core_1.SfError(messages.getMessage('invalidAccessTokenFormat', [ACCESS_TOKEN_FORMAT]));
|
|
68
75
|
}
|
|
69
76
|
return accessToken;
|
|
70
77
|
}
|
|
@@ -80,7 +87,7 @@ Store.flagsConfig = {
|
|
|
80
87
|
required: true,
|
|
81
88
|
}),
|
|
82
89
|
setdefaultdevhubusername: command_1.flags.boolean({
|
|
83
|
-
char: '
|
|
90
|
+
char: 'd',
|
|
84
91
|
description: commonMessages.getMessage('setDefaultDevHub'),
|
|
85
92
|
default: false,
|
|
86
93
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/commands/auth/accesstoken/store.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/commands/auth/accesstoken/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,9 +39,13 @@ class Login extends command_1.SfdxCommand {
|
|
|
39
39
|
const approval = await deviceOauthService.awaitDeviceApproval(loginData);
|
|
40
40
|
if (approval) {
|
|
41
41
|
const authInfo = await deviceOauthService.authorizeAndSave(approval);
|
|
42
|
-
await
|
|
42
|
+
await authInfo.handleAliasAndDefaultSettings({
|
|
43
|
+
alias: this.flags.setalias,
|
|
44
|
+
setDefault: this.flags.setdefaultusername,
|
|
45
|
+
setDefaultDevHub: this.flags.setdefaultdevhubusername,
|
|
46
|
+
});
|
|
43
47
|
const fields = authInfo.getFields(true);
|
|
44
|
-
await
|
|
48
|
+
await core_1.AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
|
|
45
49
|
const successMsg = messages.getMessage('success', [fields.username]);
|
|
46
50
|
this.ux.log(successMsg);
|
|
47
51
|
return fields;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/auth/device/login.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/auth/device/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,13 +22,17 @@ class Grant extends command_1.SfdxCommand {
|
|
|
22
22
|
return {};
|
|
23
23
|
try {
|
|
24
24
|
const authInfo = await this.initAuthInfo();
|
|
25
|
-
await
|
|
25
|
+
await authInfo.handleAliasAndDefaultSettings({
|
|
26
|
+
alias: this.flags.setalias,
|
|
27
|
+
setDefault: this.flags.setdefaultusername,
|
|
28
|
+
setDefaultDevHub: this.flags.setdefaultdevhubusername,
|
|
29
|
+
});
|
|
26
30
|
result = authInfo.getFields(true);
|
|
27
|
-
await
|
|
31
|
+
await core_1.AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
28
32
|
}
|
|
29
33
|
catch (err) {
|
|
30
34
|
const msg = (0, ts_types_1.getString)(err, 'message');
|
|
31
|
-
throw
|
|
35
|
+
throw messages.createError('JwtGrantError', [msg]);
|
|
32
36
|
}
|
|
33
37
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
34
38
|
this.ux.log(successMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../../../src/commands/auth/jwt/grant.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"grant.js","sourceRoot":"","sources":["../../../../src/commands/auth/jwt/grant.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { FlagsConfig, SfdxCommand } from '@salesforce/command';
|
|
2
|
-
import {
|
|
2
|
+
import { OrgAuthorization } from '@salesforce/core';
|
|
3
3
|
export default class List extends SfdxCommand {
|
|
4
4
|
static readonly description: string;
|
|
5
5
|
static aliases: string[];
|
|
6
6
|
static readonly flagsConfig: FlagsConfig;
|
|
7
|
-
run(): Promise<
|
|
7
|
+
run(): Promise<OrgAuthorization[]>;
|
|
8
8
|
}
|
|
@@ -14,18 +14,25 @@ class List extends command_1.SfdxCommand {
|
|
|
14
14
|
async run() {
|
|
15
15
|
try {
|
|
16
16
|
const auths = await core_1.AuthInfo.listAllAuthorizations();
|
|
17
|
+
auths.map((auth) => {
|
|
18
|
+
// core3 moved to aliases as a string[], revert to alias as a string
|
|
19
|
+
auth.alias = auth.aliases.join(',');
|
|
20
|
+
// to prevent 'undefined' entries in the table only delete auth.alias if it's json output
|
|
21
|
+
// matches the previous behavior where alias was only present when it was defined
|
|
22
|
+
if (auth.alias === '' && this.flags.json)
|
|
23
|
+
delete auth.alias;
|
|
24
|
+
delete auth.aliases;
|
|
25
|
+
});
|
|
17
26
|
const hasErrors = auths.filter((auth) => !!auth.error).length > 0;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
{ key: 'oauthMethod', label: 'AUTH METHOD' },
|
|
25
|
-
],
|
|
27
|
+
let columns = {
|
|
28
|
+
alias: { header: 'ALIAS' },
|
|
29
|
+
username: { header: 'USERNAME' },
|
|
30
|
+
orgId: { header: 'ORG ID' },
|
|
31
|
+
instanceUrl: { header: 'INSTANCE URL' },
|
|
32
|
+
oauthMethod: { header: 'AUTH METHOD' },
|
|
26
33
|
};
|
|
27
34
|
if (hasErrors) {
|
|
28
|
-
columns
|
|
35
|
+
columns = { ...columns, ...{ error: { header: 'ERROR' } } };
|
|
29
36
|
}
|
|
30
37
|
this.ux.styledHeader('authenticated orgs');
|
|
31
38
|
this.ux.table(auths, columns);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/auth/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/auth/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iDAA+D;AAC/D,2CAAwE;AAGxE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAE1E,MAAqB,IAAK,SAAQ,qBAAW;IAKpC,KAAK,CAAC,GAAG;QACd,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,eAAQ,CAAC,qBAAqB,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,CAAC,IAA0C,EAAE,EAAE;gBACvD,oEAAoE;gBACpE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpC,yFAAyF;gBACzF,iFAAiF;gBACjF,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC,KAAK,CAAC;gBAE5D,OAAO,IAAI,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAClE,IAAI,OAAO,GAAuD;gBAChE,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;aACvC,CAAC;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;aAC7D;YACD,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;YAC3C,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9B,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACnD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;;AAnCH,uBAoCC;AAnCwB,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC1D,YAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAErB,gBAAW,GAAgB,EAAE,CAAC"}
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const os = require("os");
|
|
10
|
-
const command_1 = require("@salesforce/command");
|
|
11
10
|
const core_1 = require("@salesforce/core");
|
|
11
|
+
const command_1 = require("@salesforce/command");
|
|
12
12
|
const prompts_1 = require("../../prompts");
|
|
13
13
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
14
14
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'logout');
|
|
@@ -16,28 +16,41 @@ const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', '
|
|
|
16
16
|
class Logout extends command_1.SfdxCommand {
|
|
17
17
|
async run() {
|
|
18
18
|
if (this.flags.targetusername && this.flags.all) {
|
|
19
|
-
|
|
20
|
-
return Promise.reject(err);
|
|
19
|
+
throw new core_1.SfError(messages.getMessage('specifiedBothUserAndAllError'), 'SpecifiedBothUserAndAllError');
|
|
21
20
|
}
|
|
22
21
|
const remover = await core_1.AuthRemover.create();
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
const ca = core_1.ConfigAggregator.getInstance();
|
|
23
|
+
const targetUsername = this.flags.targetusername
|
|
24
|
+
? this.flags.targetusername
|
|
25
|
+
: ca.getInfo(core_1.OrgConfigProperties.TARGET_ORG).value;
|
|
26
|
+
let usernames;
|
|
27
|
+
try {
|
|
28
|
+
usernames = this.shouldFindAllAuths()
|
|
29
|
+
? Object.keys(remover.findAllAuths())
|
|
30
|
+
: [(await remover.findAuth(targetUsername)).username];
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
// keep the error name the same for SFDX
|
|
34
|
+
const err = e;
|
|
35
|
+
err.name = 'NoOrgFound';
|
|
36
|
+
throw core_1.SfError.wrap(err);
|
|
37
|
+
}
|
|
38
|
+
if (await this.shouldRunCommand(usernames)) {
|
|
28
39
|
for (const username of usernames) {
|
|
29
40
|
await remover.removeAuth(username);
|
|
30
41
|
}
|
|
31
42
|
this.ux.log(messages.getMessage('logoutOrgCommandSuccess', [usernames.join(os.EOL)]));
|
|
32
43
|
return usernames;
|
|
33
44
|
}
|
|
34
|
-
|
|
45
|
+
else {
|
|
46
|
+
return [];
|
|
47
|
+
}
|
|
35
48
|
}
|
|
36
49
|
shouldFindAllAuths() {
|
|
37
50
|
return !!this.flags.all || (!this.flags.targetusername && core_1.Global.getEnvironmentMode() === core_1.Mode.DEMO);
|
|
38
51
|
}
|
|
39
|
-
async shouldRunCommand(
|
|
40
|
-
const orgsToDelete = [
|
|
52
|
+
async shouldRunCommand(usernames) {
|
|
53
|
+
const orgsToDelete = [usernames.join(os.EOL)];
|
|
41
54
|
const message = messages.getMessage('logoutCommandYesNo', orgsToDelete);
|
|
42
55
|
return prompts_1.Prompts.shouldRunCommand(this.ux, this.flags.noprompt, message);
|
|
43
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,38 +7,46 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const os = require("os");
|
|
10
|
+
const promises_1 = require("fs/promises");
|
|
11
|
+
const fs_extra_1 = require("fs-extra");
|
|
10
12
|
const command_1 = require("@salesforce/command");
|
|
11
13
|
const core_1 = require("@salesforce/core");
|
|
12
14
|
const prompts_1 = require("../../../prompts");
|
|
13
|
-
const common_1 = require("../../../common");
|
|
14
15
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
15
16
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'sfdxurl.store');
|
|
16
17
|
const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
17
18
|
const AUTH_URL_FORMAT = 'force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>';
|
|
18
19
|
class Store extends command_1.SfdxCommand {
|
|
19
20
|
async run() {
|
|
21
|
+
var _a;
|
|
20
22
|
if (await prompts_1.Prompts.shouldExitCommand(this.ux, this.flags.noprompt))
|
|
21
23
|
return {};
|
|
22
24
|
const authFile = this.flags.sfdxurlfile;
|
|
23
25
|
const sfdxAuthUrl = authFile.endsWith('.json')
|
|
24
26
|
? await this.getUrlFromJson(authFile)
|
|
25
|
-
: await
|
|
27
|
+
: await (0, promises_1.readFile)(authFile, 'utf8');
|
|
26
28
|
if (!sfdxAuthUrl) {
|
|
27
29
|
throw new Error(`Error getting the auth URL from file ${authFile}. Please ensure it meets the description shown in the documentation for this command.`);
|
|
28
30
|
}
|
|
29
31
|
const oauth2Options = core_1.AuthInfo.parseSfdxAuthUrl(sfdxAuthUrl);
|
|
30
32
|
const authInfo = await core_1.AuthInfo.create({ oauth2Options });
|
|
31
33
|
await authInfo.save();
|
|
32
|
-
await
|
|
34
|
+
await authInfo.handleAliasAndDefaultSettings({
|
|
35
|
+
alias: this.flags.setalias,
|
|
36
|
+
setDefault: this.flags.setdefaultusername,
|
|
37
|
+
setDefaultDevHub: this.flags.setdefaultdevhubusername,
|
|
38
|
+
});
|
|
33
39
|
const result = authInfo.getFields(true);
|
|
34
|
-
|
|
40
|
+
// ensure the clientSecret field... even if it is empty
|
|
41
|
+
result.clientSecret = (_a = result.clientSecret) !== null && _a !== void 0 ? _a : '';
|
|
42
|
+
await core_1.AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
35
43
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
36
44
|
this.ux.log(successMsg);
|
|
37
45
|
return result;
|
|
38
46
|
}
|
|
39
47
|
async getUrlFromJson(authFile) {
|
|
40
48
|
var _a;
|
|
41
|
-
const authFileJson = (await
|
|
49
|
+
const authFileJson = (await (0, fs_extra_1.readJson)(authFile));
|
|
42
50
|
return ((_a = authFileJson.result) === null || _a === void 0 ? void 0 : _a.sfdxAuthUrl) || authFileJson.sfdxAuthUrl;
|
|
43
51
|
}
|
|
44
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/commands/auth/sfdxurl/store.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../../src/commands/auth/sfdxurl/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const commonMessages = core_1.Messages.loadMessages('@salesforce/plugin-auth', '
|
|
|
20
20
|
class Login extends command_1.SfdxCommand {
|
|
21
21
|
async run() {
|
|
22
22
|
if (this.isSFDXContainerMode()) {
|
|
23
|
-
throw new core_1.
|
|
23
|
+
throw new core_1.SfError(messages.getMessage('deviceWarning'), 'DEVICE_WARNING');
|
|
24
24
|
}
|
|
25
25
|
if (await prompts_1.Prompts.shouldExitCommand(this.ux, this.flags.noprompt))
|
|
26
26
|
return {};
|
|
@@ -33,9 +33,13 @@ class Login extends command_1.SfdxCommand {
|
|
|
33
33
|
}
|
|
34
34
|
try {
|
|
35
35
|
const authInfo = await this.executeLoginFlow(oauthConfig);
|
|
36
|
-
await
|
|
36
|
+
await authInfo.handleAliasAndDefaultSettings({
|
|
37
|
+
alias: this.flags.setalias,
|
|
38
|
+
setDefault: this.flags.setdefaultusername,
|
|
39
|
+
setDefaultDevHub: this.flags.setdefaultdevhubusername,
|
|
40
|
+
});
|
|
37
41
|
const fields = authInfo.getFields(true);
|
|
38
|
-
await
|
|
42
|
+
await core_1.AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
|
|
39
43
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [fields.username, fields.orgId]);
|
|
40
44
|
this.ux.log(successMsg);
|
|
41
45
|
return fields;
|
|
@@ -44,7 +48,7 @@ class Login extends command_1.SfdxCommand {
|
|
|
44
48
|
const error = err;
|
|
45
49
|
core_1.Logger.childFromRoot('auth').debug(error);
|
|
46
50
|
if (error.name === 'AuthCodeExchangeError') {
|
|
47
|
-
throw new core_1.
|
|
51
|
+
throw new core_1.SfError(messages.getMessage('invalidClientId', [error.message]));
|
|
48
52
|
}
|
|
49
53
|
throw error;
|
|
50
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/auth/web/login.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,6BAA6B;AAE7B,iDAAsE;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/auth/web/login.ts"],"names":[],"mappings":"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"}
|
package/lib/common.d.ts
CHANGED
|
@@ -1,14 +1,4 @@
|
|
|
1
|
-
import { AuthInfo, AuthFields } from '@salesforce/core';
|
|
2
1
|
import { Optional } from '@salesforce/ts-types';
|
|
3
|
-
interface Flags {
|
|
4
|
-
setalias?: string;
|
|
5
|
-
setdefaultdevhubusername?: boolean;
|
|
6
|
-
setdefaultusername?: boolean;
|
|
7
|
-
}
|
|
8
2
|
export declare class Common {
|
|
9
|
-
static handleSideEffects(authInfo: AuthInfo, flags: Flags): Promise<void>;
|
|
10
3
|
static resolveLoginUrl(instanceUrl: Optional<string>): Promise<Optional<string>>;
|
|
11
|
-
static identifyPossibleScratchOrgs(fields: AuthFields, orgAuthInfo: AuthInfo): Promise<void>;
|
|
12
|
-
static getDevHubAuthInfos(): Promise<AuthInfo[]>;
|
|
13
4
|
}
|
|
14
|
-
export {};
|
package/lib/common.js
CHANGED
|
@@ -7,35 +7,24 @@ exports.Common = void 0;
|
|
|
7
7
|
* Licensed under the BSD 3-Clause license.
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
|
-
const path_1 = require("path");
|
|
11
10
|
const core_1 = require("@salesforce/core");
|
|
12
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
13
12
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
14
13
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-auth', 'messages');
|
|
15
14
|
class Common {
|
|
16
|
-
static async handleSideEffects(authInfo, flags) {
|
|
17
|
-
if (flags.setalias)
|
|
18
|
-
await authInfo.setAlias(flags.setalias);
|
|
19
|
-
if (flags.setdefaultdevhubusername || flags.setdefaultusername) {
|
|
20
|
-
await authInfo.setAsDefault({
|
|
21
|
-
defaultUsername: flags.setdefaultusername,
|
|
22
|
-
defaultDevhubUsername: flags.setdefaultdevhubusername,
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
15
|
static async resolveLoginUrl(instanceUrl) {
|
|
27
16
|
var _a;
|
|
28
17
|
const logger = await core_1.Logger.child('Common', { tag: 'resolveLoginUrl' });
|
|
29
18
|
if (instanceUrl) {
|
|
30
19
|
if (instanceUrl.includes('lightning.force.com')) {
|
|
31
20
|
logger.warn(messages.getMessage('invalidInstanceUrl'));
|
|
32
|
-
throw new core_1.
|
|
21
|
+
throw new core_1.SfError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
|
|
33
22
|
}
|
|
34
23
|
return instanceUrl;
|
|
35
24
|
}
|
|
36
25
|
let loginUrl;
|
|
37
26
|
try {
|
|
38
|
-
const project = await core_1.
|
|
27
|
+
const project = await core_1.SfProject.resolve();
|
|
39
28
|
const projectJson = await project.resolveProjectConfig();
|
|
40
29
|
loginUrl = (0, ts_types_1.getString)(projectJson, 'sfdcLoginUrl', core_1.SfdcUrl.PRODUCTION);
|
|
41
30
|
}
|
|
@@ -46,57 +35,11 @@ class Common {
|
|
|
46
35
|
}
|
|
47
36
|
if (loginUrl.includes('lightning.force.com')) {
|
|
48
37
|
logger.warn(messages.getMessage('invalidInstanceUrl'));
|
|
49
|
-
throw new core_1.
|
|
38
|
+
throw new core_1.SfError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
|
|
50
39
|
}
|
|
51
40
|
logger.debug(`loginUrl: ${loginUrl}`);
|
|
52
41
|
return loginUrl;
|
|
53
42
|
}
|
|
54
|
-
// fields property is passed in because the consumers of this method have performed the decrypt.
|
|
55
|
-
// This is so we don't have to call authInfo.getFields(true) and decrypt again OR accidentally save an
|
|
56
|
-
// authInfo before it is necessary.
|
|
57
|
-
static async identifyPossibleScratchOrgs(fields, orgAuthInfo) {
|
|
58
|
-
const logger = await core_1.Logger.child('Common', { tag: 'identifyPossibleScratchOrgs' });
|
|
59
|
-
// return if we already know the hub or we know it is a devhub or prod-like
|
|
60
|
-
if (fields.isDevHub || fields.devHubUsername)
|
|
61
|
-
return;
|
|
62
|
-
// there are no hubs to ask, so quit early
|
|
63
|
-
if (!(await core_1.AuthInfo.hasAuthentications()))
|
|
64
|
-
return;
|
|
65
|
-
logger.debug('getting devHubs from authfiles');
|
|
66
|
-
// TODO: return if url is not sandbox-like to avoid constantly asking about production orgs
|
|
67
|
-
// TODO: someday we make this easier by asking the org if it is a scratch org
|
|
68
|
-
const hubAuthInfos = await this.getDevHubAuthInfos();
|
|
69
|
-
logger.debug(`found ${hubAuthInfos.length} DevHubs`);
|
|
70
|
-
if (hubAuthInfos.length === 0)
|
|
71
|
-
return;
|
|
72
|
-
// ask all those orgs if they know this orgId
|
|
73
|
-
await Promise.all(hubAuthInfos.map(async (hubAuthInfo) => {
|
|
74
|
-
try {
|
|
75
|
-
const devHubOrg = await core_1.Org.create({ aliasOrUsername: hubAuthInfo.getUsername() });
|
|
76
|
-
const conn = devHubOrg.getConnection();
|
|
77
|
-
const data = await conn.query(`select Id from ScratchOrgInfo where ScratchOrg = '${core_1.sfdc.trimTo15(fields.orgId)}'`);
|
|
78
|
-
if (data.totalSize > 0) {
|
|
79
|
-
// if any return a result
|
|
80
|
-
logger.debug(`found orgId ${fields.orgId} in devhub ${hubAuthInfo.getUsername()}`);
|
|
81
|
-
try {
|
|
82
|
-
await orgAuthInfo.save({ ...fields, devHubUsername: hubAuthInfo.getUsername() });
|
|
83
|
-
logger.debug(`set ${hubAuthInfo.getUsername()} as devhub for scratch org ${orgAuthInfo.getUsername()}`);
|
|
84
|
-
}
|
|
85
|
-
catch (error) {
|
|
86
|
-
logger.debug(`error updating auth file for ${orgAuthInfo.getUsername()}`, error);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
catch (error) {
|
|
91
|
-
logger.error(`Error connecting to devhub ${hubAuthInfo.getUsername()}`, error);
|
|
92
|
-
}
|
|
93
|
-
}));
|
|
94
|
-
}
|
|
95
|
-
static async getDevHubAuthInfos() {
|
|
96
|
-
return (await Promise.all((await core_1.AuthInfo.listAllAuthFiles())
|
|
97
|
-
.map((fileName) => (0, path_1.basename)(fileName, '.json'))
|
|
98
|
-
.map((username) => core_1.AuthInfo.create({ username })))).filter((possibleHub) => { var _a; return (_a = possibleHub === null || possibleHub === void 0 ? void 0 : possibleHub.getFields()) === null || _a === void 0 ? void 0 : _a.isDevHub; });
|
|
99
|
-
}
|
|
100
43
|
}
|
|
101
44
|
exports.Common = Common;
|
|
102
45
|
//# 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;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAiF;AACjF,mDAAqE;AAErE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,MAAa,MAAM;IACV,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,WAA6B;;QAC/D,MAAM,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACxE,IAAI,WAAW,EAAE;YACf,IAAI,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBAC/C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBACvD,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,aAAa,CAAC,CAAC;aAC7E;YACD,OAAO,WAAW,CAAC;SACpB;QACD,IAAI,QAAgB,CAAC;QACrB,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,gBAAS,CAAC,OAAO,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACzD,QAAQ,GAAG,IAAA,oBAAS,EAAC,WAAW,EAAE,cAAc,EAAE,cAAO,CAAC,UAAU,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAW,CAAC,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,mCAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;YAC7F,MAAM,CAAC,KAAK,CAAC,sDAAsD,OAAO,EAAE,CAAC,CAAC;YAC9E,QAAQ,GAAG,cAAO,CAAC,UAAU,CAAC;SAC/B;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACvD,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,aAAa,CAAC,CAAC;SAC7E;QACD,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA3BD,wBA2BC"}
|