@youkno/edge-cli 1.21.342 → 1.21.344

package/dist/commands/login.js

@@ -14,7 +14,7 @@ function registerLogin(program) {
         const opts = (parent?.opts() ?? {});
         const cfg = await (0, config_1.resolveEffectiveConfig)(opts);
         // --client selects the company to sign in as, here and only here: the explicit login.
-        const email = await (0, auth_1.login)({ ...cfg, exchangeClientId: opts.clientId?.trim() || undefined });
+        const email = await (0, auth_1.login)({ ...cfg, exchangeClientId: (opts.client ?? opts.clientId)?.trim() || undefined });
         process.stdout.write(`Successfully authenticated as ${email}\n`);
         if (this.opts().shell) {
             await (0, shell_1.repl)(cfg, {});

package/dist/lib/auth.js

@@ -242,11 +242,12 @@ function asShellAuthMethodError(err, hint) {
 }
 /**
  * The server's `errorCode`s for an exchange whose subject cannot be selected. Mirror
- * `ApiErrorCode.NOT_A_MEMBER`, `VULGUS_NOT_SELECTABLE` and `VIRTUAL_CREDENTIAL_REFUSED`.
+ * `ApiErrorCode.NOT_A_MEMBER`, `VULGUS_NOT_SELECTABLE`, `VIRTUAL_CREDENTIAL_REFUSED` and `COMPANY_REQUIRED`.
  */
 const ERROR_CODE_NOT_A_MEMBER = 403012;
 const ERROR_CODE_VULGUS_NOT_SELECTABLE = 400006;
 const ERROR_CODE_VIRTUAL_CREDENTIAL_REFUSED = 400007;
+const ERROR_CODE_COMPANY_REQUIRED = 400008;
 /**
  * A `--client` refusal as an error that says what to do, or undefined when this failure is
  * something else. Matched on errorCode, never on the prose.
@@ -262,6 +263,9 @@ function asCompanySelectionError(err, cfg) {
         case ERROR_CODE_VULGUS_NOT_SELECTABLE:
             return new Error(`Login failed: --client ${cfg.exchangeClientId} is the Vulgus company, ` +
                 `which is your own account. Omit --client.`, { cause: err });
+        case ERROR_CODE_COMPANY_REQUIRED:
+            return new Error("Login failed: this account works for more than one company, so one has to be " +
+                "chosen. Sign in with --client=<company id or pin>.", { cause: err });
         case ERROR_CODE_VIRTUAL_CREDENTIAL_REFUSED:
             return new Error("Login failed: the console handed over a company session's Firebase token. " +
                 "It must hand over the person's own Firebase token, not the company session's; " +

package/dist/lib/config.js

@@ -195,7 +195,7 @@ async function resolveEffectiveConfig(options) {
         env,
         baseUrl,
         consoleBaseUrl: resolveConsoleBaseUrl(product, env, productsConfig),
-        clientId: options.clientId ?? merged.CLIENT_ID,
+        clientId: options.client ?? options.clientId ?? merged.CLIENT_ID,
         configFiles: usedFiles
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youkno/edge-cli",
-  "version": "1.21.342",
+  "version": "1.21.344",
   "description": "Cross-platform Edge CLI",
   "bin": "dist/index.js",
   "publishConfig": {

package/src/commands/login.ts

@@ -15,7 +15,7 @@ export function registerLogin(program: Command): void {
             const opts = (parent?.opts() ?? {}) as CliOptions;
             const cfg = await resolveEffectiveConfig(opts);
             // --client selects the company to sign in as, here and only here: the explicit login.
-            const email = await login({ ...cfg, exchangeClientId: opts.clientId?.trim() || undefined });
+            const email = await login({ ...cfg, exchangeClientId: (opts.client ?? opts.clientId)?.trim() || undefined });
             process.stdout.write(`Successfully authenticated as ${email}\n`);
             if (this.opts<{ shell?: boolean }>().shell) {
                 await repl(cfg, {});

package/src/lib/auth.ts

@@ -295,11 +295,12 @@ function asShellAuthMethodError(err: unknown, hint: string): ShellAuthMethodErro
 
 /**
  * The server's `errorCode`s for an exchange whose subject cannot be selected. Mirror
- * `ApiErrorCode.NOT_A_MEMBER`, `VULGUS_NOT_SELECTABLE` and `VIRTUAL_CREDENTIAL_REFUSED`.
+ * `ApiErrorCode.NOT_A_MEMBER`, `VULGUS_NOT_SELECTABLE`, `VIRTUAL_CREDENTIAL_REFUSED` and `COMPANY_REQUIRED`.
  */
 const ERROR_CODE_NOT_A_MEMBER = 403012;
 const ERROR_CODE_VULGUS_NOT_SELECTABLE = 400006;
 const ERROR_CODE_VIRTUAL_CREDENTIAL_REFUSED = 400007;
+const ERROR_CODE_COMPANY_REQUIRED = 400008;
 
 /**
  * A `--client` refusal as an error that says what to do, or undefined when this failure is
@@ -316,6 +317,9 @@ function asCompanySelectionError(err: unknown, cfg: EffectiveConfig): Error | un
         case ERROR_CODE_VULGUS_NOT_SELECTABLE:
             return new Error(`Login failed: --client ${cfg.exchangeClientId} is the Vulgus company, ` +
                 `which is your own account. Omit --client.`, { cause: err });
+        case ERROR_CODE_COMPANY_REQUIRED:
+            return new Error("Login failed: this account works for more than one company, so one has to be " +
+                "chosen. Sign in with --client=<company id or pin>.", { cause: err });
         case ERROR_CODE_VIRTUAL_CREDENTIAL_REFUSED:
             return new Error("Login failed: the console handed over a company session's Firebase token. " +
                 "It must hand over the person's own Firebase token, not the company session's; " +

package/src/lib/config.ts

@@ -228,7 +228,7 @@ export async function resolveEffectiveConfig(options: CliOptions): Promise<Effec
         env,
         baseUrl,
         consoleBaseUrl: resolveConsoleBaseUrl(product, env, productsConfig),
-        clientId: options.clientId ?? merged.CLIENT_ID,
+        clientId: options.client ?? options.clientId ?? merged.CLIENT_ID,
         configFiles: usedFiles
     };
 }

package/src/lib/types.ts

@@ -4,6 +4,12 @@ export type CliOptions = {
     product?: string;
     env?: CliEnv;
     baseUrl?: string;
+    /**
+     * `--client`. Commander stores a flag under the flag's own name, whatever the placeholder says
+     * (`--client <clientId>` -> `client`), so this is read as `client`; `clientId` stays for callers
+     * that build options by hand.
+     */
+    client?: string;
     clientId?: string;
     configPath?: string;
 };