@codacy/verity-cli 0.28.1-experimental.4d4616e → 0.28.1-experimental.4da2503

package/bin/verity.js

@@ -10636,14 +10636,14 @@ async function readGlobalCredential(remote) {
       const parsed = parseCredentialLine(line);
       if (parsed && parsed.remote === key) last = parsed.rec;
     }
-    if (last) return last;
+    if (last) return { ...last, keyed: true };
   }
   let plain = null;
   for (const line of lines) {
     const parsed = parseCredentialLine(line);
     if (parsed && parsed.remote === "") plain = parsed.rec;
   }
-  return plain;
+  return plain ? { ...plain, keyed: false } : null;
 }
 async function upsertGlobalCredential(remote, rec) {
   const path = globalCredentialsPath();
@@ -11218,7 +11218,13 @@ async function resolveToken(flagToken) {
   if (rec) {
     return {
       ok: true,
-      data: { token: rec.token, source: "global", userId: rec.userId, email: rec.email }
+      data: {
+        token: rec.token,
+        source: "global",
+        userId: rec.userId,
+        email: rec.email,
+        keyed: rec.keyed
+      }
     };
   }
   const local = await readLegacyLocalCredential();
@@ -11250,6 +11256,16 @@ function reverifyNudge(who) {
   }
   return null;
 }
+function isLegacyPerRepoCredential(auth2) {
+  return auth2.source === "local" || auth2.source === "global" && auth2.keyed === true;
+}
+async function shouldUpgradeOnLogin(auth2) {
+  if (!isLegacyPerRepoCredential(auth2)) return false;
+  if (auth2.userId == null) return true;
+  const bare = await readGlobalCredential("");
+  if (bare?.userId == null) return true;
+  return bare.userId === auth2.userId;
+}
 function authDenialRemedy(error) {
   if (error.startsWith("STALE_VERIFICATION")) {
     return {
@@ -11680,13 +11696,19 @@ function registerLoginCommand(program2) {
       const who = await whoami(existing.data.token, serviceUrl, globals.verbose);
       if (who.ok && who.data.logged_in) {
         const nudge = reverifyNudge(who.data);
-        if (!nudge) {
+        const upgrade = await shouldUpgradeOnLogin(existing.data);
+        if (!nudge && !upgrade) {
           printInfo(`Already logged in as ${who.data.email ?? `user #${who.data.user_id}`}. \u2713`);
           printInfo("  Re-authenticate with: verity login --force");
           return;
         }
-        printWarn(nudge);
-        printInfo("Re-verifying your repository access\u2026");
+        if (nudge) {
+          printWarn(nudge);
+          printInfo("Re-verifying your repository access\u2026");
+        } else {
+          printInfo("You are signed in with a per-repository token (the old format).");
+          printInfo("  Upgrading to a single login that covers every repository you can write to\u2026");
+        }
       } else if (who.ok && who.data.anonymous) {
         printInfo("You have an anonymous token (the gate runs, but nothing is saved). Logging you in\u2026");
       } else if (!who.ok) {
@@ -11737,14 +11759,24 @@ function registerLoginCommand(program2) {
       const rec = await readGlobalCredential(remote);
       if (rec && rec.token !== out.token) {
         const otherBackend = rec.serviceUrl != null && rec.serviceUrl !== out.serviceUrl;
+        const otherIdentity = rec.userId != null && out.userId != null && rec.userId !== out.userId;
         if (otherBackend) {
           printWarn(`  Note: this repository is pinned to a different Verity service (${rec.serviceUrl})`);
           printWarn("  by its own credential line, which takes precedence here \u2014 this login does not");
           printWarn("  change that. To move the repository, remove its line from ~/.verity/credentials.");
+          printWarn('  Until that line is removed, "verity login" here cannot fast-path and will run');
+          printWarn("  the full GitHub flow every time.");
+        } else if (otherIdentity) {
+          printWarn("  Note: this repository uses a different account's credential, which takes");
+          printWarn('  precedence here \u2014 this login leaves it in place, and "verity login" in this');
+          printWarn("  repository will report that account. Remove its line from ~/.verity/credentials");
+          printWarn("  only if you want this repository on the login you just completed.");
         } else {
           const kind = rec.userId != null ? "superseded per-repository" : "anonymous project-specific";
           printWarn(`  Note: this repository has a ${kind} credential that takes`);
           printWarn("  precedence here. Remove its line from ~/.verity/credentials to use your login.");
+          printWarn('  Until then, "verity login" in this repository re-runs the full GitHub flow');
+          printWarn("  every time.");
         }
       }
     }
@@ -16564,7 +16596,7 @@ function resolveTaskContext(opts) {
 // src/lib/cli-version.ts
 function cliVersion() {
   try {
-    return true ? "0.28.1-experimental.4d4616e" : "dev";
+    return true ? "0.28.1-experimental.4da2503" : "dev";
   } catch {
     return "dev";
   }
@@ -20672,7 +20704,7 @@ function registerTelemetryCommands(program2) {
 }
 
 // src/cli.ts
-program.name("verity").description("CLI for Verity quality gate service").version("0.28.1-experimental.4d4616e").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr").hook("preAction", async () => {
+program.name("verity").description("CLI for Verity quality gate service").version("0.28.1-experimental.4da2503").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr").hook("preAction", async () => {
   try {
     await foldLegacyLocalCredential();
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/verity-cli",
-  "version": "0.28.1-experimental.4d4616e",
+  "version": "0.28.1-experimental.4da2503",
   "description": "CLI for Verity quality gate service",
   "homepage": "https://verity.md",
   "bugs": {