@salesforce/core 4.0.0 → 4.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.
Files changed (153) hide show
  1. package/LICENSE.txt +1 -1
  2. package/README.md +93 -44
  3. package/lib/config/aliasesConfig.d.ts +12 -0
  4. package/lib/config/aliasesConfig.js +28 -0
  5. package/lib/config/authInfoConfig.d.ts +19 -0
  6. package/lib/config/authInfoConfig.js +35 -0
  7. package/lib/config/config.d.ts +87 -22
  8. package/lib/config/config.js +117 -65
  9. package/lib/config/configAggregator.d.ts +41 -35
  10. package/lib/config/configAggregator.js +102 -73
  11. package/lib/config/configFile.d.ts +2 -2
  12. package/lib/config/configFile.js +38 -29
  13. package/lib/config/configGroup.d.ts +141 -0
  14. package/lib/config/configGroup.js +225 -0
  15. package/lib/config/configStore.d.ts +9 -9
  16. package/lib/config/configStore.js +17 -15
  17. package/lib/config/envVars.d.ts +15 -9
  18. package/lib/config/envVars.js +71 -47
  19. package/lib/config/orgUsersConfig.js +2 -0
  20. package/lib/config/sandboxOrgConfig.js +2 -0
  21. package/lib/config/sandboxProcessCache.d.ts +16 -0
  22. package/lib/config/sandboxProcessCache.js +38 -0
  23. package/lib/config/tokensConfig.d.ts +10 -0
  24. package/lib/config/tokensConfig.js +29 -0
  25. package/lib/config/ttlConfig.d.ts +34 -0
  26. package/lib/config/ttlConfig.js +50 -0
  27. package/lib/crypto/crypto.js +15 -22
  28. package/lib/crypto/keyChain.js +2 -3
  29. package/lib/crypto/keyChainImpl.d.ts +5 -3
  30. package/lib/crypto/keyChainImpl.js +58 -61
  31. package/lib/crypto/secureBuffer.d.ts +1 -1
  32. package/lib/deviceOauthService.d.ts +3 -3
  33. package/lib/deviceOauthService.js +27 -25
  34. package/lib/exported.d.ts +15 -12
  35. package/lib/exported.js +28 -16
  36. package/lib/global.d.ts +11 -3
  37. package/lib/global.js +39 -12
  38. package/lib/lifecycleEvents.d.ts +1 -1
  39. package/lib/lifecycleEvents.js +3 -0
  40. package/lib/logger.d.ts +19 -9
  41. package/lib/logger.js +112 -86
  42. package/lib/messages.d.ts +53 -36
  43. package/lib/messages.js +81 -91
  44. package/lib/org/authInfo.d.ts +56 -20
  45. package/lib/org/authInfo.js +232 -131
  46. package/lib/org/authRemover.d.ts +8 -7
  47. package/lib/org/authRemover.js +32 -28
  48. package/lib/org/connection.d.ts +13 -37
  49. package/lib/org/connection.js +78 -124
  50. package/lib/org/index.js +5 -1
  51. package/lib/org/org.d.ts +151 -48
  52. package/lib/org/org.js +466 -220
  53. package/lib/org/orgConfigProperties.d.ts +64 -3
  54. package/lib/org/orgConfigProperties.js +96 -4
  55. package/lib/org/permissionSetAssignment.js +4 -13
  56. package/lib/org/scratchOrgCache.d.ts +20 -0
  57. package/lib/org/scratchOrgCache.js +33 -0
  58. package/lib/org/scratchOrgCreate.d.ts +28 -17
  59. package/lib/org/scratchOrgCreate.js +125 -53
  60. package/lib/org/scratchOrgErrorCodes.d.ts +9 -3
  61. package/lib/org/scratchOrgErrorCodes.js +34 -17
  62. package/lib/org/scratchOrgFeatureDeprecation.js +1 -6
  63. package/lib/org/scratchOrgInfoApi.d.ts +21 -47
  64. package/lib/org/scratchOrgInfoApi.js +129 -63
  65. package/lib/org/scratchOrgInfoGenerator.d.ts +6 -5
  66. package/lib/org/scratchOrgInfoGenerator.js +76 -62
  67. package/lib/org/scratchOrgLifecycleEvents.d.ts +10 -0
  68. package/lib/org/scratchOrgLifecycleEvents.js +41 -0
  69. package/lib/org/scratchOrgSettingsGenerator.d.ts +44 -21
  70. package/lib/org/scratchOrgSettingsGenerator.js +165 -98
  71. package/lib/org/scratchOrgTypes.d.ts +43 -0
  72. package/lib/org/scratchOrgTypes.js +9 -0
  73. package/lib/org/user.d.ts +1 -1
  74. package/lib/org/user.js +25 -34
  75. package/lib/schema/printer.d.ts +6 -0
  76. package/lib/schema/printer.js +34 -31
  77. package/lib/schema/validator.d.ts +12 -10
  78. package/lib/schema/validator.js +56 -76
  79. package/lib/{sfdxError.d.ts → sfError.d.ts} +12 -20
  80. package/lib/{sfdxError.js → sfError.js} +40 -30
  81. package/lib/{sfdxProject.d.ts → sfProject.d.ts} +75 -35
  82. package/lib/sfProject.js +651 -0
  83. package/lib/{globalInfo → stateAggregator}/accessors/aliasAccessor.d.ts +27 -12
  84. package/lib/{globalInfo → stateAggregator}/accessors/aliasAccessor.js +47 -31
  85. package/lib/stateAggregator/accessors/orgAccessor.d.ts +101 -0
  86. package/lib/stateAggregator/accessors/orgAccessor.js +240 -0
  87. package/lib/stateAggregator/accessors/sandboxAccessor.d.ts +8 -0
  88. package/lib/stateAggregator/accessors/sandboxAccessor.js +28 -0
  89. package/lib/stateAggregator/accessors/tokenAccessor.d.ts +63 -0
  90. package/lib/stateAggregator/accessors/tokenAccessor.js +80 -0
  91. package/lib/stateAggregator/index.d.ts +4 -0
  92. package/lib/stateAggregator/index.js +27 -0
  93. package/lib/stateAggregator/stateAggregator.d.ts +25 -0
  94. package/lib/stateAggregator/stateAggregator.js +46 -0
  95. package/lib/status/myDomainResolver.d.ts +1 -1
  96. package/lib/status/myDomainResolver.js +4 -4
  97. package/lib/status/pollingClient.js +4 -4
  98. package/lib/status/streamingClient.d.ts +2 -2
  99. package/lib/status/streamingClient.js +58 -63
  100. package/lib/status/types.d.ts +2 -2
  101. package/lib/testSetup.d.ts +206 -75
  102. package/lib/testSetup.js +463 -165
  103. package/lib/util/cache.d.ts +2 -2
  104. package/lib/util/cache.js +6 -6
  105. package/lib/util/checkLightningDomain.js +3 -4
  106. package/lib/util/directoryWriter.d.ts +12 -0
  107. package/lib/util/directoryWriter.js +54 -0
  108. package/lib/util/getJwtAudienceUrl.js +1 -1
  109. package/lib/util/internal.d.ts +28 -2
  110. package/lib/util/internal.js +65 -8
  111. package/lib/util/jsonXmlTools.js +2 -4
  112. package/lib/util/mapKeys.d.ts +9 -9
  113. package/lib/util/mapKeys.js +13 -9
  114. package/lib/util/sfdc.d.ts +51 -51
  115. package/lib/util/sfdc.js +74 -79
  116. package/lib/util/sfdcUrl.d.ts +5 -19
  117. package/lib/util/sfdcUrl.js +40 -49
  118. package/lib/util/structuredWriter.d.ts +9 -0
  119. package/lib/util/structuredWriter.js +3 -0
  120. package/lib/util/zipWriter.d.ts +8 -6
  121. package/lib/util/zipWriter.js +13 -13
  122. package/lib/webOAuthServer.d.ts +20 -6
  123. package/lib/webOAuthServer.js +102 -56
  124. package/messageTransformer/messageTransformer.ts +93 -0
  125. package/messages/auth.md +9 -1
  126. package/messages/config.md +42 -6
  127. package/messages/connection.md +8 -0
  128. package/messages/core.md +10 -0
  129. package/messages/envVars.md +37 -3
  130. package/messages/org.md +21 -1
  131. package/messages/scratchOrgCreate.md +2 -6
  132. package/messages/scratchOrgErrorCodes.md +17 -1
  133. package/messages/scratchOrgInfoApi.md +9 -0
  134. package/messages/scratchOrgInfoGenerator.md +9 -1
  135. package/package.json +121 -46
  136. package/CHANGELOG.md +0 -1244
  137. package/lib/config/keychainConfig.d.ts +0 -19
  138. package/lib/config/keychainConfig.js +0 -43
  139. package/lib/globalInfo/accessors/orgAccessor.d.ts +0 -13
  140. package/lib/globalInfo/accessors/orgAccessor.js +0 -45
  141. package/lib/globalInfo/accessors/tokenAccessor.d.ts +0 -13
  142. package/lib/globalInfo/accessors/tokenAccessor.js +0 -35
  143. package/lib/globalInfo/globalInfoConfig.d.ts +0 -36
  144. package/lib/globalInfo/globalInfoConfig.js +0 -105
  145. package/lib/globalInfo/index.d.ts +0 -6
  146. package/lib/globalInfo/index.js +0 -29
  147. package/lib/globalInfo/sfdxDataHandler.d.ts +0 -43
  148. package/lib/globalInfo/sfdxDataHandler.js +0 -217
  149. package/lib/globalInfo/types.d.ts +0 -39
  150. package/lib/globalInfo/types.js +0 -10
  151. package/lib/sfdxProject.js +0 -557
  152. package/lib/util/fs.d.ts +0 -201
  153. package/lib/util/fs.js +0 -378
