@clipdone/cli 0.1.1 → 0.1.3

package/bin/clipdone.js

@@ -148,8 +148,9 @@ var OAUTH_AUTHORIZE_PATH = "/api/auth/oauth2/authorize";
 var OAUTH_REGISTER_PATH = "/api/auth/oauth2/register";
 var OAUTH_TOKEN_PATH = "/api/auth/oauth2/token";
 var OAUTH_REVOKE_PATH = "/api/auth/oauth2/revoke";
-var OAUTH_CLIENT_REGISTRATION_VERSION = 2;
+var OAUTH_CLIENT_REGISTRATION_VERSION = 3;
 var OAUTH_LOOPBACK_PORTS = [59852, 59853, 59854, 59855, 59856, 59857, 59858, 59859];
+var OAUTH_CALLBACK_PATH = "/agents/callback";
 var PRODUCTION_APP_URL = "https://app.clipdone.app";
 var LOCAL_APP_URL = "http://localhost:3000";
 var REQUEST_TIMEOUT_MS = 15e3;
@@ -241,6 +242,13 @@ function clearStoredAuth() {
   delete config.token;
   delete config.tokenExpiresAt;
   delete config.oauth;
+  delete config.oauthClient;
+  writeConfig(config);
+}
+function clearStoredOAuthClientRegistration() {
+  const config = readConfig();
+  if (!config.oauthClient) return;
+  delete config.oauthClient;
   writeConfig(config);
 }
 function readStoredOAuthClientRegistration(scope, resource) {
@@ -530,7 +538,7 @@ async function oauthRegisterClient({ scope }) {
       },
       body: JSON.stringify({
         client_name: "ClipDone CLI",
-        redirect_uris: OAUTH_LOOPBACK_PORTS.map((port) => `http://127.0.0.1:${port}/callback`),
+        redirect_uris: [new URL(OAUTH_CALLBACK_PATH, appBase()).toString()],
         grant_types: ["authorization_code", "refresh_token"],
         response_types: ["code"],
         token_endpoint_auth_method: "none",
@@ -558,10 +566,14 @@ async function oauthRegisterClient({ scope }) {
   return { clientId };
 }
 async function resolveOAuthClient(authConfig) {
+  const activeSession = readStoredOAuthSession();
   const cached = readStoredOAuthClientRegistration(authConfig?.scope, authConfig?.resource);
-  if (cached) {
+  if (cached && activeSession?.clientId === cached.clientId) {
     return cached;
   }
+  if (cached) {
+    clearStoredOAuthClientRegistration();
+  }
   const registered = await oauthRegisterClient({ scope: authConfig.scope });
   writeStoredOAuthClientRegistration(registered.clientId, authConfig.scope, authConfig.resource);
   return registered;
@@ -944,6 +956,9 @@ function parseLegacyCommand(args, parts) {
 }
 function parseTopLevelCommand(args) {
   const parts = Array.isArray(args._) ? args._ : [];
+  if (args.version === true || parts[0] === "version") {
+    return { key: "version" };
+  }
   if (parts.length === 0 || parts[0] === "help") {
     return { key: "help" };
   }
@@ -1033,6 +1048,7 @@ function printHelp() {
   writeLine();
   writeLine("Useful options:");
   writeLine("  --help                             Show command help");
+  writeLine("  --version                          Show the installed CLI version");
   if (devHelp) {
     writeLine();
     writeLine("Development target options:");
@@ -1049,6 +1065,10 @@ function readJsonFile(filePath) {
     throw new Error(`Could not read JSON from ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
+function cliVersion() {
+  const packageJson = readJsonFile(join(BIN_DIR, "..", "package.json"));
+  return normalizeString(packageJson?.version) || "0.0.0";
+}
 function normalizeFeedbackNotes(value) {
   if (!value) return [];
   if (Array.isArray(value)) return value;
@@ -1095,6 +1115,16 @@ function base64UrlEncode(bytes) {
 function randomState() {
   return base64UrlEncode(webcrypto.getRandomValues(new Uint8Array(24)));
 }
+function buildOAuthState(csrfState, localRedirectUri) {
+  return base64UrlEncode(
+    new TextEncoder().encode(
+      JSON.stringify({
+        csrfState,
+        localRedirectUri
+      })
+    )
+  );
+}
 function generateCodeVerifier() {
   return base64UrlEncode(webcrypto.getRandomValues(new Uint8Array(48)));
 }
@@ -1128,11 +1158,13 @@ async function listenOnLoopbackPort() {
 async function login(args) {
   const authConfig = { resource: API_OAUTH_RESOURCE, scope: API_OAUTH_SCOPES.join(" ") };
   const oauthClient = await resolveOAuthClient(authConfig);
-  const state = randomState();
+  const csrfState = randomState();
   const codeVerifier = generateCodeVerifier();
   const codeChallenge = await generateCodeChallenge(codeVerifier);
   const { server, port } = await listenOnLoopbackPort();
-  const redirectUri = `http://127.0.0.1:${port}/callback`;
+  const localRedirectUri = `http://127.0.0.1:${port}/callback`;
+  const state = buildOAuthState(csrfState, localRedirectUri);
+  const redirectUri = new URL(OAUTH_CALLBACK_PATH, appBase()).toString();
   const authUrl = new URL(OAUTH_AUTHORIZE_PATH, appBase());
   authUrl.searchParams.set("client_id", oauthClient.clientId);
   authUrl.searchParams.set("response_type", "code");
@@ -1155,7 +1187,7 @@ async function login(args) {
     }, 5 * 60 * 1e3);
     server.on("request", async (req, res) => {
       try {
-        const url = new URL(req.url || "/", redirectUri);
+        const url = new URL(req.url || "/", localRedirectUri);
         if (url.pathname !== "/callback") {
           res.writeHead(404).end("Not found");
           return;
@@ -1321,6 +1353,10 @@ async function main() {
     printHelp();
     return;
   }
+  if (command === "version") {
+    writeLine(cliVersion());
+    return;
+  }
   if (command === "login") return await login(args);
   if (command === "logout") {
     if (!hasStoredAuth()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipdone/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Command line access to ClipDone projects and exports",
   "license": "UNLICENSED",
   "type": "module",