@docyrus/docyrus 0.0.13 → 0.0.14

package/main.js

@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.13",
+  version: "0.0.14",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -125214,6 +125214,49 @@ async function resolveTenantIdSelector(params) {
   }
   return selector;
 }
+async function resolveClientId(params) {
+  const envClientId = getOptionalEnvValue(params.env, "DOCYRUS_API_CLIENT_ID");
+  const configuredClientId = await params.environmentConfigService.getDefaultClientId();
+  const globalConfiguredClientId = configuredClientId ? void 0 : await params.globalEnvironmentConfigService?.getDefaultClientId();
+  const resolvedClientId = params.requestedClientId || envClientId || configuredClientId || globalConfiguredClientId;
+  return {
+    configuredClientId,
+    globalConfiguredClientId,
+    resolvedClientId,
+    clientId: resolvedClientId || (params.allowManualFallback ? "manual-token" : void 0)
+  };
+}
+async function loginWithManualTokens(params) {
+  const manualAccessToken = params.accessToken.trim();
+  const manualRefreshToken = params.refreshToken?.trim();
+  if (!manualAccessToken) {
+    throw new UserInputError("accessToken is required.");
+  }
+  const resolvedClient = await resolveClientId({
+    requestedClientId: params.clientId,
+    env: params.env,
+    environmentConfigService: params.dependencies.environmentConfigService,
+    globalEnvironmentConfigService: params.dependencies.globalEnvironmentConfigService,
+    allowManualFallback: true
+  });
+  if (!resolvedClient.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 = params.dependencies.createAuthSessionService(params.apiBaseUrl);
+  const profile = await authSessionService.loginWithManualTokens({
+    clientId: resolvedClient.clientId,
+    accessToken: manualAccessToken,
+    refreshToken: manualRefreshToken || void 0,
+    scope: params.scope,
+    tokenType: "Bearer"
+  });
+  if (resolvedClient.resolvedClientId) {
+    await params.dependencies.environmentConfigService.setDefaultClientId(resolvedClient.resolvedClientId);
+  }
+  return profile;
+}
 function createAuthCli(dependencies) {
   const authCli = Cli_exports.create("auth", {
     description: "Authentication commands",
@@ -125234,32 +125277,36 @@ function createAuthCli(dependencies) {
       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 resolvedClientId = context.options.clientId || envClientId || configuredClientId || globalConfiguredClientId;
-      const clientId = resolvedClientId || (manualAccessToken ? "manual-token" : void 0);
+      const resolvedClient = await resolveClientId({
+        requestedClientId: context.options.clientId,
+        env: context.env,
+        environmentConfigService: dependencies.environmentConfigService,
+        globalEnvironmentConfigService: dependencies.globalEnvironmentConfigService,
+        allowManualFallback: Boolean(manualAccessToken)
+      });
+      const clientId = resolvedClient.clientId;
       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 = manualAccessToken ? await authSessionService.loginWithManualTokens({
-        clientId,
+      const profile = manualAccessToken ? await loginWithManualTokens({
+        apiBaseUrl,
         accessToken: manualAccessToken,
-        refreshToken: manualRefreshToken || void 0,
+        refreshToken: manualRefreshToken,
+        clientId: context.options.clientId,
         scope: context.options.scope,
-        tokenType: "Bearer"
-      }) : await authSessionService.loginWithDeviceFlow({
+        dependencies,
+        env: context.env
+      }) : await dependencies.createAuthSessionService(apiBaseUrl).loginWithDeviceFlow({
         clientId,
         scope: context.options.scope,
         onVerification: (verification) => {
           logVerificationHint(verification, context.agent, dependencies.onMessage);
         }
       });
-      if (resolvedClientId) {
-        await dependencies.environmentConfigService.setDefaultClientId(resolvedClientId);
+      if (!manualAccessToken && resolvedClient.resolvedClientId) {
+        await dependencies.environmentConfigService.setDefaultClientId(resolvedClient.resolvedClientId);
       }
       return await injectContext({
         apiBaseUrl,
@@ -125279,6 +125326,43 @@ function createAuthCli(dependencies) {
       });
     }
   });
+  authCli.command("set-tokens", {
+    description: "Set custom access and refresh tokens for the active environment",
+    options: external_exports.object({
+      clientId: external_exports.string().optional().describe("OAuth2 client id"),
+      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes"),
+      accessToken: external_exports.string().min(1).describe("Custom access token"),
+      refreshToken: external_exports.string().optional().describe("Custom refresh token")
+    }),
+    run: async (context) => {
+      const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const profile = await loginWithManualTokens({
+        apiBaseUrl,
+        accessToken: context.options.accessToken,
+        refreshToken: context.options.refreshToken,
+        clientId: context.options.clientId,
+        scope: context.options.scope,
+        dependencies,
+        env: context.env
+      });
+      return await injectContext({
+        apiBaseUrl,
+        authStore: dependencies.authStore,
+        payload: {
+          authenticated: true,
+          apiBaseUrl,
+          userId: profile.userId,
+          email: profile.email,
+          tenantId: profile.tenantId,
+          tenantName: profile.tenantName,
+          tenantNo: profile.tenantNo,
+          clientId: profile.clientId,
+          scope: profile.scope,
+          expiresAt: profile.expiresAt
+        }
+      });
+    }
+  });
   const accountsCli = Cli_exports.create("accounts", {
     description: "Account management",
     env: EnvSchema
@@ -128602,6 +128686,7 @@ var ROOT_HELP_COMMANDS = [
   { command: "env", description: "Show active environment and list environments" },
   { command: "env use <id|name>", description: "Switch active environment" },
   { command: "auth login", description: "Authenticate with OAuth2 device flow" },
+  { command: "auth set-tokens --accessToken <token>", description: "Save custom access and refresh tokens" },
   { command: "auth accounts list", description: "List saved user accounts" },
   { command: "auth tenants use <uuid|tenantNo>", description: "Switch active tenant for selected user" },
   { command: 'ai "<prompt>"', description: "Send a prompt to the default Docyrus CLI agent" },