package/lib/webOAuthServer.js CHANGED
@@ -5,29 +5,24 @@
5
5
  * Licensed under the BSD 3-Clause license.
6
6
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
7
7
  */
8
+ /* eslint-disable class-methods-use-this */
9
+ /* eslint-disable @typescript-eslint/no-unsafe-member-access */
8
10
  Object.defineProperty(exports, "__esModule", { value: true });
9
11
  exports.WebServer = exports.WebOAuthServer = void 0;
10
12
  const http = require("http");
11
13
  const querystring_1 = require("querystring");
12
14
  const url_1 = require("url");
13
15
  const net_1 = require("net");
16
+ const events_1 = require("events");
17
+ const jsforce_1 = require("jsforce");
14
18
  const kit_1 = require("@salesforce/kit");
15
19
  const ts_types_1 = require("@salesforce/ts-types");
16
- const jsforce_1 = require("jsforce");
17
20
  const logger_1 = require("./logger");
18
- const authInfo_1 = require("./org/authInfo");
19
- const sfdxError_1 = require("./sfdxError");
21
+ const org_1 = require("./org");
22
+ const sfError_1 = require("./sfError");
20
23
  const messages_1 = require("./messages");
21
- const sfdxProject_1 = require("./sfdxProject");
22
- messages_1.Messages.importMessagesDirectory(__dirname);
23
- const messages = messages_1.Messages.load('@salesforce/core', 'auth', [
24
- 'invalidRequestUri',
25
- 'invalidRequestMethod',
26
- 'missingAuthCode',
27
- 'serverErrorHTMLResponse',
28
- 'portInUse',
29
- 'portInUse.actions',
30
- ]);
24
+ const sfProject_1 = require("./sfProject");
25
+ const messages = new messages_1.Messages('@salesforce/core', 'auth', new Map([["targetOrgNotSet", "A default user is not set."], ["targetOrgNotSet.actions", ["Run the \"sfdx auth\" commands with --setdefaultusername to connect to an org and set it as your default org.", "Run \"force:org:create\" with --setdefaultusername to create a scratch org and set it as your default org.", "Run \"sfdx config:set defaultusername=<username>\" to set your default username."]], ["portInUse", "Cannot start the OAuth redirect server on port %s."], ["portInUse.actions", ["Kill the process running on port %s or use a custom connected app and update OauthLocalPort in the sfdx-project.json file."]], ["invalidRequestMethod", "Invalid request method: %s"], ["invalidRequestUri", "Invalid request uri: %s"], ["pollingTimeout", "The device authorization request timed out. After executing force:auth:device:login, you must approve access to the device within 10 minutes. This can happen if the URL wasn\u2019t copied into the browser, login was not attempted, or the 2FA process was not completed within 10 minutes. Request authorization again."], ["serverErrorHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 370px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 370px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">%s</div><div id=\"message\">%s<br/><br/>This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["missingAuthCode", "No authentication code found on login response."], ["serverSuccessHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 300px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 300px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">Authentication Successful</div><div id=\"message\">You've successfully logged in. You can now close this browser tab or window.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["serverSfdcImage", "<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 262 184" style="enable-background:new 0 0 262 184;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#00A1E0;}
	.st1{fill:#FFFFFF;}
</style>
<title>logo-salesforce</title>
<desc>Created with Sketch.</desc>
<g id="Test-B">
	<g id="Mobile-Nav---Test-B-_x28_0_x29_">
		<g id="Group">
			<g id="logo-salesforce">
				<path id="Fill-1" class="st0" d="M109.2,20.9c8.4-8.7,20.1-14.2,33-14.2c17.2,0,32.1,9.6,40.1,23.8c6.9-3.1,14.6-4.8,22.7-4.8
					c31,0,56,25.3,56,56.5s-25.1,56.5-56,56.5c-3.8,0-7.5-0.4-11-1.1c-7,12.5-20.4,21-35.8,21c-6.4,0-12.5-1.5-17.9-4.1
					c-7.1,16.7-23.7,28.5-43,28.5c-20.1,0-37.3-12.7-43.9-30.6c-2.9,0.6-5.9,0.9-8.9,0.9c-24,0-43.4-19.6-43.4-43.9
					c0-16.2,8.7-30.4,21.7-38c-2.7-6.1-4.2-12.9-4.2-20.1C18.5,23.6,41.2,1,69,1C85.4,1,100,8.8,109.2,20.9"/>
				<path id="Combined-Shape" class="st1" d="M38.7,95.4l1.1-2.9c0.2-0.5,0.5-0.3,0.7-0.2c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2
					c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0
					c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7
					c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4
					c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9C38.7,95.9,38.5,95.8,38.7,95.4z M116.7,95.4l1.1-2.9c0.2-0.5,0.6-0.3,0.7-0.2
					c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9
					v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9
					c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1
					c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9
					C116.8,95.9,116.6,95.8,116.7,95.4z M174.5,81.7c0.4,1.5,0.7,3.1,0.7,4.8s-0.2,3.3-0.7,4.8c-0.4,1.5-1.1,2.8-2,3.9
					c-0.9,1.1-2.1,2-3.4,2.6c-1.4,0.6-3,0.9-4.8,0.9c-1.8,0-3.4-0.3-4.8-0.9c-1.4-0.6-2.5-1.5-3.4-2.6c-0.9-1.1-1.6-2.4-2-3.9
					c-0.4-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.4-2.6c1.4-0.6,3-1,4.8-1
					c1.8,0,3.4,0.3,4.8,1c1.4,0.6,2.5,1.5,3.4,2.6C173.4,78.9,174.1,80.2,174.5,81.7z M170,86.4c0-2.6-0.5-4.6-1.4-6
					c-0.9-1.4-2.4-2.1-4.3-2.1c-2,0-3.4,0.7-4.3,2.1c-0.9,1.4-1.4,3.4-1.4,6c0,2.6,0.5,4.6,1.4,6.1c0.9,1.4,2.3,2.1,4.3,2.1
					c2,0,3.4-0.7,4.3-2.1C169.6,91.1,170,89,170,86.4z M211.1,93.9l1.1,3c0.1,0.4-0.2,0.5-0.2,0.5c-1.7,0.7-4,1.1-6.3,1.1
					c-3.9,0-6.8-1.1-8.8-3.3c-2-2.2-3-5.2-3-8.9c0-1.7,0.2-3.3,0.7-4.8c0.5-1.5,1.2-2.8,2.2-3.9c1-1.1,2.2-2,3.6-2.6
					c1.4-0.6,3.1-1,5-1c1.3,0,2.4,0.1,3.3,0.2c1,0.2,2.4,0.5,3,0.8c0.1,0,0.4,0.2,0.3,0.5c-0.4,1.2-0.7,2-1.1,3
					c-0.2,0.5-0.5,0.3-0.5,0.3c-1.5-0.5-2.9-0.7-4.7-0.7c-2.2,0-3.9,0.7-4.9,2.2c-1.1,1.4-1.7,3.3-1.7,5.9c0,2.8,0.7,4.8,1.9,6.1
					c1.2,1.3,2.9,1.9,5.1,1.9c0.9,0,1.7-0.1,2.4-0.2c0.7-0.1,1.4-0.3,2.1-0.6C210.5,93.6,210.9,93.5,211.1,93.9z M233.8,80.8
					c1,3.4,0.5,6.3,0.4,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C232.5,77.9,233.4,79.4,233.8,80.8z M218.8,84h10.7
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C219.4,81.3,219.1,82.5,218.8,84z M113.1,80.8
					c1,3.4,0.5,6.3,0.5,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C111.8,77.9,112.8,79.4,113.1,80.8z M98.1,84h10.8
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C98.7,81.3,98.4,82.5,98.1,84z M71.6,83.2
					c0,0,1.2,0.1,2.5,0.3v-0.6c0-2-0.4-3-1.2-3.6c-0.8-0.6-2.1-1-3.7-1c0,0-3.7,0-6.6,1.5c-0.1,0.1-0.2,0.1-0.2,0.1
					s-0.4,0.1-0.5-0.2l-1.1-2.9c-0.2-0.4,0.1-0.6,0.1-0.6c1.4-1.1,4.6-1.7,4.6-1.7c1.1-0.2,2.9-0.4,4-0.4c3,0,5.3,0.7,6.9,2.1
					c1.6,1.4,2.4,3.6,2.4,6.7l0,13.8c0,0,0,0.4-0.3,0.5c0,0-0.6,0.2-1.1,0.3c-0.5,0.1-2.3,0.5-3.8,0.7c-1.5,0.3-3,0.4-4.6,0.4
					c-1.5,0-2.8-0.1-4-0.4c-1.2-0.3-2.2-0.7-3.1-1.3c-0.8-0.6-1.5-1.4-2-2.4c-0.5-0.9-0.7-2.1-0.7-3.4c0-1.3,0.3-2.5,0.8-3.5
					c0.5-1,1.3-1.8,2.2-2.5c0.9-0.7,2-1.1,3.1-1.5c1.2-0.3,2.4-0.5,3.7-0.5C70.2,83.2,71,83.2,71.6,83.2z M65.6,93.8
					c0,0,1.4,1.1,4.4,0.9c2.2-0.1,4.1-0.5,4.1-0.5v-6.9c0,0-1.9-0.3-4.1-0.3c-3.1,0-4.4,1.1-4.4,1.1c-0.9,0.6-1.3,1.6-1.3,2.9
					c0,0.8,0.2,1.5,0.5,2C64.9,93.2,65,93.4,65.6,93.8z M193.1,75.5c-0.1,0.4-0.9,2.5-1.1,3.2c-0.1,0.3-0.3,0.4-0.6,0.4
					c0,0-0.9-0.2-1.7-0.2c-0.5,0-1.3,0.1-2,0.3c-0.7,0.2-1.3,0.6-1.9,1.1c-0.6,0.5-1,1.3-1.3,2.2c-0.3,0.9-0.5,2.4-0.5,4v11.2
					c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5V75.2c0-0.3,0.2-0.5,0.4-0.5h3.9c0.3,0,0.4,0.2,0.4,0.5V77
					c0.6-0.8,1.6-1.5,2.5-1.9c0.9-0.4,2-0.7,3.9-0.6c1,0.1,2.3,0.3,2.5,0.4C193,75,193.2,75.1,193.1,75.5z M156,65.1
					c0.1,0,0.4,0.2,0.3,0.5l-1.2,3.2c-0.1,0.2-0.2,0.4-0.7,0.2c-0.1,0-0.3-0.1-0.8-0.2c-0.3-0.1-0.8-0.1-1.2-0.1
					c-0.6,0-1.1,0.1-1.6,0.2c-0.5,0.1-0.9,0.4-1.3,0.8c-0.4,0.4-0.8,0.9-1.1,1.6c-0.6,1.6-0.8,3.3-0.8,3.4h4.8
					c0.4,0,0.5,0.2,0.5,0.5l-0.6,3.1c-0.1,0.5-0.5,0.4-0.5,0.4h-5L143.6,98c-0.4,2-0.8,3.7-1.3,5.1c-0.5,1.4-1.1,2.4-2,3.4
					c-0.8,0.9-1.7,1.6-2.8,1.9c-1,0.4-2.3,0.6-3.7,0.6c-0.7,0-1.4,0-2.2-0.2c-0.6-0.1-0.9-0.2-1.4-0.4c-0.2-0.1-0.3-0.3-0.2-0.6
					c0.1-0.3,1-2.7,1.1-3.1c0.2-0.4,0.5-0.2,0.5-0.2c0.3,0.1,0.5,0.2,0.8,0.3c0.4,0.1,0.8,0.1,1.2,0.1c0.7,0,1.3-0.1,1.8-0.3
					c0.6-0.2,1-0.6,1.4-1.1c0.4-0.5,0.7-1.2,1.1-2.1c0.3-0.9,0.6-2.2,0.9-3.7l3.4-18.9h-3.3c-0.4,0-0.5-0.2-0.5-0.5l0.6-3.1
					c0.1-0.5,0.5-0.4,0.5-0.4h3.4l0.2-1c0.5-3,1.5-5.3,3-6.8c1.5-1.5,3.7-2.3,6.4-2.3c0.8,0,1.5,0.1,2.1,0.2
					C155,64.8,155.5,64.9,156,65.1z M88.6,97.6c0,0.3-0.2,0.5-0.4,0.5h-4c-0.3,0-0.4-0.2-0.4-0.5V65.5c0-0.2,0.2-0.5,0.4-0.5h4
					c0.3,0,0.4,0.2,0.4,0.5V97.6z"/>
			</g>
		</g>
	</g>
</g>
</svg>
"]]));
31
26
  /**
32
27
  * Handles the creation of a web server for web based login flows.
33
28
  *
@@ -47,6 +42,7 @@ const messages = messages_1.Messages.load('@salesforce/core', 'auth', [
47
42
  class WebOAuthServer extends kit_1.AsyncCreatable {
48
43
  constructor(options) {
49
44
  super(options);
45
+ this.oauthError = new Error('Oauth Error');
50
46
  this.oauthConfig = options.oauthConfig;
51
47
  }
52
48
  /**
@@ -56,8 +52,8 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
56
52
  */
57
53
  static async determineOauthPort() {
58
54
  try {
59
- const sfdxProject = await sfdxProject_1.SfdxProjectJson.create();
60
- return sfdxProject.get('oauthLocalPort') || WebOAuthServer.DEFAULT_PORT;
55
+ const sfProject = await sfProject_1.SfProjectJson.create();
56
+ return sfProject.get('oauthLocalPort') || WebOAuthServer.DEFAULT_PORT;
61
57
  }
62
58
  catch {
63
59
  return WebOAuthServer.DEFAULT_PORT;
@@ -85,17 +81,18 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
85
81
  this.executeOauthRequest()
86
82
  .then(async (response) => {
87
83
  try {
88
- const authInfo = await authInfo_1.AuthInfo.create({
84
+ const authInfo = await org_1.AuthInfo.create({
89
85
  oauth2Options: this.oauthConfig,
90
86
  oauth2: this.oauth2,
91
87
  });
92
88
  await authInfo.save();
93
- this.webServer.doRedirect(303, authInfo.getOrgFrontDoorUrl(), response);
89
+ await this.webServer.handleSuccess(response);
94
90
  response.end();
95
91
  resolve(authInfo);
96
92
  }
97
93
  catch (err) {
98
- this.webServer.reportError(err, response);
94
+ this.oauthError = err;
95
+ await this.webServer.handleError(response);
99
96
  reject(err);
100
97
  }
101
98
  })
@@ -127,14 +124,14 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
127
124
  this.logger = await logger_1.Logger.child(this.constructor.name);
128
125
  const port = await WebOAuthServer.determineOauthPort();
129
126
  if (!this.oauthConfig.clientId)
130
- this.oauthConfig.clientId = authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId;
127
+ this.oauthConfig.clientId = org_1.DEFAULT_CONNECTED_APP_INFO.clientId;
131
128
  if (!this.oauthConfig.loginUrl)
132
- this.oauthConfig.loginUrl = authInfo_1.AuthInfo.getDefaultInstanceUrl();
129
+ this.oauthConfig.loginUrl = org_1.AuthInfo.getDefaultInstanceUrl();
133
130
  if (!this.oauthConfig.redirectUri)
134
131
  this.oauthConfig.redirectUri = `http://localhost:${port}/OauthRedirect`;
135
132
  this.webServer = await WebServer.create({ port });
136
133
  this.oauth2 = new jsforce_1.OAuth2(this.oauthConfig);
137
- this.authUrl = authInfo_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
134
+ this.authUrl = org_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
138
135
  }
139
136
  /**
140
137
  * Executes the oauth request
@@ -144,40 +141,52 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
144
141
  async executeOauthRequest() {
145
142
  return new Promise((resolve, reject) => {
146
143
  this.logger.debug('Starting web auth flow');
147
- // eslint-disable-next-line @typescript-eslint/no-misused-promises, @typescript-eslint/no-explicit-any
144
+ // - async method when sync expected
145
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
148
146
  this.webServer.server.on('request', async (request, response) => {
149
- const url = (0, url_1.parse)(request.url);
150
- this.logger.debug(`processing request for uri: ${url.pathname}`);
151
- if (request.method === 'GET') {
152
- if (url.pathname && url.pathname.startsWith('/OauthRedirect')) {
153
- request.query = (0, querystring_1.parse)(url.query);
154
- if (request.query.error) {
155
- const err = new sfdxError_1.SfdxError(request.query.error_description || request.query.error, request.query.error);
156
- this.webServer.reportError(err, response);
157
- return reject(err);
147
+ if (request.url) {
148
+ const url = (0, url_1.parse)(request.url);
149
+ this.logger.debug(`processing request for uri: ${url.pathname}`);
150
+ if (request.method === 'GET') {
151
+ if (url.pathname?.startsWith('/OauthRedirect') && url.query) {
152
+ request.query = (0, querystring_1.parse)(url.query);
153
+ if (request.query.error) {
154
+ const errorName = typeof request.query.error_description === 'string'
155
+ ? request.query.error_description
156
+ : request.query.error;
157
+ this.oauthError = new sfError_1.SfError(errorName, request.query.error);
158
+ await this.webServer.handleError(response);
159
+ return reject(this.oauthError);
160
+ }
161
+ this.logger.debug(`request.query.state: ${request.query.state}`);
162
+ try {
163
+ this.oauthConfig.authCode = (0, ts_types_1.asString)(this.parseAuthCodeFromRequest(response, request));
164
+ resolve(response);
165
+ }
166
+ catch (err) {
167
+ reject(err);
168
+ }
169
+ }
170
+ else if (url.pathname === '/OauthSuccess') {
171
+ this.webServer.reportSuccess(response);
158
172
  }
159
- this.logger.debug(`request.query.state: ${request.query.state}`);
160
- try {
161
- this.oauthConfig.authCode = (0, ts_types_1.asString)(this.parseAuthCodeFromRequest(response, request));
162
- resolve(response);
173
+ else if (url.pathname === '/OauthError') {
174
+ this.webServer.reportError(this.oauthError, response);
163
175
  }
164
- catch (err) {
165
- reject(err);
176
+ else {
177
+ this.webServer.sendError(404, 'Resource not found', response);
178
+ const errName = 'invalidRequestUri';
179
+ const errMessage = messages.getMessage(errName, [url.pathname]);
180
+ reject(new sfError_1.SfError(errMessage, errName));
166
181
  }
167
182
  }
168
183
  else {
169
- this.webServer.sendError(404, 'Resource not found', response);
170
- const errName = 'invalidRequestUri';
171
- const errMessage = messages.getMessage(errName, [url.pathname]);
172
- reject(new sfdxError_1.SfdxError(errMessage, errName));
184
+ this.webServer.sendError(405, 'Unsupported http methods', response);
185
+ const errName = 'invalidRequestMethod';
186
+ const errMessage = messages.getMessage(errName, [request.method]);
187
+ reject(new sfError_1.SfError(errMessage, errName));
173
188
  }
174
189
  }
175
- else {
176
- this.webServer.sendError(405, 'Unsupported http methods', response);
177
- const errName = 'invalidRequestMethod';
178
- const errMessage = messages.getMessage(errName, [request.method]);
179
- reject(new sfdxError_1.SfdxError(errMessage, errName));
180
- }
181
190
  });
182
191
  });
183
192
  }
@@ -190,7 +199,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
190
199
  */
191
200
  parseAuthCodeFromRequest(response, request) {
192
201
  if (!this.validateState(request)) {
193
- const error = new sfdxError_1.SfdxError('urlStateMismatch');
202
+ const error = new sfError_1.SfError('urlStateMismatch');
194
203
  this.webServer.sendError(400, `${error.message}\n`, response);
195
204
  this.closeRequest(request);
196
205
  this.logger.warn('urlStateMismatchAttempt detected.');
@@ -248,6 +257,7 @@ class WebServer extends kit_1.AsyncCreatable {
248
257
  this.port = WebOAuthServer.DEFAULT_PORT;
249
258
  this.host = 'localhost';
250
259
  this.sockets = [];
260
+ this.redirectStatus = new events_1.EventEmitter();
251
261
  if (options.port)
252
262
  this.port = options.port;
253
263
  if (options.host)
@@ -293,7 +303,7 @@ class WebServer extends kit_1.AsyncCreatable {
293
303
  /**
294
304
  * sends a response error.
295
305
  *
296
- * @param statusCode he statusCode for the response.
306
+ * @param status the statusCode for the response.
297
307
  * @param message the message for the http body.
298
308
  * @param response the response to write the error to.
299
309
  */
@@ -305,11 +315,12 @@ class WebServer extends kit_1.AsyncCreatable {
305
315
  /**
306
316
  * sends a response redirect.
307
317
  *
308
- * @param statusCode the statusCode for the response.
318
+ * @param status the statusCode for the response.
309
319
  * @param url the url to redirect to.
310
320
  * @param response the response to write the redirect to.
311
321
  */
312
322
  doRedirect(status, url, response) {
323
+ this.logger.debug(`Redirecting to ${url}`);
313
324
  response.setHeader('Content-Type', 'text/plain');
314
325
  const body = `${status} - Redirecting to ${url}`;
315
326
  response.setHeader('Content-Length', Buffer.byteLength(body));
@@ -319,18 +330,53 @@ class WebServer extends kit_1.AsyncCreatable {
319
330
  /**
320
331
  * sends a response to the browser reporting an error.
321
332
  *
322
- * @param error the error
323
- * @param response the response to write the redirect to.
333
+ * @param error the oauth error
334
+ * @param response the HTTP response.
324
335
  */
325
336
  reportError(error, response) {
326
337
  response.setHeader('Content-Type', 'text/html');
327
- const body = messages.getMessage('serverErrorHTMLResponse', [error.message]);
328
- response.setHeader('Content-Length', Buffer.byteLength(body));
338
+ const currentYear = new Date().getFullYear();
339
+ const encodedImg = messages.getMessage('serverSfdcImage');
340
+ const body = messages.getMessage('serverErrorHTMLResponse', [encodedImg, error.name, error.message, currentYear]);
341
+ response.setHeader('Content-Length', Buffer.byteLength(body, 'utf8'));
342
+ response.end(body);
343
+ if (error.stack) {
344
+ this.logger.debug(error.stack);
345
+ }
346
+ this.redirectStatus.emit('complete');
347
+ }
348
+ /**
349
+ * sends a response to the browser reporting the success.
350
+ *
351
+ * @param response the HTTP response.
352
+ */
353
+ reportSuccess(response) {
354
+ response.setHeader('Content-Type', 'text/html');
355
+ const currentYear = new Date().getFullYear();
356
+ const encodedImg = messages.getMessage('serverSfdcImage');
357
+ const body = messages.getMessage('serverSuccessHTMLResponse', [encodedImg, currentYear]);
358
+ response.setHeader('Content-Length', Buffer.byteLength(body, 'utf8'));
329
359
  response.end(body);
360
+ this.redirectStatus.emit('complete');
361
+ }
362
+ async handleSuccess(response) {
363
+ return this.handleRedirect(response, '/OauthSuccess');
364
+ }
365
+ async handleError(response) {
366
+ return this.handleRedirect(response, '/OauthError');
330
367
  }
331
368
  async init() {
332
369
  this.logger = await logger_1.Logger.child(this.constructor.name);
333
370
  }
371
+ async handleRedirect(response, url) {
372
+ return new Promise((resolve) => {
373
+ this.redirectStatus.on('complete', () => {
374
+ this.logger.debug('Redirect complete');
375
+ resolve();
376
+ });
377
+ this.doRedirect(303, url, response);
378
+ });
379
+ }
334
380
  /**
335
381
  * Make sure we can't open a socket on the localhost/host port. It's important because we don't want to send
336
382
  * auth tokens to a random strange port listener. We want to make sure we can startup our server first.
@@ -343,13 +389,13 @@ class WebServer extends kit_1.AsyncCreatable {
343
389
  const socket = new net_1.Socket();
344
390
  socket.setTimeout(this.getSocketTimeout(), () => {
345
391
  socket.destroy();
346
- const error = new sfdxError_1.SfdxError('timeout', 'SOCKET_TIMEOUT');
392
+ const error = new sfError_1.SfError('timeout', 'SOCKET_TIMEOUT');
347
393
  reject(error);
348
394
  });
349
395
  // An existing connection, means that the port is occupied
350
396
  socket.connect(clientConfig, () => {
351
397
  socket.destroy();
352
- const error = new sfdxError_1.SfdxError('Address in use', 'EADDRINUSE');
398
+ const error = new sfError_1.SfError('Address in use', 'EADDRINUSE');
353
399
  error.data = {
354
400
  port: clientConfig.port,
355
401
  address: clientConfig.host,
package/messageTransformer/messageTransformer.ts ADDED
@@ -0,0 +1,93 @@
1
+ /*
2
+ * Copyright (c) 2023, salesforce.com, inc.
3
+ * All rights reserved.
4
+ * Licensed under the BSD 3-Clause license.
5
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
6
+ */
7
+ /* eslint-disable no-console */
8
+ /* eslint-disable complexity */
9
+
10
+ import * as ts from 'typescript';
11
+ import { Messages, StoredMessageMap } from '../src/messages';
12
+
13
+ /**
14
+ *
15
+ * @experimental
16
+ * transforms `messages` references from dynamic run-time to static compile-time values
17
+ */
18
+ const transformer = (program: ts.Program, pluginOptions: {}) => {
19
+ Messages.importMessagesDirectory(process.cwd());
20
+ const transformerFactory: ts.TransformerFactory<ts.SourceFile> = (context) => {
21
+ return (sourceFile) => {
22
+ // if there are no messages, no transformation is needed
23
+ if (
24
+ !sourceFile.statements.some((i) => ts.isImportDeclaration(i) && i.importClause?.getText().includes('Messages'))
25
+ ) {
26
+ return sourceFile;
27
+ }
28
+
29
+ const visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
30
+ if (ts.isExpressionStatement(node) && node.getText().includes('importMessagesDirectory')) {
31
+ // importMessagesDirectory now happens at compile, not in runtime
32
+ // returning undefined removes the node
33
+ return undefined;
34
+ }
35
+ if (
36
+ // transform a runtime load call into hardcoded messages values
37
+ // const foo = Messages.load|loadMessages('pluginName', 'messagesFile' ...) =>
38
+ // const foo = new Messages('pluginName', 'messagesFile', new Map([['key', 'value']]))
39
+ ts.isCallExpression(node) &&
40
+ ts.isPropertyAccessExpression(node.expression) &&
41
+ node.expression.expression.getText() === 'Messages' &&
42
+ node.expression.name.getText().includes('load')
43
+ ) {
44
+ // we always want the first two arguments, which are the plugin name and the messages file name
45
+ const arrayMembers = node.arguments.slice(0, 2);
46
+ const arrayMembersText = arrayMembers.map(getTextWithoutQuotes);
47
+
48
+ // Messages doesn't care whether you call messages.load or loadMessages, it loads the whole file
49
+ const messagesInstance = Messages.loadMessages(arrayMembersText[0], arrayMembersText[1]);
50
+ return context.factory.createNewExpression(node.expression.expression, undefined, [
51
+ arrayMembers[0],
52
+ arrayMembers[1],
53
+ context.factory.createNewExpression(context.factory.createIdentifier('Map'), undefined, [
54
+ messageMapToHardcodedMap(messagesInstance.messages),
55
+ ]),
56
+ ]);
57
+ }
58
+ // it might be a node that contains one of the things we're interested in, so keep digging
59
+ return ts.visitEachChild(node, visitor, context);
60
+ };
61
+ return ts.visitNode(sourceFile, visitor);
62
+ };
63
+ };
64
+ return transformerFactory;
65
+ };
66
+
67
+ export default transformer;
68
+
69
+ const getTextWithoutQuotes = (node: ts.Node): string => node.getText().replace(/'/g, '');
70
+
71
+ /** turn a loaded message map into */
72
+ const messageMapToHardcodedMap = (messages: StoredMessageMap): ts.ArrayLiteralExpression => {
73
+ return ts.factory.createArrayLiteralExpression(
74
+ Array.from(messages).map(([key, value]) => {
75
+ // case 1: string
76
+ if (typeof value === 'string') {
77
+ return ts.factory.createArrayLiteralExpression([
78
+ ts.factory.createStringLiteral(key),
79
+ ts.factory.createStringLiteral(value),
80
+ ]);
81
+ } else if (Array.isArray(value)) {
82
+ // case 2: string[]
83
+ return ts.factory.createArrayLiteralExpression([
84
+ ts.factory.createStringLiteral(key),
85
+ ts.factory.createArrayLiteralExpression(value.map((v) => ts.factory.createStringLiteral(v))),
86
+ ]);
87
+ } else {
88
+ // turn the object into a map and recurse!
89
+ return messageMapToHardcodedMap(new Map(Object.entries(value)));
90
+ }
91
+ })
92
+ );
93
+ };
package/messages/auth.md CHANGED
@@ -30,8 +30,16 @@ The device authorization request timed out. After executing force:auth:device:lo
30
30
 
31
31
  # serverErrorHTMLResponse
32
32
 
33
- <h1>%s</h1><br />This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.
33
+ <html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 370px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 370px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id="center"><div id="logo-container"><img id="logo" aria-hidden="true" name="logo" alt="Salesforce" src="data:image/svg+xml;base64,%s"></div><div id="header">%s</div><div id="message">%s<br/><br/>This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.</div><div id="footer">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>
34
34
 
35
35
  # missingAuthCode
36
36
 
37
37
  No authentication code found on login response.
38
+
39
+ # serverSuccessHTMLResponse
40
+
41
+ <html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 300px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 300px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id="center"><div id="logo-container"><img id="logo" aria-hidden="true" name="logo" alt="Salesforce" src="data:image/svg+xml;base64,%s"></div><div id="header">Authentication Successful</div><div id="message">You've successfully logged in. You can now close this browser tab or window.</div><div id="footer">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>
42
+
43
+ # serverSfdcImage
44
+
45
+ <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 262 184" style="enable-background:new 0 0 262 184;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#00A1E0;}
	.st1{fill:#FFFFFF;}
</style>
<title>logo-salesforce</title>
<desc>Created with Sketch.</desc>
<g id="Test-B">
	<g id="Mobile-Nav---Test-B-_x28_0_x29_">
		<g id="Group">
			<g id="logo-salesforce">
				<path id="Fill-1" class="st0" d="M109.2,20.9c8.4-8.7,20.1-14.2,33-14.2c17.2,0,32.1,9.6,40.1,23.8c6.9-3.1,14.6-4.8,22.7-4.8
					c31,0,56,25.3,56,56.5s-25.1,56.5-56,56.5c-3.8,0-7.5-0.4-11-1.1c-7,12.5-20.4,21-35.8,21c-6.4,0-12.5-1.5-17.9-4.1
					c-7.1,16.7-23.7,28.5-43,28.5c-20.1,0-37.3-12.7-43.9-30.6c-2.9,0.6-5.9,0.9-8.9,0.9c-24,0-43.4-19.6-43.4-43.9
					c0-16.2,8.7-30.4,21.7-38c-2.7-6.1-4.2-12.9-4.2-20.1C18.5,23.6,41.2,1,69,1C85.4,1,100,8.8,109.2,20.9"/>
				<path id="Combined-Shape" class="st1" d="M38.7,95.4l1.1-2.9c0.2-0.5,0.5-0.3,0.7-0.2c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2
					c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0
					c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7
					c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4
					c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9C38.7,95.9,38.5,95.8,38.7,95.4z M116.7,95.4l1.1-2.9c0.2-0.5,0.6-0.3,0.7-0.2
					c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9
					v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9
					c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1
					c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9
					C116.8,95.9,116.6,95.8,116.7,95.4z M174.5,81.7c0.4,1.5,0.7,3.1,0.7,4.8s-0.2,3.3-0.7,4.8c-0.4,1.5-1.1,2.8-2,3.9
					c-0.9,1.1-2.1,2-3.4,2.6c-1.4,0.6-3,0.9-4.8,0.9c-1.8,0-3.4-0.3-4.8-0.9c-1.4-0.6-2.5-1.5-3.4-2.6c-0.9-1.1-1.6-2.4-2-3.9
					c-0.4-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.4-2.6c1.4-0.6,3-1,4.8-1
					c1.8,0,3.4,0.3,4.8,1c1.4,0.6,2.5,1.5,3.4,2.6C173.4,78.9,174.1,80.2,174.5,81.7z M170,86.4c0-2.6-0.5-4.6-1.4-6
					c-0.9-1.4-2.4-2.1-4.3-2.1c-2,0-3.4,0.7-4.3,2.1c-0.9,1.4-1.4,3.4-1.4,6c0,2.6,0.5,4.6,1.4,6.1c0.9,1.4,2.3,2.1,4.3,2.1
					c2,0,3.4-0.7,4.3-2.1C169.6,91.1,170,89,170,86.4z M211.1,93.9l1.1,3c0.1,0.4-0.2,0.5-0.2,0.5c-1.7,0.7-4,1.1-6.3,1.1
					c-3.9,0-6.8-1.1-8.8-3.3c-2-2.2-3-5.2-3-8.9c0-1.7,0.2-3.3,0.7-4.8c0.5-1.5,1.2-2.8,2.2-3.9c1-1.1,2.2-2,3.6-2.6
					c1.4-0.6,3.1-1,5-1c1.3,0,2.4,0.1,3.3,0.2c1,0.2,2.4,0.5,3,0.8c0.1,0,0.4,0.2,0.3,0.5c-0.4,1.2-0.7,2-1.1,3
					c-0.2,0.5-0.5,0.3-0.5,0.3c-1.5-0.5-2.9-0.7-4.7-0.7c-2.2,0-3.9,0.7-4.9,2.2c-1.1,1.4-1.7,3.3-1.7,5.9c0,2.8,0.7,4.8,1.9,6.1
					c1.2,1.3,2.9,1.9,5.1,1.9c0.9,0,1.7-0.1,2.4-0.2c0.7-0.1,1.4-0.3,2.1-0.6C210.5,93.6,210.9,93.5,211.1,93.9z M233.8,80.8
					c1,3.4,0.5,6.3,0.4,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C232.5,77.9,233.4,79.4,233.8,80.8z M218.8,84h10.7
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C219.4,81.3,219.1,82.5,218.8,84z M113.1,80.8
					c1,3.4,0.5,6.3,0.5,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C111.8,77.9,112.8,79.4,113.1,80.8z M98.1,84h10.8
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C98.7,81.3,98.4,82.5,98.1,84z M71.6,83.2
					c0,0,1.2,0.1,2.5,0.3v-0.6c0-2-0.4-3-1.2-3.6c-0.8-0.6-2.1-1-3.7-1c0,0-3.7,0-6.6,1.5c-0.1,0.1-0.2,0.1-0.2,0.1
					s-0.4,0.1-0.5-0.2l-1.1-2.9c-0.2-0.4,0.1-0.6,0.1-0.6c1.4-1.1,4.6-1.7,4.6-1.7c1.1-0.2,2.9-0.4,4-0.4c3,0,5.3,0.7,6.9,2.1
					c1.6,1.4,2.4,3.6,2.4,6.7l0,13.8c0,0,0,0.4-0.3,0.5c0,0-0.6,0.2-1.1,0.3c-0.5,0.1-2.3,0.5-3.8,0.7c-1.5,0.3-3,0.4-4.6,0.4
					c-1.5,0-2.8-0.1-4-0.4c-1.2-0.3-2.2-0.7-3.1-1.3c-0.8-0.6-1.5-1.4-2-2.4c-0.5-0.9-0.7-2.1-0.7-3.4c0-1.3,0.3-2.5,0.8-3.5
					c0.5-1,1.3-1.8,2.2-2.5c0.9-0.7,2-1.1,3.1-1.5c1.2-0.3,2.4-0.5,3.7-0.5C70.2,83.2,71,83.2,71.6,83.2z M65.6,93.8
					c0,0,1.4,1.1,4.4,0.9c2.2-0.1,4.1-0.5,4.1-0.5v-6.9c0,0-1.9-0.3-4.1-0.3c-3.1,0-4.4,1.1-4.4,1.1c-0.9,0.6-1.3,1.6-1.3,2.9
					c0,0.8,0.2,1.5,0.5,2C64.9,93.2,65,93.4,65.6,93.8z M193.1,75.5c-0.1,0.4-0.9,2.5-1.1,3.2c-0.1,0.3-0.3,0.4-0.6,0.4
					c0,0-0.9-0.2-1.7-0.2c-0.5,0-1.3,0.1-2,0.3c-0.7,0.2-1.3,0.6-1.9,1.1c-0.6,0.5-1,1.3-1.3,2.2c-0.3,0.9-0.5,2.4-0.5,4v11.2
					c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5V75.2c0-0.3,0.2-0.5,0.4-0.5h3.9c0.3,0,0.4,0.2,0.4,0.5V77
					c0.6-0.8,1.6-1.5,2.5-1.9c0.9-0.4,2-0.7,3.9-0.6c1,0.1,2.3,0.3,2.5,0.4C193,75,193.2,75.1,193.1,75.5z M156,65.1
					c0.1,0,0.4,0.2,0.3,0.5l-1.2,3.2c-0.1,0.2-0.2,0.4-0.7,0.2c-0.1,0-0.3-0.1-0.8-0.2c-0.3-0.1-0.8-0.1-1.2-0.1
					c-0.6,0-1.1,0.1-1.6,0.2c-0.5,0.1-0.9,0.4-1.3,0.8c-0.4,0.4-0.8,0.9-1.1,1.6c-0.6,1.6-0.8,3.3-0.8,3.4h4.8
					c0.4,0,0.5,0.2,0.5,0.5l-0.6,3.1c-0.1,0.5-0.5,0.4-0.5,0.4h-5L143.6,98c-0.4,2-0.8,3.7-1.3,5.1c-0.5,1.4-1.1,2.4-2,3.4
					c-0.8,0.9-1.7,1.6-2.8,1.9c-1,0.4-2.3,0.6-3.7,0.6c-0.7,0-1.4,0-2.2-0.2c-0.6-0.1-0.9-0.2-1.4-0.4c-0.2-0.1-0.3-0.3-0.2-0.6
					c0.1-0.3,1-2.7,1.1-3.1c0.2-0.4,0.5-0.2,0.5-0.2c0.3,0.1,0.5,0.2,0.8,0.3c0.4,0.1,0.8,0.1,1.2,0.1c0.7,0,1.3-0.1,1.8-0.3
					c0.6-0.2,1-0.6,1.4-1.1c0.4-0.5,0.7-1.2,1.1-2.1c0.3-0.9,0.6-2.2,0.9-3.7l3.4-18.9h-3.3c-0.4,0-0.5-0.2-0.5-0.5l0.6-3.1
					c0.1-0.5,0.5-0.4,0.5-0.4h3.4l0.2-1c0.5-3,1.5-5.3,3-6.8c1.5-1.5,3.7-2.3,6.4-2.3c0.8,0,1.5,0.1,2.1,0.2
					C155,64.8,155.5,64.9,156,65.1z M88.6,97.6c0,0.3-0.2,0.5-0.4,0.5h-4c-0.3,0-0.4-0.2-0.4-0.5V65.5c0-0.2,0.2-0.5,0.4-0.5h4
					c0.3,0,0.4,0.2,0.4,0.5V97.6z"/>
			</g>
		</g>
	</g>
</g>
</svg>

package/messages/config.md CHANGED
@@ -75,11 +75,11 @@ In sfdx-project.json, indicate only one package directory (path) as the default.
75
75
 
76
76
  The sfdx-project.json file must include one, and only one, default package directory (path). Because your sfdx-project.json file contains only one package directory, it must be the default. Remove the `"default": false` key and try again.
77
77
 
78
- # targetOrg
78
+ # target-org
79
79
 
80
80
  Username or alias of the org that all commands run against by default. (sf only)
81
81
 
82
- # targetDevHub
82
+ # target-dev-hub
83
83
 
84
84
  Username or alias of your default Dev Hub org. (sf only)
85
85
 
@@ -93,28 +93,64 @@ Username or alias of your default Dev Hub org. (sfdx only)
93
93
 
94
94
  # isvDebuggerSid
95
95
 
96
- ISV debugger SID
96
+ ISV debugger SID (sfdx only)
97
97
 
98
98
  # isvDebuggerUrl
99
99
 
100
- ISV debugger URL
100
+ ISV debugger URL (sfdx only)
101
+
102
+ # org-isv-debugger-sid
103
+
104
+ ISV debugger SID.
105
+
106
+ # org-isv-debugger-url
107
+
108
+ ISV debugger URL.
101
109
 
102
110
  # apiVersion
103
111
 
112
+ API version of your project. Default: API version of your Dev Hub org. (sfdx only)
113
+
114
+ # org-api-version
115
+
104
116
  API version of your project. Default: API version of your Dev Hub org.
105
117
 
106
118
  # disableTelemetry
107
119
 
108
- Disables the collection of usage and user environment information, etc. Default: true.
120
+ Disables the collection of usage and user environment information, etc. Default: false. (sfdx only)
121
+
122
+ # disable-telemetry
123
+
124
+ Disables the collection of usage and user environment information, etc. Default: false.
109
125
 
110
126
  # maxQueryLimit
111
127
 
128
+ Maximum number of Salesforce records returned by a CLI command. Default: 10,000. (sfdx only)
129
+
130
+ # org-max-query-limit
131
+
112
132
  Maximum number of Salesforce records returned by a CLI command. Default: 10,000.
113
133
 
114
134
  # restDeploy
115
135
 
116
- Whether deployments use the Metadata REST API (true) or SOAP API (false, default value).
136
+ Whether deployments use the Metadata REST API (true) or SOAP API (false, default value). (sfdx only)
117
137
 
118
138
  # instanceUrl
119
139
 
140
+ URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com. (sfdx only)
141
+
142
+ # org-instance-url
143
+
120
144
  URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com.
145
+
146
+ # customOrgMetadataTemplates
147
+
148
+ A valid repository URL or directory for the custom org metadata templates.
149
+
150
+ # org-custom-metadata-templates
151
+
152
+ A valid repository URL or directory for the custom org metadata templates.
153
+
154
+ # invalidId
155
+
156
+ The given id %s is not a valid 15 or 18 character Salesforce ID.
package/messages/connection.md CHANGED
@@ -20,3 +20,11 @@ Connection has no instanceUrl.
20
20
  # noInstanceUrlError.actions
21
21
 
22
22
  Make sure the instanceUrl is set in your command or config.
23
+
24
+ # noApiVersionsError
25
+
26
+ Org failed to respond with its list of API versions. This is usually the result of domain changes like activating MyDomain or Enhanced Domains
27
+
28
+ # noApiVersionsError.actions
29
+
30
+ Re-authenticate to the org.
package/messages/core.md CHANGED
@@ -24,6 +24,12 @@ Due to: %s
24
24
 
25
25
  Error authenticating with JWT config due to: %s
26
26
 
27
+ # jwtAuthErrors
28
+
29
+ Error authenticating with JWT.
30
+ Errors encountered:
31
+ %s
32
+
27
33
  # refreshTokenAuthError
28
34
 
29
35
  Error authenticating with the refresh token due to: %s
@@ -55,3 +61,7 @@ Setting aliases must be in the format <key>=<value> but found: [%s].
55
61
 
56
62
  All JSON input must have heads down camelcase keys. E.g., `{ sfdcLoginUrl: "https://login.salesforce.com" }`
57
63
  Found "%s" at %s
64
+
65
+ # missingClientId
66
+
67
+ Client ID is required for JWT authentication.
package/messages/envVars.md CHANGED
@@ -90,10 +90,22 @@ URL of the Salesforce instance that is hosting your org. Default value is https:
90
90
 
91
91
  Set to true to send messages resulting from failed Salesforce CLI commands to stdout instead of stderr.
92
92
 
93
+ # sfdxDisableLogFile
94
+
95
+ Set to true to disable log file writing
96
+
93
97
  # sfdxLogLevel
94
98
 
95
99
  Level of messages that the CLI writes to the log file. Valid values are trace, debug, info, warn, error, fatal. Default value is warn.
96
100
 
101
+ # sfdxLogRotationCount
102
+
103
+ The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).
104
+
105
+ # sfdxLogRotationPeriod
106
+
107
+ The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.
108
+
97
109
  # sfdxMaxQueryLimit
98
110
 
99
111
  Maximum number of Salesforce records returned by a CLI command. Default value is 10,000. Overrides the maxQueryLimit configuration value.
@@ -166,7 +178,7 @@ Username or alias of your default Dev Hub org. Overrides the target-dev-hub conf
166
178
 
167
179
  Specifies an access token when using a login command that uses access tokens.
168
180
 
169
- # sfApiVersion
181
+ # sfOrgApiVersion
170
182
 
171
183
  API version for a specific project or all projects. Default value is the API version of your Dev Hub. Overrides the apiVersion configuration variable.
172
184
 
@@ -210,7 +222,7 @@ Time, in seconds, that Salesforce CLI waits for the Lightning Experience custom
210
222
 
211
223
  Set to true to scope Apex test results to the classes entered during a test run when running the Apex test commands.
212
224
 
213
- # sfInstanceUrl
225
+ # sfOrgInstanceUrl
214
226
 
215
227
  URL of the Salesforce instance that is hosting your org. Default value is https://login.salesforce.com. Overrides the instanceUrl configuration variable.
216
228
 
@@ -218,11 +230,23 @@ URL of the Salesforce instance that is hosting your org. Default value is https:
218
230
 
219
231
  Set to true to send messages resulting from failed Salesforce CLI commands to stdout instead of stderr.
220
232
 
233
+ # sfDisableLogFile
234
+
235
+ Set to true to disable log file writing
236
+
221
237
  # sfLogLevel
222
238
 
223
239
  Level of messages that the CLI writes to the log file. Valid values are trace, debug, info, warn, error, fatal. Default value is warn.
224
240
 
225
- # sfMaxQueryLimit
241
+ # sfLogRotationCount
242
+
243
+ The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).
244
+
245
+ # sfLogRotationPeriod
246
+
247
+ The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.
248
+
249
+ # sfOrgMaxQueryLimit
226
250
 
227
251
  Maximum number of Salesforce records returned by a CLI command. Default value is 10,000. Overrides the maxQueryLimit configuration variable.
228
252
 
@@ -277,3 +301,13 @@ Boolean indicating that the installer is running
277
301
  # sfEnv
278
302
 
279
303
  Describes if sf is in "demo" mode
304
+
305
+ # deprecatedEnv
306
+
307
+ Deprecated environment variable: %s. Please use %s instead.
308
+
309
+ # deprecatedEnvDisagreement
310
+
311
+ Deprecated environment variable: %s. Please use %s instead.
312
+
313
+ Your environment has both variables populated, and with different values. The value from %s will be used.