@salesforce/plugin-auth 2.7.17 → 2.8.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/lib/commands/org/login/device.js +1 -2
- package/lib/commands/org/login/device.js.map +1 -1
- package/lib/commands/org/login/jwt.js +4 -3
- package/lib/commands/org/login/jwt.js.map +1 -1
- package/lib/commands/org/login/web.js +1 -2
- package/lib/commands/org/login/web.js.map +1 -1
- package/lib/common.d.ts +1 -2
- package/lib/common.js +9 -8
- package/lib/common.js.map +1 -1
- package/messages/messages.md +2 -2
- package/oclif.manifest.json +1 -1
- package/package.json +20 -19
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const core_1 = require("@salesforce/core");
|
|
10
|
-
const ts_types_1 = require("@salesforce/ts-types");
|
|
11
10
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
12
11
|
const core_2 = require("@oclif/core");
|
|
13
12
|
const authBaseCommand_1 = require("../../../authBaseCommand");
|
|
@@ -21,7 +20,7 @@ class LoginDevice extends authBaseCommand_1.AuthBaseCommand {
|
|
|
21
20
|
if (await this.shouldExitCommand(false))
|
|
22
21
|
return {};
|
|
23
22
|
const oauthConfig = {
|
|
24
|
-
loginUrl: await common_1.Common.resolveLoginUrl(
|
|
23
|
+
loginUrl: await common_1.Common.resolveLoginUrl(flags['instance-url']?.href),
|
|
25
24
|
clientId: flags['client-id'],
|
|
26
25
|
};
|
|
27
26
|
const deviceOauthService = await core_1.DeviceOauthService.create(oauthConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAGH,2CAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/commands/org/login/device.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
10
10
|
const core_1 = require("@salesforce/core");
|
|
11
|
-
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
11
|
const authBaseCommand_1 = require("../../../authBaseCommand");
|
|
13
12
|
const common_1 = require("../../../common");
|
|
14
13
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
@@ -36,8 +35,10 @@ class LoginJwt extends authBaseCommand_1.AuthBaseCommand {
|
|
|
36
35
|
await core_1.AuthInfo.identifyPossibleScratchOrgs(result, authInfo);
|
|
37
36
|
}
|
|
38
37
|
catch (err) {
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
if (!(err instanceof Error)) {
|
|
39
|
+
throw err;
|
|
40
|
+
}
|
|
41
|
+
throw messages.createError('JwtGrantError', [err.message]);
|
|
41
42
|
}
|
|
42
43
|
const successMsg = commonMessages.getMessage('authorizeCommandSuccess', [result.username, result.orgId]);
|
|
43
44
|
this.logSuccess(successMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAA8D;AAC9D,2CAAgG;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/commands/org/login/jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const open = require("open");
|
|
|
10
10
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
11
11
|
const core_1 = require("@salesforce/core");
|
|
12
12
|
const kit_1 = require("@salesforce/kit");
|
|
13
|
-
const ts_types_1 = require("@salesforce/ts-types");
|
|
14
13
|
const authBaseCommand_1 = require("../../../authBaseCommand");
|
|
15
14
|
const common_1 = require("../../../common");
|
|
16
15
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
@@ -26,7 +25,7 @@ class LoginWeb extends authBaseCommand_1.AuthBaseCommand {
|
|
|
26
25
|
if (await this.shouldExitCommand(flags['no-prompt']))
|
|
27
26
|
return {};
|
|
28
27
|
const oauthConfig = {
|
|
29
|
-
loginUrl: await common_1.Common.resolveLoginUrl(
|
|
28
|
+
loginUrl: await common_1.Common.resolveLoginUrl(flags['instance-url']?.href),
|
|
30
29
|
clientId: flags['client-id'],
|
|
31
30
|
};
|
|
32
31
|
if (flags['client-id']) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../../src/commands/org/login/web.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,6BAA6B;AAE7B,iEAA8D;AAE9D,2CAAmG;AACnG,yCAAsC;
|
|
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
package/lib/common.js
CHANGED
|
@@ -15,10 +15,7 @@ class Common {
|
|
|
15
15
|
static async resolveLoginUrl(instanceUrl) {
|
|
16
16
|
const logger = await core_1.Logger.child('Common', { tag: 'resolveLoginUrl' });
|
|
17
17
|
if (instanceUrl) {
|
|
18
|
-
|
|
19
|
-
logger.warn(messages.getMessage('invalidInstanceUrl'));
|
|
20
|
-
throw new core_1.SfError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
|
|
21
|
-
}
|
|
18
|
+
throwIfLightning(instanceUrl);
|
|
22
19
|
return instanceUrl;
|
|
23
20
|
}
|
|
24
21
|
let loginUrl;
|
|
@@ -32,13 +29,17 @@ class Common {
|
|
|
32
29
|
logger.debug(`error occurred while trying to determine loginUrl: ${message}`);
|
|
33
30
|
loginUrl = core_1.SfdcUrl.PRODUCTION;
|
|
34
31
|
}
|
|
35
|
-
|
|
36
|
-
logger.warn(messages.getMessage('invalidInstanceUrl'));
|
|
37
|
-
throw new core_1.SfError(messages.getMessage('invalidInstanceUrl'), 'URL_WARNING');
|
|
38
|
-
}
|
|
32
|
+
throwIfLightning(loginUrl);
|
|
39
33
|
logger.debug(`loginUrl: ${loginUrl}`);
|
|
40
34
|
return loginUrl;
|
|
41
35
|
}
|
|
42
36
|
}
|
|
43
37
|
exports.Common = Common;
|
|
38
|
+
const throwIfLightning = (urlString) => {
|
|
39
|
+
if (urlString?.match(/lightning\..*force\.com/)) {
|
|
40
|
+
throw new core_1.SfError(messages.getMessage('lightningInstanceUrl'), 'LightningDomain', [
|
|
41
|
+
messages.getMessage('flags.instance-url.description'),
|
|
42
|
+
]);
|
|
43
|
+
}
|
|
44
|
+
};
|
|
44
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,2CAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAiF;AACjF,mDAA2D;AAE3D,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,WAAoB;QACtD,MAAM,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACxE,IAAI,WAAW,EAAE;YACf,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC9B,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,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,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,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE3B,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAtBD,wBAsBC;AAED,MAAM,gBAAgB,GAAG,CAAC,SAAkB,EAAQ,EAAE;IACpD,IAAI,SAAS,EAAE,KAAK,CAAC,yBAAyB,CAAC,EAAE;QAC/C,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,iBAAiB,EAAE;YAChF,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;SACtD,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}
|
package/messages/messages.md
CHANGED
|
@@ -48,9 +48,9 @@ Disable masking of user input; use with problematic terminals.
|
|
|
48
48
|
|
|
49
49
|
OAuth client secret of personal connected app?
|
|
50
50
|
|
|
51
|
-
#
|
|
51
|
+
# lightningInstanceUrl
|
|
52
52
|
|
|
53
|
-
Invalid instance URL.
|
|
53
|
+
Invalid instance URL. It should NOT be a lightning domain.
|
|
54
54
|
|
|
55
55
|
# accessTokenStdin
|
|
56
56
|
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,47 +1,48 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-auth",
|
|
3
3
|
"description": "plugin for sfdx auth commands",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.8.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"main": "lib/index.js",
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@oclif/core": "^2.8.
|
|
10
|
-
"@salesforce/core": "^
|
|
11
|
-
"@salesforce/kit": "^
|
|
12
|
-
"@salesforce/sf-plugins-core": "^
|
|
9
|
+
"@oclif/core": "^2.8.2",
|
|
10
|
+
"@salesforce/core": "^4.0.1",
|
|
11
|
+
"@salesforce/kit": "^3.0.2",
|
|
12
|
+
"@salesforce/sf-plugins-core": "^3.0.2",
|
|
13
|
+
"@salesforce/ts-types": "^2.0.2",
|
|
13
14
|
"chalk": "^4.1.2",
|
|
14
15
|
"inquirer": "^8.2.5",
|
|
15
16
|
"open": "^8.2.1",
|
|
16
17
|
"tslib": "^2"
|
|
17
18
|
},
|
|
18
19
|
"devDependencies": {
|
|
19
|
-
"@oclif/plugin-command-snapshot": "^
|
|
20
|
-
"@salesforce/cli-plugins-testkit": "^
|
|
21
|
-
"@salesforce/dev-config": "^
|
|
22
|
-
"@salesforce/dev-scripts": "^4.
|
|
23
|
-
"@salesforce/plugin-command-reference": "^
|
|
20
|
+
"@oclif/plugin-command-snapshot": "^4.0.2",
|
|
21
|
+
"@salesforce/cli-plugins-testkit": "^4.0.1",
|
|
22
|
+
"@salesforce/dev-config": "^4.0.1",
|
|
23
|
+
"@salesforce/dev-scripts": "^5.4.2",
|
|
24
|
+
"@salesforce/plugin-command-reference": "^3.0.2",
|
|
24
25
|
"@salesforce/plugin-settings": "^1.4.6",
|
|
25
|
-
"@salesforce/prettier-config": "^0.0.
|
|
26
|
+
"@salesforce/prettier-config": "^0.0.3",
|
|
26
27
|
"@salesforce/ts-sinon": "^1.4.6",
|
|
27
28
|
"@swc/core": "1.3.39",
|
|
28
29
|
"@types/inquirer": "^8.2.0",
|
|
29
30
|
"@typescript-eslint/eslint-plugin": "^5.59.7",
|
|
30
|
-
"@typescript-eslint/parser": "^5.59.
|
|
31
|
+
"@typescript-eslint/parser": "^5.59.7",
|
|
31
32
|
"chai": "^4.3.7",
|
|
32
|
-
"eslint": "^8.
|
|
33
|
+
"eslint": "^8.41.0",
|
|
33
34
|
"eslint-config-prettier": "^8.8.0",
|
|
34
|
-
"eslint-config-salesforce": "^
|
|
35
|
+
"eslint-config-salesforce": "^2.0.1",
|
|
35
36
|
"eslint-config-salesforce-license": "^0.2.0",
|
|
36
37
|
"eslint-config-salesforce-typescript": "^1.1.1",
|
|
37
38
|
"eslint-plugin-header": "^3.1.1",
|
|
38
39
|
"eslint-plugin-import": "2.27.5",
|
|
39
40
|
"eslint-plugin-jsdoc": "^43.2.0",
|
|
40
|
-
"eslint-plugin-sf-plugin": "^1.15.
|
|
41
|
+
"eslint-plugin-sf-plugin": "^1.15.6",
|
|
41
42
|
"husky": "^7.0.4",
|
|
42
43
|
"mocha": "^9.1.3",
|
|
43
44
|
"nyc": "^15.1.0",
|
|
44
|
-
"oclif": "^3.
|
|
45
|
+
"oclif": "^3.9.0",
|
|
45
46
|
"prettier": "^2.8.8",
|
|
46
47
|
"pretty-quick": "^3.1.0",
|
|
47
48
|
"shx": "0.3.4",
|
|
@@ -51,7 +52,7 @@
|
|
|
51
52
|
"wireit": "^0.9.5"
|
|
52
53
|
},
|
|
53
54
|
"engines": {
|
|
54
|
-
"node": ">=
|
|
55
|
+
"node": ">=16.0.0"
|
|
55
56
|
},
|
|
56
57
|
"files": [
|
|
57
58
|
"/lib",
|
|
@@ -239,7 +240,7 @@
|
|
|
239
240
|
}
|
|
240
241
|
},
|
|
241
242
|
"sfdx": {
|
|
242
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/2.
|
|
243
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/2.
|
|
243
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/2.8.0.crt",
|
|
244
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-auth/2.8.0.sig"
|
|
244
245
|
}
|
|
245
246
|
}
|