@salesforce/core 3.7.3 → 3.7.4
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 +6 -0
- package/LICENSE.txt +1 -1
- package/lib/config/config.js +15 -15
- package/lib/config/configAggregator.js +4 -4
- package/lib/config/configFile.js +9 -9
- package/lib/config/configStore.js +12 -12
- package/lib/config/envVars.js +5 -5
- package/lib/config/keychainConfig.js +1 -1
- package/lib/crypto/crypto.js +6 -6
- package/lib/crypto/keyChainImpl.js +6 -5
- package/lib/crypto/secureBuffer.js +1 -1
- package/lib/deviceOauthService.js +5 -4
- package/lib/globalInfo/globalInfoConfig.js +1 -1
- package/lib/globalInfo/sfdxDataHandler.js +11 -11
- package/lib/lifecycleEvents.js +1 -1
- package/lib/logger.js +12 -12
- package/lib/messages.js +10 -9
- package/lib/org/authInfo.js +43 -40
- package/lib/org/connection.js +9 -8
- package/lib/org/org.js +23 -20
- package/lib/org/orgConfigProperties.js +1 -1
- package/lib/org/permissionSetAssignment.js +3 -3
- package/lib/org/user.js +20 -20
- package/lib/schema/printer.js +18 -18
- package/lib/schema/validator.js +8 -8
- package/lib/sfdxError.js +2 -2
- package/lib/sfdxProject.js +15 -13
- package/lib/status/myDomainResolver.js +3 -3
- package/lib/status/pollingClient.js +2 -2
- package/lib/status/streamingClient.js +6 -6
- package/lib/testSetup.js +21 -21
- package/lib/util/cache.js +3 -3
- package/lib/util/fs.js +12 -12
- package/lib/util/sfdc.js +3 -3
- package/lib/util/sfdcUrl.js +3 -3
- package/lib/webOAuthServer.js +7 -7
- package/package.json +29 -30
package/lib/util/fs.js
CHANGED
|
@@ -34,35 +34,35 @@ exports.fs = Object.assign({}, fsLib, {
|
|
|
34
34
|
/**
|
|
35
35
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readfile_path_options_callback|fsLib.readFile}.
|
|
36
36
|
*/
|
|
37
|
-
readFile: util_1.promisify(fsLib.readFile),
|
|
37
|
+
readFile: (0, util_1.promisify)(fsLib.readFile),
|
|
38
38
|
/**
|
|
39
39
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readdir_path_options_callback|fsLib.readdir}.
|
|
40
40
|
*/
|
|
41
|
-
readdir: util_1.promisify(fsLib.readdir),
|
|
41
|
+
readdir: (0, util_1.promisify)(fsLib.readdir),
|
|
42
42
|
/**
|
|
43
43
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_writefile_file_data_options_callback|fsLib.writeFile}.
|
|
44
44
|
*/
|
|
45
|
-
writeFile: util_1.promisify(fsLib.writeFile),
|
|
45
|
+
writeFile: (0, util_1.promisify)(fsLib.writeFile),
|
|
46
46
|
/**
|
|
47
47
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_access_path_mode_callback|fsLib.access}.
|
|
48
48
|
*/
|
|
49
|
-
access: util_1.promisify(fsLib.access),
|
|
49
|
+
access: (0, util_1.promisify)(fsLib.access),
|
|
50
50
|
/**
|
|
51
51
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_open_path_flags_mode_callback|fsLib.open}.
|
|
52
52
|
*/
|
|
53
|
-
open: util_1.promisify(fsLib.open),
|
|
53
|
+
open: (0, util_1.promisify)(fsLib.open),
|
|
54
54
|
/**
|
|
55
55
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_unlink_path_callback|fsLib.unlink}.
|
|
56
56
|
*/
|
|
57
|
-
unlink: util_1.promisify(fsLib.unlink),
|
|
57
|
+
unlink: (0, util_1.promisify)(fsLib.unlink),
|
|
58
58
|
/**
|
|
59
59
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_readdir_path_options_callback|fsLib.rmdir}.
|
|
60
60
|
*/
|
|
61
|
-
rmdir: util_1.promisify(fsLib.rmdir),
|
|
61
|
+
rmdir: (0, util_1.promisify)(fsLib.rmdir),
|
|
62
62
|
/**
|
|
63
63
|
* Promisified version of {@link https://nodejs.org/api/fsLib.html#fs_fs_fstat_fd_callback|fsLib.stat}.
|
|
64
64
|
*/
|
|
65
|
-
stat: util_1.promisify(fsLib.stat),
|
|
65
|
+
stat: (0, util_1.promisify)(fsLib.stat),
|
|
66
66
|
/**
|
|
67
67
|
* Promisified version of {@link https://npmjs.com/package/mkdirp|mkdirp}.
|
|
68
68
|
*/
|
|
@@ -183,7 +183,7 @@ exports.fs = Object.assign({}, fsLib, {
|
|
|
183
183
|
*/
|
|
184
184
|
readJson: async (jsonPath, throwOnEmpty) => {
|
|
185
185
|
const fileData = await exports.fs.readFile(jsonPath, 'utf8');
|
|
186
|
-
return kit_1.parseJson(fileData, jsonPath, throwOnEmpty);
|
|
186
|
+
return (0, kit_1.parseJson)(fileData, jsonPath, throwOnEmpty);
|
|
187
187
|
},
|
|
188
188
|
/**
|
|
189
189
|
* Read a file and convert it to JSON. Returns the contents of the file as a JSON object
|
|
@@ -193,7 +193,7 @@ exports.fs = Object.assign({}, fsLib, {
|
|
|
193
193
|
*/
|
|
194
194
|
readJsonSync: (jsonPath, throwOnEmpty) => {
|
|
195
195
|
const fileData = exports.fs.readFileSync(jsonPath, 'utf8');
|
|
196
|
-
return kit_1.parseJson(fileData, jsonPath, throwOnEmpty);
|
|
196
|
+
return (0, kit_1.parseJson)(fileData, jsonPath, throwOnEmpty);
|
|
197
197
|
},
|
|
198
198
|
/**
|
|
199
199
|
* Read a file and convert it to JSON, throwing an error if the parsed contents are not a `JsonMap`.
|
|
@@ -203,7 +203,7 @@ exports.fs = Object.assign({}, fsLib, {
|
|
|
203
203
|
*/
|
|
204
204
|
readJsonMap: async (jsonPath, throwOnEmpty) => {
|
|
205
205
|
const fileData = await exports.fs.readFile(jsonPath, 'utf8');
|
|
206
|
-
return kit_1.parseJsonMap(fileData, jsonPath, throwOnEmpty);
|
|
206
|
+
return (0, kit_1.parseJsonMap)(fileData, jsonPath, throwOnEmpty);
|
|
207
207
|
},
|
|
208
208
|
/**
|
|
209
209
|
* Read a file and convert it to JSON, throwing an error if the parsed contents are not a `JsonMap`.
|
|
@@ -213,7 +213,7 @@ exports.fs = Object.assign({}, fsLib, {
|
|
|
213
213
|
*/
|
|
214
214
|
readJsonMapSync: (jsonPath, throwOnEmpty) => {
|
|
215
215
|
const fileData = exports.fs.readFileSync(jsonPath, 'utf8');
|
|
216
|
-
return kit_1.parseJsonMap(fileData, jsonPath, throwOnEmpty);
|
|
216
|
+
return (0, kit_1.parseJsonMap)(fileData, jsonPath, throwOnEmpty);
|
|
217
217
|
},
|
|
218
218
|
/**
|
|
219
219
|
* Convert a JSON-compatible object to a `string` and write it to a file.
|
package/lib/util/sfdc.js
CHANGED
|
@@ -63,15 +63,15 @@ exports.sfdc = {
|
|
|
63
63
|
*/
|
|
64
64
|
findUpperCaseKeys: (data, sectionBlocklist = []) => {
|
|
65
65
|
let key;
|
|
66
|
-
kit_1.findKey(data, (val, k) => {
|
|
66
|
+
(0, kit_1.findKey)(data, (val, k) => {
|
|
67
67
|
if (k.substr(0, 1) === k.substr(0, 1).toUpperCase()) {
|
|
68
68
|
key = k;
|
|
69
69
|
}
|
|
70
|
-
else if (ts_types_1.isJsonMap(val)) {
|
|
70
|
+
else if ((0, ts_types_1.isJsonMap)(val)) {
|
|
71
71
|
if (sectionBlocklist.includes(k)) {
|
|
72
72
|
return key;
|
|
73
73
|
}
|
|
74
|
-
key = exports.sfdc.findUpperCaseKeys(ts_types_1.asJsonMap(val));
|
|
74
|
+
key = exports.sfdc.findUpperCaseKeys((0, ts_types_1.asJsonMap)(val));
|
|
75
75
|
}
|
|
76
76
|
return key;
|
|
77
77
|
});
|
package/lib/util/sfdcUrl.js
CHANGED
|
@@ -111,7 +111,7 @@ class SfdcUrl extends url_1.URL {
|
|
|
111
111
|
return this.origin.replace('.my.salesforce.mil', '.lightning.crmforce.mil');
|
|
112
112
|
}
|
|
113
113
|
// all non-mil domains
|
|
114
|
-
return `https://${ts_types_1.ensureArray(/https?:\/\/([^.]*)/.exec(this.origin))
|
|
114
|
+
return `https://${(0, ts_types_1.ensureArray)(/https?:\/\/([^.]*)/.exec(this.origin))
|
|
115
115
|
.slice(1, 2)
|
|
116
116
|
.pop()}.lightning.force.com`;
|
|
117
117
|
}
|
|
@@ -124,7 +124,7 @@ class SfdcUrl extends url_1.URL {
|
|
|
124
124
|
* @throws {@link SfdxError} If can't resolve DNS.
|
|
125
125
|
*/
|
|
126
126
|
async checkLightningDomain() {
|
|
127
|
-
const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
|
|
127
|
+
const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
|
|
128
128
|
const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
|
|
129
129
|
if (this.isInternalUrl() || timeout.seconds === 0) {
|
|
130
130
|
return true;
|
|
@@ -145,7 +145,7 @@ class SfdcUrl extends url_1.URL {
|
|
|
145
145
|
* @throws {@link SfdxError} If can't resolve DNS.
|
|
146
146
|
*/
|
|
147
147
|
async lookup() {
|
|
148
|
-
const quantity = ts_types_1.ensureNumber(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
|
|
148
|
+
const quantity = (0, ts_types_1.ensureNumber)(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240));
|
|
149
149
|
const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
|
|
150
150
|
const resolver = await myDomainResolver_1.MyDomainResolver.create({
|
|
151
151
|
url: new url_1.URL(this.origin),
|
package/lib/webOAuthServer.js
CHANGED
|
@@ -146,11 +146,11 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
|
|
|
146
146
|
this.logger.debug('Starting web auth flow');
|
|
147
147
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
148
148
|
this.webServer.server.on('request', async (request, response) => {
|
|
149
|
-
const url = url_1.parse(request.url);
|
|
149
|
+
const url = (0, url_1.parse)(request.url);
|
|
150
150
|
this.logger.debug(`processing request for uri: ${url.pathname}`);
|
|
151
151
|
if (request.method === 'GET') {
|
|
152
152
|
if (url.pathname && url.pathname.startsWith('/OauthRedirect')) {
|
|
153
|
-
request.query = querystring_1.parse(url.query);
|
|
153
|
+
request.query = (0, querystring_1.parse)(url.query);
|
|
154
154
|
if (request.query.error) {
|
|
155
155
|
const err = new sfdxError_1.SfdxError(request.query.error_description || request.query.error, request.query.error);
|
|
156
156
|
this.webServer.reportError(err, response);
|
|
@@ -158,7 +158,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
|
|
|
158
158
|
}
|
|
159
159
|
this.logger.debug(`request.query.state: ${request.query.state}`);
|
|
160
160
|
try {
|
|
161
|
-
this.oauthConfig.authCode = ts_types_1.asString(this.parseAuthCodeFromRequest(response, request));
|
|
161
|
+
this.oauthConfig.authCode = (0, ts_types_1.asString)(this.parseAuthCodeFromRequest(response, request));
|
|
162
162
|
resolve(response);
|
|
163
163
|
}
|
|
164
164
|
catch (err) {
|
|
@@ -194,9 +194,9 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
|
|
|
194
194
|
this.webServer.sendError(400, `${error.message}\n`, response);
|
|
195
195
|
this.closeRequest(request);
|
|
196
196
|
this.logger.warn('urlStateMismatchAttempt detected.');
|
|
197
|
-
if (!ts_types_1.get(this.webServer.server, 'urlStateMismatchAttempt')) {
|
|
197
|
+
if (!(0, ts_types_1.get)(this.webServer.server, 'urlStateMismatchAttempt')) {
|
|
198
198
|
this.logger.error(error.message);
|
|
199
|
-
kit_1.set(this.webServer.server, 'urlStateMismatchAttempt', true);
|
|
199
|
+
(0, kit_1.set)(this.webServer.server, 'urlStateMismatchAttempt', true);
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
202
|
else {
|
|
@@ -233,7 +233,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
|
|
|
233
233
|
*/
|
|
234
234
|
validateState(request) {
|
|
235
235
|
const state = request.query.state;
|
|
236
|
-
const query = url_1.parse(this.authUrl, true).query;
|
|
236
|
+
const query = (0, url_1.parse)(this.authUrl, true).query;
|
|
237
237
|
return !!(state && state === query.state);
|
|
238
238
|
}
|
|
239
239
|
}
|
|
@@ -372,7 +372,7 @@ class WebServer extends kit_1.AsyncCreatable {
|
|
|
372
372
|
*/
|
|
373
373
|
getSocketTimeout() {
|
|
374
374
|
const env = new kit_1.Env();
|
|
375
|
-
const socketTimeout = kit_1.toNumber(env.getNumber('SFDX_HTTP_SOCKET_TIMEOUT'));
|
|
375
|
+
const socketTimeout = (0, kit_1.toNumber)(env.getNumber('SFDX_HTTP_SOCKET_TIMEOUT'));
|
|
376
376
|
return Number.isInteger(socketTimeout) && socketTimeout > 0
|
|
377
377
|
? socketTimeout
|
|
378
378
|
: WebServer.DEFAULT_CLIENT_SOCKET_TIMEOUT;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/core",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.4",
|
|
4
4
|
"description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
|
|
5
5
|
"main": "lib/exported",
|
|
6
6
|
"types": "lib/exported.d.ts",
|
|
@@ -35,55 +35,54 @@
|
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@salesforce/bunyan": "^2.0.0",
|
|
38
|
-
"@salesforce/kit": "^1.5.
|
|
39
|
-
"@salesforce/schemas": "^1.0
|
|
38
|
+
"@salesforce/kit": "^1.5.28",
|
|
39
|
+
"@salesforce/schemas": "^1.1.0",
|
|
40
40
|
"@salesforce/ts-types": "^1.5.20",
|
|
41
41
|
"@types/graceful-fs": "^4.1.5",
|
|
42
|
-
"@types/
|
|
43
|
-
"@types/mkdirp": "^1.0.1",
|
|
42
|
+
"@types/mkdirp": "^1.0.2",
|
|
44
43
|
"@types/semver": "^7.3.9",
|
|
45
44
|
"change-case": "^4.1.2",
|
|
46
|
-
"debug": "^3.
|
|
45
|
+
"debug": "^3.2.7",
|
|
47
46
|
"faye": "^1.4.0",
|
|
48
47
|
"form-data": "^4.0.0",
|
|
49
|
-
"graceful-fs": "^4.2.
|
|
48
|
+
"graceful-fs": "^4.2.9",
|
|
50
49
|
"jsen": "0.6.6",
|
|
51
50
|
"jsforce": "2.0.0-beta.7",
|
|
52
|
-
"jsonwebtoken": "8.5.
|
|
51
|
+
"jsonwebtoken": "8.5.1",
|
|
53
52
|
"mkdirp": "1.0.4",
|
|
54
53
|
"ts-retry-promise": "^0.6.0"
|
|
55
54
|
},
|
|
56
55
|
"devDependencies": {
|
|
57
|
-
"@salesforce/dev-config": "^
|
|
58
|
-
"@salesforce/dev-scripts": "^
|
|
56
|
+
"@salesforce/dev-config": "^3.0.0",
|
|
57
|
+
"@salesforce/dev-scripts": "^2.0.0",
|
|
59
58
|
"@salesforce/prettier-config": "^0.0.2",
|
|
60
|
-
"@salesforce/ts-sinon": "^1.3.
|
|
61
|
-
"@types/debug": "0.0.
|
|
62
|
-
"@types/jsen": "0.0.
|
|
63
|
-
"@types/jsonwebtoken": "8.
|
|
64
|
-
"@types/shelljs": "0.
|
|
65
|
-
"@typescript-eslint/eslint-plugin": "^4.
|
|
66
|
-
"@typescript-eslint/parser": "4.
|
|
67
|
-
"chai": "^4.
|
|
68
|
-
"commitizen": "^3.
|
|
59
|
+
"@salesforce/ts-sinon": "^1.3.21",
|
|
60
|
+
"@types/debug": "0.0.31",
|
|
61
|
+
"@types/jsen": "0.0.21",
|
|
62
|
+
"@types/jsonwebtoken": "8.5.7",
|
|
63
|
+
"@types/shelljs": "0.8.11",
|
|
64
|
+
"@typescript-eslint/eslint-plugin": "^4.33.0",
|
|
65
|
+
"@typescript-eslint/parser": "4.33.0",
|
|
66
|
+
"chai": "^4.3.4",
|
|
67
|
+
"commitizen": "^3.1.2",
|
|
69
68
|
"eslint": "^6.8.0",
|
|
70
|
-
"eslint-config-prettier": "^6.
|
|
69
|
+
"eslint-config-prettier": "^6.15.0",
|
|
71
70
|
"eslint-config-salesforce": "^0.1.6",
|
|
72
71
|
"eslint-config-salesforce-license": "^0.1.6",
|
|
73
|
-
"eslint-config-salesforce-typescript": "^0.2.
|
|
74
|
-
"eslint-plugin-header": "^3.
|
|
75
|
-
"eslint-plugin-import": "^2.
|
|
76
|
-
"eslint-plugin-jsdoc": "^27.
|
|
72
|
+
"eslint-config-salesforce-typescript": "^0.2.8",
|
|
73
|
+
"eslint-plugin-header": "^3.1.1",
|
|
74
|
+
"eslint-plugin-import": "^2.25.4",
|
|
75
|
+
"eslint-plugin-jsdoc": "^27.1.2",
|
|
77
76
|
"eslint-plugin-prettier": "^3.1.3",
|
|
78
77
|
"husky": "^7.0.4",
|
|
79
|
-
"mocha": "^
|
|
78
|
+
"mocha": "^9.1.3",
|
|
80
79
|
"nyc": "^15.1.0",
|
|
81
|
-
"prettier": "^2.
|
|
82
|
-
"pretty-quick": "^3.1.
|
|
83
|
-
"shelljs": "0.8.
|
|
80
|
+
"prettier": "^2.5.1",
|
|
81
|
+
"pretty-quick": "^3.1.3",
|
|
82
|
+
"shelljs": "0.8.5",
|
|
84
83
|
"sinon": "10.0.0",
|
|
85
|
-
"ts-node": "^10.
|
|
86
|
-
"typescript": "
|
|
84
|
+
"ts-node": "^10.4.0",
|
|
85
|
+
"typescript": "4.4.4"
|
|
87
86
|
},
|
|
88
87
|
"repository": {
|
|
89
88
|
"type": "git",
|