@salesforce/b2c-cli 2.2.0 → 2.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/ecdn/mtls/create.js +3 -3
- package/dist/commands/ecdn/mtls/create.js.map +1 -1
- package/dist/commands/ecdn/mtls/setup.js +7 -8
- package/dist/commands/ecdn/mtls/setup.js.map +1 -1
- package/dist/utils/ecdn/mtls.js +5 -2
- package/dist/utils/ecdn/mtls.js.map +1 -1
- package/oclif.manifest.json +14215 -14215
- package/package.json +1 -1
|
@@ -14,7 +14,7 @@ import { t, withDocs } from '../../../i18n/index.js';
|
|
|
14
14
|
* Command to create an mTLS certificate for code upload.
|
|
15
15
|
*/
|
|
16
16
|
export default class EcdnMtlsCreate extends EcdnCommand {
|
|
17
|
-
static description = withDocs(t('commands.ecdn.mtls.create.description', '
|
|
17
|
+
static description = withDocs(t('commands.ecdn.mtls.create.description', 'Register a CA certificate for two-factor (mTLS) code upload; with --generate, also create the CA and issue a first client certificate'), '/cli/ecdn.html#b2c-ecdn-mtls-create');
|
|
18
18
|
static enableJsonFlag = true;
|
|
19
19
|
static examples = [
|
|
20
20
|
'<%= config.bin %> <%= command.id %> --tenant-id zzxy_prd --name my-cert --certificate-file cert.pem --private-key-file key.pem',
|
|
@@ -24,7 +24,7 @@ export default class EcdnMtlsCreate extends EcdnCommand {
|
|
|
24
24
|
static flags = {
|
|
25
25
|
...EcdnCommand.baseFlags,
|
|
26
26
|
name: Flags.string({
|
|
27
|
-
description: t('flags.name.description', '
|
|
27
|
+
description: t('flags.name.description', 'Name (label) for the registered CA certificate'),
|
|
28
28
|
required: true,
|
|
29
29
|
}),
|
|
30
30
|
'certificate-file': Flags.string({
|
|
@@ -45,7 +45,7 @@ export default class EcdnMtlsCreate extends EcdnCommand {
|
|
|
45
45
|
default: 'mtls-certs',
|
|
46
46
|
}),
|
|
47
47
|
'client-name': Flags.string({
|
|
48
|
-
description: t('flags.clientName.description', '
|
|
48
|
+
description: t('flags.clientName.description', 'Name of the client certificate (.p12) issued from the new CA, used for code upload (with --generate; default: <name>-client)'),
|
|
49
49
|
}),
|
|
50
50
|
'p12-passphrase': Flags.string({
|
|
51
51
|
description: t('flags.p12Passphrase.description', 'Passphrase for the generated .p12 (with --generate; default: random)'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/ecdn/mtls/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GAEjC,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,sCAAsC,EACtC,0BAA0B,GAE3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAenD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAkC;IAC5E,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/ecdn/mtls/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
import { Flags, ux } from '@oclif/core';
|
|
7
7
|
import { confirm, input } from '@inquirer/prompts';
|
|
8
8
|
import * as fs from 'node:fs';
|
|
9
|
-
import * as os from 'node:os';
|
|
10
9
|
import path from 'node:path';
|
|
11
10
|
import { updateInstanceConfig } from '@salesforce/b2c-tooling-sdk/config';
|
|
12
11
|
import { EcdnCommand } from '../../../utils/ecdn/index.js';
|
|
@@ -16,7 +15,7 @@ import { t, withDocs } from '../../../i18n/index.js';
|
|
|
16
15
|
* Interactive wizard for end-to-end mTLS code upload certificate setup.
|
|
17
16
|
*/
|
|
18
17
|
export default class EcdnMtlsSetup extends EcdnCommand {
|
|
19
|
-
static description = withDocs(t('commands.ecdn.mtls.setup.description', '
|
|
18
|
+
static description = withDocs(t('commands.ecdn.mtls.setup.description', 'Guided version of "ecdn mtls create --generate": prompts for names with defaults, generates and registers a CA, issues a client certificate, and optionally configures dw.json'), '/cli/ecdn.html#b2c-ecdn-mtls-setup');
|
|
20
19
|
static enableJsonFlag = true;
|
|
21
20
|
static examples = ['<%= config.bin %> <%= command.id %> --tenant-id zzxy_prd'];
|
|
22
21
|
static flags = {
|
|
@@ -52,13 +51,13 @@ export default class EcdnMtlsSetup extends EcdnCommand {
|
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
const name = await input({
|
|
55
|
-
message: t('commands.ecdn.mtls.setup.namePrompt', '
|
|
54
|
+
message: t('commands.ecdn.mtls.setup.namePrompt', 'CA name (a label shown in eCDN and Business Manager):'),
|
|
56
55
|
default: 'code-upload',
|
|
57
56
|
validate: (v) => v.trim().length > 0 || 'Name is required',
|
|
58
57
|
});
|
|
59
58
|
const clientName = await input({
|
|
60
|
-
message: t('commands.ecdn.mtls.setup.clientNamePrompt', 'Client certificate name (
|
|
61
|
-
default:
|
|
59
|
+
message: t('commands.ecdn.mtls.setup.clientNamePrompt', 'Client certificate name, for the .p12 you upload with (e.g. github-actions for a CI pipeline, or your Business Manager username):'),
|
|
60
|
+
default: 'ci',
|
|
62
61
|
validate: (v) => v.trim().length > 0 || 'Name is required',
|
|
63
62
|
});
|
|
64
63
|
const outDir = await input({
|
|
@@ -134,12 +133,12 @@ export default class EcdnMtlsSetup extends EcdnCommand {
|
|
|
134
133
|
const loadedFrom = this.resolvedConfig.sources.find((s) => s.name === 'DwJsonSource' && s.location)?.location;
|
|
135
134
|
const dwJsonPath = path.resolve(loadedFrom ?? this.flags.config ?? path.join(this.flags['project-directory'] ?? process.cwd(), 'dw.json'));
|
|
136
135
|
if (!fs.existsSync(dwJsonPath)) {
|
|
137
|
-
ux.stdout(t('commands.ecdn.mtls.setup.noConfig', 'No dw.json found; configure "certificate" and "certificate-passphrase" manually.'));
|
|
136
|
+
ux.stdout(t('commands.ecdn.mtls.setup.noConfig', 'No dw.json found; to upload from this machine, configure "certificate" and "certificate-passphrase" manually.'));
|
|
138
137
|
return undefined;
|
|
139
138
|
}
|
|
140
139
|
const update = await confirm({
|
|
141
|
-
message: t('commands.ecdn.mtls.setup.updateConfig', '
|
|
142
|
-
default:
|
|
140
|
+
message: t('commands.ecdn.mtls.setup.updateConfig', 'Also use this certificate for code upload from this machine (updates {{path}})?', { path: dwJsonPath }),
|
|
141
|
+
default: false,
|
|
143
142
|
});
|
|
144
143
|
if (!update) {
|
|
145
144
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../src/commands/ecdn/mtls/setup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,OAAO,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../src/commands/ecdn/mtls/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/ecdn/mtls.js
CHANGED
|
@@ -106,7 +106,10 @@ export function clientCertificateNotice(options) {
|
|
|
106
106
|
' The .p12 and its passphrase are credentials: store them securely, keep the',
|
|
107
107
|
' passphrase separate from the file, and never commit either to a repository.',
|
|
108
108
|
'',
|
|
109
|
-
'
|
|
109
|
+
' For CI, store the base64-encoded .p12 and the passphrase as secrets:',
|
|
110
|
+
` base64 -i ${options.file} | tr -d '\\n'`,
|
|
111
|
+
'',
|
|
112
|
+
' To upload from this machine, add these settings to your instance in dw.json',
|
|
110
113
|
' (or use --server, --certificate and --passphrase):',
|
|
111
114
|
snippet,
|
|
112
115
|
].join('\n');
|
|
@@ -148,7 +151,7 @@ export async function generateAndUploadCodeUploadCertificate(options) {
|
|
|
148
151
|
throw new Error(`${message}\nThe generated CA was saved to ${files.caCertificate} and ${files.caPrivateKey}; ` +
|
|
149
152
|
'retry the upload with --certificate-file and --private-key-file.', { cause: error });
|
|
150
153
|
}
|
|
151
|
-
progress(
|
|
154
|
+
progress(`Issuing client certificate "${options.clientName}" signed by the CA...`);
|
|
152
155
|
const clientCert = issueClientCertificate({
|
|
153
156
|
ca,
|
|
154
157
|
commonName: options.clientName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mtls.js","sourceRoot":"","sources":["../../../src/utils/ecdn/mtls.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mtls.js","sourceRoot":"","sources":["../../../src/utils/ecdn/mtls.ts"],"names":[],"mappings":"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"}
|