@docyrus/docyrus 0.0.11 → 0.0.12

package/main.js

@@ -63633,7 +63633,7 @@ function buildInputSchema(args, env, options) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.11",
+  version: "0.0.12",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -64020,27 +64020,44 @@ function createAuthCli(dependencies) {
     description: "Authorize CLI using OAuth2 device flow",
     options: external_exports.object({
       clientId: external_exports.string().optional().describe("OAuth2 client id"),
-      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes")
+      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes"),
+      accessToken: external_exports.string().optional().describe("Manual access token; skips device flow"),
+      refreshToken: external_exports.string().optional().describe("Manual refresh token used with --accessToken")
     }),
     run: async (context) => {
       const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const manualAccessToken = context.options.accessToken?.trim();
+      const manualRefreshToken = context.options.refreshToken?.trim();
+      if (manualRefreshToken && !manualAccessToken) {
+        throw new UserInputError("refreshToken requires accessToken. Pass --accessToken when using --refreshToken.");
+      }
+      const envClientId = getOptionalEnvValue(context.env, "DOCYRUS_API_CLIENT_ID");
       const configuredClientId = await dependencies.environmentConfigService.getDefaultClientId();
       const globalConfiguredClientId = configuredClientId ? void 0 : await dependencies.globalEnvironmentConfigService?.getDefaultClientId();
-      const clientId = context.options.clientId || getOptionalEnvValue(context.env, "DOCYRUS_API_CLIENT_ID") || configuredClientId || globalConfiguredClientId;
+      const resolvedClientId = context.options.clientId || envClientId || configuredClientId || globalConfiguredClientId;
+      const clientId = resolvedClientId || (manualAccessToken ? "manual-token" : void 0);
       if (!clientId) {
         throw new UserInputError(
           "Client ID is required. Pass --clientId, set DOCYRUS_API_CLIENT_ID, or login once with --clientId to save it."
         );
       }
       const authSessionService = dependencies.createAuthSessionService(apiBaseUrl);
-      const profile = await authSessionService.loginWithDeviceFlow({
+      const profile = manualAccessToken ? await authSessionService.loginWithManualTokens({
+        clientId,
+        accessToken: manualAccessToken,
+        refreshToken: manualRefreshToken || void 0,
+        scope: context.options.scope,
+        tokenType: "Bearer"
+      }) : await authSessionService.loginWithDeviceFlow({
         clientId,
         scope: context.options.scope,
         onVerification: (verification) => {
           logVerificationHint(verification, context.agent, dependencies.onMessage);
         }
       });
-      await dependencies.environmentConfigService.setDefaultClientId(clientId);
+      if (resolvedClientId) {
+        await dependencies.environmentConfigService.setDefaultClientId(resolvedClientId);
+      }
       return await injectContext({
         apiBaseUrl,
         authStore: dependencies.authStore,
@@ -66282,6 +66299,7 @@ var ApiClient = class {
 };
 
 // src/services/authSession.ts
+var DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS = 3600;
 function isRecord5(value) {
   return typeof value === "object" && value !== null;
 }
@@ -66323,6 +66341,22 @@ var AuthSessionService = class {
       onVerification: options.onVerification
     });
   }
+  async loginWithManualTokens(options) {
+    const expiresIn = this.#resolveManualAccessTokenExpiresIn(options.accessToken);
+    const profile = await this.#buildProfileFromToken(
+      options.clientId,
+      {
+        accessToken: options.accessToken,
+        refreshToken: options.refreshToken,
+        tokenType: options.tokenType || "Bearer",
+        scope: options.scope,
+        expiresIn
+      },
+      {}
+    );
+    await this.#persistProfile(profile);
+    return profile;
+  }
   async getValidAccessToken() {
     const activeProfile = await this.params.authStore.getActiveProfile(this.#apiBaseUrl);
     if (!activeProfile) {
@@ -66517,9 +66551,7 @@ var AuthSessionService = class {
           expectedUserId: options.expectedUserId,
           expectedTenantId: options.expectedTenantId
         });
-        await this.params.authStore.upsertProfile(profile);
-        await this.#refreshTenantCatalog(profile.userId, profile.accessToken, profile.tenantId);
-        await this.params.authStore.setActiveAccountTenant(this.#apiBaseUrl, profile.userId, profile.tenantId);
+        await this.#persistProfile(profile);
         return profile;
       } catch (error48) {
         if (!(error48 instanceof ApiResponseError)) {
@@ -66658,6 +66690,11 @@ var AuthSessionService = class {
       lastUsedAt: nowIso
     });
   }
+  async #persistProfile(profile) {
+    await this.params.authStore.upsertProfile(profile);
+    await this.#refreshTenantCatalog(profile.userId, profile.accessToken, profile.tenantId);
+    await this.params.authStore.setActiveAccountTenant(this.#apiBaseUrl, profile.userId, profile.tenantId);
+  }
   async #ensureProfileAccessToken(profile) {
     if (!this.#isExpired(profile.expiresAt)) {
       return profile;
@@ -66773,6 +66810,32 @@ var AuthSessionService = class {
   #now() {
     return this.params.now ? this.params.now() : Date.now();
   }
+  #resolveManualAccessTokenExpiresIn(accessToken) {
+    const token = accessToken.trim();
+    if (!token) {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    const parts = token.split(".");
+    if (parts.length < 2) {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    try {
+      const payloadSegment = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+      const paddingLength = payloadSegment.length % 4;
+      const paddedPayload = paddingLength === 0 ? payloadSegment : payloadSegment.padEnd(payloadSegment.length + (4 - paddingLength), "=");
+      const decodedPayload = Buffer.from(paddedPayload, "base64").toString("utf8");
+      const parsedPayload = JSON.parse(decodedPayload);
+      if (typeof parsedPayload.exp === "number" && Number.isFinite(parsedPayload.exp)) {
+        const remainingSeconds = Math.floor(parsedPayload.exp - this.#now() / 1e3);
+        if (remainingSeconds > 0) {
+          return remainingSeconds;
+        }
+      }
+    } catch {
+      return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+    }
+    return DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS;
+  }
 };
 
 // src/services/authStore.ts