@dropthis/cli 0.33.1 → 0.33.2

package/README.md

@@ -39,10 +39,10 @@ dropthis login verify --email you@example.com --otp 123456
 
 > A failed verify prints `Your code has expired` (`otp_expired`) or `That code is incorrect` (`otp_invalid`) and exits non-zero.
 
-Or pass both flags directly:
+To request a capability-scoped key (e.g. to manage teams), add `--scope` on `login verify`:
 
 ```bash
-dropthis login --email you@example.com --otp 123456
+dropthis login verify --email you@example.com --otp 123456 --scope team
 ```
 
 Credentials resolve in this order:

package/dist/cli.cjs

@@ -1136,7 +1136,7 @@ function spreadData(data) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "0.33.1" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.33.2" : "0.0.0-dev";
 
 // src/commands/doctor.ts
 async function onlineChecks(deps, hasCredential) {
@@ -1956,8 +1956,7 @@ async function runLoginInteractive(deps) {
   const authedClient = deps.createClient(session.data.token);
   const apiKey = await authedClient.apiKeys.create({
     label: "CLI",
-    type: "delegated",
-    ...deps.scope ? { scopes: [deps.scope] } : {}
+    type: "delegated"
   });
   if (apiKey.error) {
     prompts4.cancel(apiKey.error.message);
@@ -4144,51 +4143,26 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
       process.exitCode = result.exitCode;
     }
   );
-  program.command("login").description("Authenticate with email OTP").option("--email <email>", "Email address").option("--otp <otp>", "One-time passcode").option(
-    "--scope <scope>",
-    "Capability scope to request for the minted key (e.g. team)"
-  ).option("--json", "Force JSON output").action(
-    async (commandOptions) => {
-      if (!commandOptions.email || !commandOptions.otp) {
-        const deps2 = await commandDeps(program, options, store, commandOptions);
-        const global2 = globalOptions(program, commandOptions);
-        const stdinIsTTY = options.stdinIsTTY ?? process.stdin.isTTY ?? false;
-        if (!isInteractive(stdinIsTTY, deps2.env, global2)) {
-          process.exitCode = writeError(
-            deps2,
-            "invalid_usage",
-            "dropthis login is interactive and needs a terminal.",
-            "Set DROPTHIS_API_KEY, or run: dropthis login request --email <email>, then dropthis login verify --email <email> --otp <code>."
-          ).exitCode;
-          return;
-        }
-        const context = createContext({ global: global2 });
-        const result2 = await runLoginInteractive({
-          ...deps2,
-          createClient: (apiKey) => context.createClient(apiKey),
-          ...commandOptions.scope ? { scope: commandOptions.scope } : {}
-        });
-        process.exitCode = result2.exitCode;
-        return;
-      }
-      const deps = await commandDeps(program, options, store, commandOptions);
-      const global = globalOptions(program, commandOptions);
-      const verifyContext = createContext({ global });
-      const result = await runLoginVerify(
-        {
-          email: commandOptions.email,
-          otp: commandOptions.otp,
-          ...commandOptions.scope ? { scope: commandOptions.scope } : {},
-          ...commandOptions.json !== void 0 ? { json: commandOptions.json } : {}
-        },
-        {
-          ...deps,
-          createClient: (apiKey) => verifyContext.createClient(apiKey)
-        }
-      );
-      process.exitCode = result.exitCode;
+  program.command("login").description("Authenticate with email OTP (interactive)").option("--json", "Force JSON output").action(async (commandOptions) => {
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const global = globalOptions(program, commandOptions);
+    const stdinIsTTY = options.stdinIsTTY ?? process.stdin.isTTY ?? false;
+    if (!isInteractive(stdinIsTTY, deps.env, global)) {
+      process.exitCode = writeError(
+        deps,
+        "invalid_usage",
+        "dropthis login is interactive and needs a terminal.",
+        "Set DROPTHIS_API_KEY, or run: dropthis login request --email <email>, then dropthis login verify --email <email> --otp <code>."
+      ).exitCode;
+      return;
     }
-  );
+    const context = createContext({ global });
+    const result = await runLoginInteractive({
+      ...deps,
+      createClient: (apiKey) => context.createClient(apiKey)
+    });
+    process.exitCode = result.exitCode;
+  });
   const login = program.commands.find((command) => command.name() === "login");
   login?.command("request").description("Request an email OTP").requiredOption("--email <email>", "Email address").option("--json", "Force JSON output").action(async (commandOptions) => {
     const deps = await commandDeps(program, options, store, commandOptions);