@eudiplo/cli 9.1.0-main.a46d7e6 → 9.1.0-main.a78cbb4
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/completion/action.js +3 -1
- package/dist/commands/completion/action.js.map +1 -1
- package/dist/commands/config/portability/migrations.spec.js +5 -2
- package/dist/commands/config/portability/migrations.spec.js.map +1 -1
- package/dist/commands/config/portability/upgrade.d.ts.map +1 -1
- package/dist/commands/config/portability/upgrade.js +2 -7
- package/dist/commands/config/portability/upgrade.js.map +1 -1
- package/dist/commands/config/tenant/action.d.ts.map +1 -1
- package/dist/commands/config/tenant/action.js +3 -2
- package/dist/commands/config/tenant/action.js.map +1 -1
- package/dist/commands/config/validate/action.d.ts.map +1 -1
- package/dist/commands/config/validate/action.js +2 -1
- package/dist/commands/config/validate/action.js.map +1 -1
- package/dist/commands/config/validate/registry.json +21 -0
- package/dist/commands/config/validate/validator.d.ts.map +1 -1
- package/dist/commands/config/validate/validator.js +26 -3
- package/dist/commands/config/validate/validator.js.map +1 -1
- package/dist/commands/init/action.d.ts.map +1 -1
- package/dist/commands/init/action.js +1 -11
- package/dist/commands/init/action.js.map +1 -1
- package/dist/commands/instance/action.d.ts +2 -0
- package/dist/commands/instance/action.d.ts.map +1 -1
- package/dist/commands/instance/action.js +68 -12
- package/dist/commands/instance/action.js.map +1 -1
- package/dist/commands/instance/index.d.ts.map +1 -1
- package/dist/commands/instance/index.js +21 -3
- package/dist/commands/instance/index.js.map +1 -1
- package/dist/commands/open/action.d.ts.map +1 -1
- package/dist/commands/open/action.js +13 -2
- package/dist/commands/open/action.js.map +1 -1
- package/dist/commands/status/action.d.ts.map +1 -1
- package/dist/commands/status/action.js +2 -1
- package/dist/commands/status/action.js.map +1 -1
- package/dist/index.js +20729 -5130
- package/dist/services/api-auth.d.ts.map +1 -1
- package/dist/services/api-auth.js +3 -2
- package/dist/services/api-auth.js.map +1 -1
- package/dist/services/browser.d.ts.map +1 -1
- package/dist/services/browser.js +3 -2
- package/dist/services/browser.js.map +1 -1
- package/dist/services/cli-config.d.ts +41 -1
- package/dist/services/cli-config.d.ts.map +1 -1
- package/dist/services/cli-config.js +217 -29
- package/dist/services/cli-config.js.map +1 -1
- package/dist/services/compose-project.d.ts +6 -0
- package/dist/services/compose-project.d.ts.map +1 -1
- package/dist/services/compose-project.js +13 -2
- package/dist/services/compose-project.js.map +1 -1
- package/dist/services/diagnostics.d.ts.map +1 -1
- package/dist/services/diagnostics.js +8 -7
- package/dist/services/diagnostics.js.map +1 -1
- package/dist/services/instance-selection.d.ts.map +1 -1
- package/dist/services/instance-selection.js +2 -5
- package/dist/services/instance-selection.js.map +1 -1
- package/dist/services/url.d.ts +21 -0
- package/dist/services/url.d.ts.map +1 -0
- package/dist/services/url.js +61 -0
- package/dist/services/url.js.map +1 -0
- package/package.json +6 -5
- package/templates/demo-config/info.json +1 -1
- package/templates/demo-config/issuance/credentials/citizen.json +1 -1
- package/templates/demo-config/issuance/credentials/pid-key.json +1 -1
- package/templates/demo-config/issuance/credentials/pid-mdoc.json +1 -1
- package/templates/demo-config/issuance/credentials/pid.json +1 -1
- package/templates/demo-config/issuance/issuance.json +1 -1
- package/templates/demo-config/key-chains/access.json +1 -1
- package/templates/demo-config/key-chains/attestation.json +1 -1
- package/templates/demo-config/key-chains/status-list.json +4 -4
- package/templates/demo-config/key-chains/trust-list.json +1 -1
- package/templates/demo-config/presentation/age-over-18.json +1 -1
- package/templates/demo-config/presentation/pid.json +1 -1
- package/templates/docker-compose.yml +2 -2
- package/templates/schemas/CreateFederationTrustAnchorDto.schema.json +82 -0
- package/templates/schemas/CreateRegistrarConfigDto.schema.json +29 -0
- package/templates/schemas/CreateTenantDto.schema.json +2 -2
- package/templates/schemas/CredentialConfigCreate.schema.json +246 -14
- package/templates/schemas/CredentialConfigFile.schema.json +1823 -1
- package/templates/schemas/FederationTrustAnchorConfigFile.schema.json +60 -0
- package/templates/schemas/IssuanceConfig.schema.json +122 -9
- package/templates/schemas/IssuanceConfigFile.schema.json +2247 -1
- package/templates/schemas/KeyChainConfigFile.schema.json +740 -1
- package/templates/schemas/KeyChainCreateDto.schema.json +11 -0
- package/templates/schemas/KeyChainDefaultsConfigFile.schema.json +123 -0
- package/templates/schemas/KeyChainImportDto.schema.json +2 -0
- package/templates/schemas/KmsConfigDto.schema.json +186 -0
- package/templates/schemas/KmsConfigFile.schema.json +1026 -1
- package/templates/schemas/PresentationConfigCreateDto.schema.json +16 -0
- package/templates/schemas/PresentationConfigFile.schema.json +746 -1
- package/templates/schemas/RegistrarConfigFile.schema.json +101 -1
- package/templates/schemas/TenantConfigFile.schema.json +395 -0
- package/templates/schemas/UpdateFederationTrustAnchorDto.schema.json +70 -0
- package/templates/schemas.manifest.json +4 -0
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
import { readStringFlag } from "../../options.js";
|
|
2
|
-
import { removeInstance, saveConfig, setDefaultInstance, upsertInstance, } from "../../services/cli-config.js";
|
|
2
|
+
import { getInstance, removeInstance, renameInstance, saveConfig, setDefaultInstance, updateInstance, upsertInstance, } from "../../services/cli-config.js";
|
|
3
3
|
import { parseTarget } from "../../services/deployment-target.js";
|
|
4
4
|
import { assertContextName, assertNamespace, defaultWorkloads, parseWorkloadMap, } from "../../services/kubectl.js";
|
|
5
|
+
import { hasUserInfo, redactUrl, validateHttpUrl } from "../../services/url.js";
|
|
5
6
|
export async function runInstanceAdd(configPath, config, parsed, context) {
|
|
6
7
|
const name = parsed.positionals[0];
|
|
7
8
|
if (!name) {
|
|
8
9
|
throw new Error("Instance name is required.");
|
|
9
10
|
}
|
|
10
|
-
const url =
|
|
11
|
-
if (
|
|
11
|
+
const url = readUrlFlag(parsed.flags, "url", context);
|
|
12
|
+
if (url === undefined) {
|
|
12
13
|
throw new Error("--url is required.");
|
|
13
14
|
}
|
|
14
15
|
const target = parseTarget(readStringFlag(parsed.flags, "target") ?? "external");
|
|
15
|
-
|
|
16
|
+
// `instance add` has always treated an empty --client-url as "no client
|
|
17
|
+
// URL"; scripts pass `--client-url "$CLIENT_URL"` with the variable unset.
|
|
18
|
+
const clientUrl = parsed.flags["client-url"] === ""
|
|
19
|
+
? undefined
|
|
20
|
+
: readUrlFlag(parsed.flags, "client-url", context);
|
|
16
21
|
const kubernetes = target === "kubernetes"
|
|
17
22
|
? readKubernetesOptions(parsed.flags)
|
|
18
23
|
: undefined;
|
|
@@ -35,7 +40,7 @@ export function runInstanceList(config, context) {
|
|
|
35
40
|
context.stdout.write("Configured instances:\n");
|
|
36
41
|
for (const [name, instance] of instances) {
|
|
37
42
|
const defaultLabel = name === config.defaultInstance ? " (default)" : "";
|
|
38
|
-
context.stdout.write(`- ${name}${defaultLabel}: ${instance.target} ${instance.url}\n`);
|
|
43
|
+
context.stdout.write(`- ${name}${defaultLabel}: ${instance.target} ${redactUrl(instance.url)}\n`);
|
|
39
44
|
}
|
|
40
45
|
return 0;
|
|
41
46
|
}
|
|
@@ -44,15 +49,14 @@ export function runInstanceShow(config, parsed, context) {
|
|
|
44
49
|
if (!name) {
|
|
45
50
|
throw new Error("No instance selected. Specify a name or add an instance first.");
|
|
46
51
|
}
|
|
47
|
-
const instance = config
|
|
48
|
-
if (!instance) {
|
|
49
|
-
throw new Error(`Unknown instance: ${name}`);
|
|
50
|
-
}
|
|
52
|
+
const instance = getInstance(config, name);
|
|
51
53
|
const defaultLabel = name === config.defaultInstance ? " (default)" : "";
|
|
52
54
|
context.stdout.write(`Instance ${name}${defaultLabel}\n`);
|
|
53
55
|
context.stdout.write(`Target: ${instance.target}\n`);
|
|
54
|
-
context.stdout.write(`API URL: ${instance.url}\n`);
|
|
55
|
-
writeOptionalValue(context, "Client URL", instance.clientUrl
|
|
56
|
+
context.stdout.write(`API URL: ${redactUrl(instance.url)}\n`);
|
|
57
|
+
writeOptionalValue(context, "Client URL", instance.clientUrl === undefined
|
|
58
|
+
? undefined
|
|
59
|
+
: redactUrl(instance.clientUrl));
|
|
56
60
|
writeOptionalValue(context, "Project directory", instance.projectDirectory);
|
|
57
61
|
writeOptionalValue(context, "Compose file", instance.composeFile);
|
|
58
62
|
writeOptionalList(context, "Compose files", instance.composeFiles);
|
|
@@ -101,11 +105,63 @@ export async function runInstanceUse(configPath, config, parsed, context) {
|
|
|
101
105
|
}
|
|
102
106
|
export async function runInstanceRemove(configPath, config, parsed, context) {
|
|
103
107
|
const name = requireInstanceName(parsed);
|
|
104
|
-
|
|
108
|
+
if (parsed.flags.default === "") {
|
|
109
|
+
throw new Error("--default must name an instance.");
|
|
110
|
+
}
|
|
111
|
+
const newDefault = readStringFlag(parsed.flags, "default");
|
|
112
|
+
const nextConfig = removeInstance(config, name, { newDefault });
|
|
113
|
+
await saveConfig(configPath, nextConfig);
|
|
105
114
|
context.stdout.write(`Unregistered instance ${name}.\n`);
|
|
115
|
+
if (nextConfig.defaultInstance !== config.defaultInstance) {
|
|
116
|
+
context.stdout.write(nextConfig.defaultInstance === undefined
|
|
117
|
+
? "No default instance is set.\n"
|
|
118
|
+
: `Default instance set to ${nextConfig.defaultInstance}.\n`);
|
|
119
|
+
}
|
|
106
120
|
context.stdout.write("Deployment resources were not removed.\n");
|
|
107
121
|
return 0;
|
|
108
122
|
}
|
|
123
|
+
export async function runInstanceUpdate(configPath, config, parsed, context) {
|
|
124
|
+
const name = requireInstanceName(parsed);
|
|
125
|
+
const url = readUrlFlag(parsed.flags, "url", context);
|
|
126
|
+
const clientUrl = parsed.flags["no-client-url"] === true
|
|
127
|
+
? null
|
|
128
|
+
: readUrlFlag(parsed.flags, "client-url", context);
|
|
129
|
+
await saveConfig(configPath, updateInstance(config, name, { url, clientUrl }));
|
|
130
|
+
context.stdout.write(`Updated instance ${name}.\n`);
|
|
131
|
+
return 0;
|
|
132
|
+
}
|
|
133
|
+
export async function runInstanceRename(configPath, config, parsed, context) {
|
|
134
|
+
const [oldName, newName] = parsed.positionals;
|
|
135
|
+
if (!oldName || newName === undefined) {
|
|
136
|
+
throw new Error("Old and new instance names are required.");
|
|
137
|
+
}
|
|
138
|
+
await saveConfig(configPath, renameInstance(config, oldName, newName));
|
|
139
|
+
context.stdout.write(`Renamed instance ${oldName} to ${newName}.\n`);
|
|
140
|
+
if (config.defaultInstance === oldName) {
|
|
141
|
+
context.stdout.write(`Default instance is now ${newName}.\n`);
|
|
142
|
+
}
|
|
143
|
+
return 0;
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Reads and validates a URL option. The value is taken as given, so
|
|
147
|
+
* `--url ""` (an unset variable in a script) is reported as an invalid URL
|
|
148
|
+
* instead of a missing option; only `instance add` keeps ignoring an empty
|
|
149
|
+
* `--client-url`. This is the only place URL options are
|
|
150
|
+
* checked; saveConfig validates the whole config again before writing.
|
|
151
|
+
* User info is stored as given, with a warning: the file is plain text and
|
|
152
|
+
* the CLI's own requests cannot use it.
|
|
153
|
+
*/
|
|
154
|
+
function readUrlFlag(flags, name, context) {
|
|
155
|
+
const value = flags[name];
|
|
156
|
+
if (typeof value !== "string") {
|
|
157
|
+
return undefined;
|
|
158
|
+
}
|
|
159
|
+
validateHttpUrl(value, `--${name}`);
|
|
160
|
+
if (hasUserInfo(value)) {
|
|
161
|
+
context.stderr.write(`Warning: --${name} contains credentials. They are stored in plain text in the CLI config, and the CLI cannot use them for its own requests.\n`);
|
|
162
|
+
}
|
|
163
|
+
return value;
|
|
164
|
+
}
|
|
109
165
|
function requireInstanceName(parsed) {
|
|
110
166
|
const name = parsed.positionals[0];
|
|
111
167
|
if (!name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/instance/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,cAAc,EACd,UAAU,EACV,kBAAkB,EAClB,cAAc,GACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACnB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/instance/action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/instance/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAA4B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/instance/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAA4B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAW1E,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,WAAW,GACzB,OAAO,CAyHT"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import { loadCliState, parsedArgs } from "../shared.js";
|
|
3
|
-
import { runInstanceAdd, runInstanceList, runInstanceRemove, runInstanceShow, runInstanceUse, } from "./action.js";
|
|
3
|
+
import { runInstanceAdd, runInstanceList, runInstanceRemove, runInstanceRename, runInstanceShow, runInstanceUpdate, runInstanceUse, } from "./action.js";
|
|
4
4
|
export function createInstanceCommand(context, setExitCode) {
|
|
5
5
|
const instance = new Command("instance")
|
|
6
6
|
.description("Manage configured EUDIPLO instances")
|
|
@@ -27,13 +27,31 @@ export function createInstanceCommand(context, setExitCode) {
|
|
|
27
27
|
const { configPath, config } = await loadCliState(context);
|
|
28
28
|
setExitCode(await runInstanceUse(configPath, config, parsedArgs("instance", "use", [name], {}), context));
|
|
29
29
|
});
|
|
30
|
+
instance
|
|
31
|
+
.command("update <name>")
|
|
32
|
+
.description("Change the API or client URL of an instance")
|
|
33
|
+
.option("--url <url>", "new EUDIPLO API URL")
|
|
34
|
+
.option("--client-url <url>", "new web client URL")
|
|
35
|
+
.option("--no-client-url", "remove the web client URL")
|
|
36
|
+
.action(async (name, options) => {
|
|
37
|
+
const { configPath, config } = await loadCliState(context);
|
|
38
|
+
setExitCode(await runInstanceUpdate(configPath, config, parsedArgs("instance", "update", [name], options), context));
|
|
39
|
+
});
|
|
40
|
+
instance
|
|
41
|
+
.command("rename <old-name> <new-name>")
|
|
42
|
+
.description("Rename an instance; the default follows it")
|
|
43
|
+
.action(async (oldName, newName) => {
|
|
44
|
+
const { configPath, config } = await loadCliState(context);
|
|
45
|
+
setExitCode(await runInstanceRename(configPath, config, parsedArgs("instance", "rename", [oldName, newName], {}), context));
|
|
46
|
+
});
|
|
30
47
|
instance
|
|
31
48
|
.command("remove <name>")
|
|
32
49
|
.alias("rm")
|
|
33
50
|
.description("Unregister an EUDIPLO instance")
|
|
34
|
-
.
|
|
51
|
+
.option("--default <name>", "instance to make the default when removing the current default")
|
|
52
|
+
.action(async (name, options) => {
|
|
35
53
|
const { configPath, config } = await loadCliState(context);
|
|
36
|
-
setExitCode(await runInstanceRemove(configPath, config, parsedArgs("instance", "remove", [name],
|
|
54
|
+
setExitCode(await runInstanceRemove(configPath, config, parsedArgs("instance", "remove", [name], options), context));
|
|
37
55
|
});
|
|
38
56
|
instance
|
|
39
57
|
.command("add <name>")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/instance/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAoB,MAAM,cAAc,CAAC;AAC1E,OAAO,EACH,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,cAAc,GACjB,MAAM,aAAa,CAAC;AAErB,MAAM,UAAU,qBAAqB,CACjC,OAAuB,EACvB,WAAwB;IAExB,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;SACnC,WAAW,CAAC,qCAAqC,CAAC;SAClD,WAAW,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ;SACH,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,IAAI,CAAC;SACX,WAAW,CAAC,mCAAmC,CAAC;SAChD,MAAM,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/C,WAAW,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACP,QAAQ;SACH,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/C,WAAW,CACP,eAAe,CACX,MAAM,EACN,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EACtD,OAAO,CACV,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IACP,QAAQ;SACH,OAAO,CAAC,YAAY,CAAC;SACrB,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3D,WAAW,CACP,MAAM,cAAc,CAChB,UAAU,EACV,MAAM,EACN,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EACzC,OAAO,CACV,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IACP,QAAQ;SACH,OAAO,CAAC,eAAe,CAAC;SACxB,KAAK,CAAC,IAAI,CAAC;SACX,WAAW,CAAC,gCAAgC,CAAC;SAC7C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/instance/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/open/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,eAAe,EAIvB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/open/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,eAAe,EAIvB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5E,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,MAAM,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3D;AAOD,wBAAgB,iBAAiB,CAC7B,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACxC,IAAI,EAAE,OAAO,GACd,MAAM,CAeR;AAED,wBAAsB,cAAc,CAChC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,gBAAsC,GACrD,OAAO,CAAC,MAAM,CAAC,CAyCjB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { assertWebUrl, chooseLauncher, launchBrowser, pathLookup, } from "../../services/browser.js";
|
|
2
2
|
import { resolveInstance } from "../../services/instance-selection.js";
|
|
3
|
+
import { hasUserInfo, stripUserInfo } from "../../services/url.js";
|
|
3
4
|
const defaultDependencies = {
|
|
4
5
|
platform: process.platform,
|
|
5
6
|
launch: launchBrowser,
|
|
@@ -20,12 +21,22 @@ export function resolveOpenTarget(instanceName, instance, docs) {
|
|
|
20
21
|
}
|
|
21
22
|
export async function runOpenCommand(config, parsed, context, dependencies = defaultDependencies) {
|
|
22
23
|
const [instanceName, instance] = resolveInstance(config, parsed);
|
|
23
|
-
const
|
|
24
|
+
const target = resolveOpenTarget(instanceName, instance, parsed.flags.docs === true);
|
|
25
|
+
const withCredentials = hasUserInfo(target);
|
|
24
26
|
// Scripts, pipes and CI get the URL on stdout and nothing else.
|
|
25
27
|
if (parsed.flags.print === true || context.interactive !== true) {
|
|
26
|
-
|
|
28
|
+
if (withCredentials) {
|
|
29
|
+
context.stderr.write("Warning: the printed URL contains credentials from the instance config.\n");
|
|
30
|
+
}
|
|
31
|
+
context.stdout.write(`${target}\n`);
|
|
27
32
|
return 0;
|
|
28
33
|
}
|
|
34
|
+
// User info never reaches the browser's command line, where other local
|
|
35
|
+
// users can read it; the browser asks for the credentials instead.
|
|
36
|
+
const url = stripUserInfo(new URL(target)).href;
|
|
37
|
+
if (withCredentials) {
|
|
38
|
+
context.stderr.write("Credentials in the instance URL were left out; the browser asks for them.\n");
|
|
39
|
+
}
|
|
29
40
|
const launcher = await chooseLauncher(url, {
|
|
30
41
|
platform: dependencies.platform,
|
|
31
42
|
env: context.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/open/action.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAEZ,cAAc,EACd,aAAa,EACb,UAAU,GACb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/open/action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/status/action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/commands/status/action.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5E,wBAAsB,gBAAgB,CAClC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,cAAc,GACxB,OAAO,CAAC,MAAM,CAAC,CAajB"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { redactUrl } from "../../services/url.js";
|
|
1
2
|
import { runDoctor } from "../../services/diagnostics.js";
|
|
2
3
|
import { resolveInstance } from "../../services/instance-selection.js";
|
|
3
4
|
export async function runStatusCommand(config, parsed, context) {
|
|
4
5
|
const [instanceName, instance] = resolveInstance(config, parsed);
|
|
5
6
|
const checks = await runDoctor(instance, context, []);
|
|
6
7
|
const health = checks.find((check) => check.name === "health endpoint");
|
|
7
|
-
context.stdout.write(`${instanceName} (${instance.target}) ${instance.url}\n`);
|
|
8
|
+
context.stdout.write(`${instanceName} (${instance.target}) ${redactUrl(instance.url)}\n`);
|
|
8
9
|
if (health) {
|
|
9
10
|
context.stdout.write(`${health.status.toUpperCase()} ${health.message}\n`);
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/status/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAGvE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,MAAiB,EACjB,MAAkB,EAClB,OAAuB;IAEvB,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,GAAG,YAAY,KAAK,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/commands/status/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAGvE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,MAAiB,EACjB,MAAkB,EAClB,OAAuB;IAEvB,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,GAAG,YAAY,KAAK,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACtE,CAAC;IACF,IAAI,MAAM,EAAE,CAAC;QACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,CACvD,CAAC;IACN,CAAC;IACD,OAAO,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC"}
|