@edgible-team/cli 1.2.6 → 1.2.9

package/dist/commands/utils/application-prompt.js

@@ -0,0 +1,79 @@
+"use strict";
+/**
+ * Shared application selection utilities
+ * Eliminates duplication across commands
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptApplicationSelection = promptApplicationSelection;
+exports.getApplicationId = getApplicationId;
+exports.validateApplicationExists = validateApplicationExists;
+const inquirer_1 = __importDefault(require("inquirer"));
+const chalk_1 = __importDefault(require("chalk"));
+/**
+ * Prompt user to select an application from available applications
+ */
+async function promptApplicationSelection(applicationService, options = {}) {
+    const { allowNone = false, message = 'Select application:', required = true } = options;
+    try {
+        const applications = await applicationService.getApplications();
+        if (applications.length === 0) {
+            if (allowNone) {
+                return null;
+            }
+            console.log(chalk_1.default.yellow('⚠ No applications configured'));
+            console.log(chalk_1.default.gray('Use "edgible application create" to create an application'));
+            if (required) {
+                throw new Error('No applications available');
+            }
+            return null;
+        }
+        const applicationChoices = applications.map((app) => ({
+            name: `${app.name} (${app.id})${app.description ? ` - ${app.description}` : ''}`,
+            value: app.id,
+        }));
+        if (allowNone) {
+            applicationChoices.push({
+                name: 'None',
+                value: '',
+            });
+        }
+        const answer = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'applicationId',
+                message,
+                choices: applicationChoices,
+            },
+        ]);
+        return answer.applicationId === '' ? null : answer.applicationId;
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('Error listing applications:'), error instanceof Error ? error.message : 'Unknown error');
+        throw error;
+    }
+}
+/**
+ * Get application ID, or prompt if not provided
+ */
+async function getApplicationId(applicationService, providedId, options = {}) {
+    if (providedId) {
+        return providedId;
+    }
+    return await promptApplicationSelection(applicationService, options);
+}
+/**
+ * Validate application exists
+ */
+async function validateApplicationExists(applicationService, applicationId) {
+    try {
+        await applicationService.getApplication(applicationId);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=application-prompt.js.map

package/dist/commands/utils/config-validator.d.ts

@@ -2,7 +2,7 @@
  * Configuration validation utilities
  * Centralizes config validation logic
  */
-import { ConfigRepository } from '../../repositories/config-repository';
+import { ConfigManager } from '../../state/config';
 export interface ValidationOptions {
     requireAuth?: boolean;
     requireOrganization?: boolean;
@@ -13,17 +13,17 @@ export interface ValidationOptions {
 /**
  * Validate configuration based on requirements
  */
-export declare function validateConfig(configRepository: ConfigRepository, options?: ValidationOptions): void;
+export declare function validateConfig(configManager: ConfigManager, options?: ValidationOptions): void;
 /**
  * Get organization ID or throw error
  */
-export declare function requireOrganizationId(configRepository: ConfigRepository): string;
+export declare function requireOrganizationId(configManager: ConfigManager): string;
 /**
  * Get device ID or throw error
  */
-export declare function requireDeviceId(configRepository: ConfigRepository): string;
+export declare function requireDeviceId(configManager: ConfigManager): string;
 /**
  * Get email or throw error
  */
-export declare function requireEmail(configRepository: ConfigRepository): string;
+export declare function requireEmail(configManager: ConfigManager): string;
 //# sourceMappingURL=config-validator.d.ts.map

package/dist/commands/utils/config-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-validator.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/config-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAGxE,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,GAAE,iBAAsB,GAC9B,IAAI,CA2CN;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,MAAM,CAMhF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,MAAM,CAM1E;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,MAAM,CAMvE"}
+{"version":3,"file":"config-validator.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/config-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,GAAE,iBAAsB,GAC9B,IAAI,CA2CN;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAM1E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAMpE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAMjE"}

package/dist/commands/utils/config-validator.js

@@ -12,9 +12,9 @@ const errors_1 = require("../../utils/errors");
 /**
  * Validate configuration based on requirements
  */
-function validateConfig(configRepository, options = {}) {
+function validateConfig(configManager, options = {}) {
     const { requireAuth = false, requireOrganization = false, requireDeviceId = false, requireEmail = false, requireAwsProfile = false, } = options;
-    const config = configRepository.getConfig();
+    const config = configManager.getConfig();
     if (requireAuth) {
         const hasTokens = !!(config.accessToken || config.idToken);
         const hasDeviceCreds = !!(config.deviceId && config.devicePassword);
@@ -46,8 +46,8 @@ function validateConfig(configRepository, options = {}) {
 /**
  * Get organization ID or throw error
  */
-function requireOrganizationId(configRepository) {
-    const config = configRepository.getConfig();
+function requireOrganizationId(configManager) {
+    const config = configManager.getConfig();
     if (!config.organizationId) {
         throw new errors_1.ConfigError('No organization ID found. Please login first.');
     }
@@ -56,8 +56,8 @@ function requireOrganizationId(configRepository) {
 /**
  * Get device ID or throw error
  */
-function requireDeviceId(configRepository) {
-    const config = configRepository.getConfig();
+function requireDeviceId(configManager) {
+    const config = configManager.getConfig();
     if (!config.deviceId) {
         throw new errors_1.ConfigError('No device ID found. Please login first.');
     }
@@ -66,8 +66,8 @@ function requireDeviceId(configRepository) {
 /**
  * Get email or throw error
  */
-function requireEmail(configRepository) {
-    const config = configRepository.getConfig();
+function requireEmail(configManager) {
+    const config = configManager.getConfig();
     if (!config.email) {
         throw new errors_1.ConfigError('No email found in configuration.');
     }

package/dist/commands/utils/output-formatter.d.ts

@@ -19,6 +19,7 @@ export declare function formatApplication(app: {
     workloadId?: string;
     createdAt: string;
     description?: string;
+    url?: string;
 }): string;
 /**
  * Format gateway output

package/dist/commands/utils/output-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output-formatter.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/output-formatter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAqBT;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE;IACrC,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,WAAW,CAAC,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,MAAM,CAuBT;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAC1B,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,EAC9C,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAgBR;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAMxE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD"}
+{"version":3,"file":"output-formatter.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/output-formatter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,CAqBT;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE;IACrC,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,WAAW,CAAC,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,MAAM,CAuBT;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAC1B,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,EAC9C,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAgBR;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAMxE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD"}

package/dist/commands/utils/output-formatter.js

@@ -35,7 +35,7 @@ function formatApplication(app) {
     if (app.description) {
         output += chalk_1.default.gray(`   Description: ${app.description}\n`);
     }
-    output += chalk_1.default.cyan(`   URL: ${app.protocol}://${app.servingIp}:${app.port}\n`);
+    output += chalk_1.default.cyan(`   URL: ${app.url}\n`);
     return output;
 }
 /**

package/dist/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const errors_1 = require("./utils/errors");
 const output_1 = require("./utils/output");
-const bindings_1 = require("./di/bindings");
 const application_1 = require("./commands/application");
 const gateway_1 = require("./commands/gateway");
 const auth_1 = require("./commands/auth");
@@ -15,8 +14,6 @@ const ai_1 = require("./commands/ai");
 const agent_1 = require("./commands/agent");
 const debug_1 = require("./commands/debug");
 const managedGateway_1 = require("./commands/managedGateway");
-// Initialize dependency injection container
-(0, bindings_1.initializeContainer)();
 const program = new commander_1.Command();
 // Set up the CLI
 program

package/dist/services/agentDeployment/AgentDeploymentService.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Agent Deployment Service
+ *
+ * Handles agent configuration generation and deployment logic.
+ * This is a focused service extracted from the EdgibleService god object.
+ */
+import { EdgibleService } from '../edgible';
+export interface AgentDeploymentService {
+    /**
+     * Generate agent user data for cloud-init
+     */
+    generateAgentUserData(deviceId: string): string;
+    /**
+     * Generate agent configuration code
+     */
+    generateAgentCode(deviceId: string): string;
+    /**
+     * Resync agent on a gateway
+     */
+    resyncGatewayAgent(gatewayId: string, agentVersion?: string, installFromLocal?: boolean): Promise<any>;
+}
+/**
+ * Implementation of AgentDeploymentService
+ *
+ * Currently delegates to EdgibleService for backward compatibility.
+ * In Phase 3, we'll extract the actual implementation.
+ */
+export declare class AgentDeploymentServiceImpl implements AgentDeploymentService {
+    private edgibleService;
+    constructor(edgibleService: EdgibleService);
+    generateAgentUserData(deviceId: string): string;
+    generateAgentCode(deviceId: string): string;
+    resyncGatewayAgent(gatewayId: string, agentVersion?: string, installFromLocal?: boolean): Promise<any>;
+}
+//# sourceMappingURL=AgentDeploymentService.d.ts.map

package/dist/services/agentDeployment/AgentDeploymentService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AgentDeploymentService.d.ts","sourceRoot":"","sources":["../../../src/services/agentDeployment/AgentDeploymentService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhD;;OAEG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5C;;OAEG;IACH,kBAAkB,CAChB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,OAAO,GACzB,OAAO,CAAC,GAAG,CAAC,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,YAAW,sBAAsB;IAC3D,OAAO,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;IAElD,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAM/C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAMrC,kBAAkB,CACtB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,OAAO,GACzB,OAAO,CAAC,GAAG,CAAC;CAGhB"}

package/dist/services/agentDeployment/AgentDeploymentService.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * Agent Deployment Service
+ *
+ * Handles agent configuration generation and deployment logic.
+ * This is a focused service extracted from the EdgibleService god object.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AgentDeploymentServiceImpl = void 0;
+/**
+ * Implementation of AgentDeploymentService
+ *
+ * Currently delegates to EdgibleService for backward compatibility.
+ * In Phase 3, we'll extract the actual implementation.
+ */
+class AgentDeploymentServiceImpl {
+    constructor(edgibleService) {
+        this.edgibleService = edgibleService;
+    }
+    generateAgentUserData(deviceId) {
+        // Access the private method via type assertion (temporary hack)
+        // In Phase 3, we'll properly extract this
+        return this.edgibleService.generateAgentUserData(deviceId);
+    }
+    generateAgentCode(deviceId) {
+        // Access the private method via type assertion (temporary hack)
+        // In Phase 3, we'll properly extract this
+        return this.edgibleService.generateAgentCode(deviceId);
+    }
+    async resyncGatewayAgent(gatewayId, agentVersion, installFromLocal) {
+        return this.edgibleService.resyncGatewayAgent(gatewayId, agentVersion, installFromLocal);
+    }
+}
+exports.AgentDeploymentServiceImpl = AgentDeploymentServiceImpl;
+//# sourceMappingURL=AgentDeploymentService.js.map

package/dist/services/application/ApplicationService.d.ts

@@ -3,8 +3,9 @@
  * Handles application management operations
  */
 import { Application, Workload } from '../../detection/WorkloadDetector';
-import { ConfigRepository } from '../../repositories/config-repository';
+import { ConfigManager } from '../../state/config';
 import { AuthService } from '../auth/AuthService';
+import { TokenManager } from '../token/TokenManager';
 import { Logger } from '../../utils/logger';
 export interface ApplicationService {
     setupApplication(workload: Workload, port: number, protocol: 'http' | 'https' | 'tcp' | 'udp', description?: string, gatewayId?: string): Promise<Application>;
@@ -36,13 +37,13 @@ export interface ApplicationService {
 }
 export declare class ApplicationServiceImpl implements ApplicationService {
     private apiClient;
-    private configRepository;
+    private configManager;
     private authService;
+    private tokenManager;
     private logger;
     private baseUrl;
     private applications;
-    constructor(baseUrl: string, configRepository: ConfigRepository, authService: AuthService, logger: Logger);
-    private restoreTokensFromApiClient;
+    constructor(baseUrl: string, configManager: ConfigManager, authService: AuthService, tokenManager: TokenManager, logger: Logger);
     private generateServingIp;
     setupApplication(workload: Workload, port: number, protocol?: 'http' | 'https' | 'tcp' | 'udp', description?: string, gatewayId?: string): Promise<Application>;
     getApplications(): Promise<Application[]>;

package/dist/services/application/ApplicationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationService.d.ts","sourceRoot":"","sources":["../../../src/services/application/ApplicationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApplicationService.d.ts","sourceRoot":"","sources":["../../../src/services/application/ApplicationService.ts"],"names":[],"mappings":"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"}

package/dist/services/application/ApplicationService.js

@@ -7,28 +7,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationServiceImpl = void 0;
 const client_1 = require("../../client");
 class ApplicationServiceImpl {
-    constructor(baseUrl, configRepository, authService, logger) {
+    constructor(baseUrl, configManager, authService, tokenManager, logger) {
         this.applications = [];
         this.baseUrl = baseUrl;
-        this.configRepository = configRepository;
+        this.configManager = configManager;
         this.authService = authService;
+        this.tokenManager = tokenManager;
         this.logger = logger;
         this.apiClient = (0, client_1.createApiClient)(baseUrl);
-        this.restoreTokensFromApiClient();
-    }
-    restoreTokensFromApiClient() {
-        const accessToken = this.authService.getAccessToken();
-        const idToken = this.authService.getIdToken();
-        const refreshToken = this.authService.getRefreshToken();
-        if (accessToken) {
-            this.apiClient.setAccessToken(accessToken);
-        }
-        if (idToken) {
-            this.apiClient.setIdToken(idToken);
-        }
-        if (refreshToken) {
-            this.apiClient.setRefreshToken(refreshToken);
-        }
+        this.tokenManager.restoreTokensFromConfig(this.apiClient);
     }
     generateServingIp() {
         // Generate a mock IP in the 10.x.x.x range
@@ -41,11 +28,11 @@ class ApplicationServiceImpl {
     async setupApplication(workload, port, protocol = 'http', description, gatewayId) {
         try {
             // Attempt auto re-login if tokens are missing but credentials are available
-            await this.authService.attemptAutoRelogin();
-            this.restoreTokensFromApiClient();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
+            this.tokenManager.restoreTokensFromConfig(this.apiClient);
             this.logger.info(`Setting up application for workload: ${workload.name}`);
             // Get organization ID from config
-            const config = this.configRepository.getConfig();
+            const config = this.configManager.getConfig();
             if (!config.organizationId) {
                 throw new Error('No organization ID found. Please login first.');
             }
@@ -97,10 +84,10 @@ class ApplicationServiceImpl {
     async getApplications() {
         try {
             // Attempt auto re-login if tokens are missing but credentials are available
-            await this.authService.attemptAutoRelogin();
-            this.restoreTokensFromApiClient();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
+            this.tokenManager.restoreTokensFromConfig(this.apiClient);
             this.logger.debug('Getting applications');
-            const config = this.configRepository.getConfig();
+            const config = this.configManager.getConfig();
             let organizationId;
             // Check if we have an organization ID in the config (device login)
             if (config.organizationId) {
@@ -251,8 +238,8 @@ class ApplicationServiceImpl {
     async deleteApplication(id) {
         try {
             // Attempt auto re-login if tokens are missing but credentials are available
-            await this.authService.attemptAutoRelogin();
-            this.restoreTokensFromApiClient();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
+            this.tokenManager.restoreTokensFromConfig(this.apiClient);
             this.logger.info(`Deleting application: ${id}`);
             await this.apiClient.deleteApplication(id);
             this.logger.info('Application deleted successfully', { applicationId: id });
@@ -266,9 +253,9 @@ class ApplicationServiceImpl {
     async createApplicationProgrammatically(params) {
         try {
             // Attempt auto re-login if tokens are missing but credentials are available
-            await this.authService.attemptAutoRelogin();
-            this.restoreTokensFromApiClient();
-            const config = this.configRepository.getConfig();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
+            this.tokenManager.restoreTokensFromConfig(this.apiClient);
+            const config = this.configManager.getConfig();
             if (!config.organizationId) {
                 throw new Error('Not logged in. Please run "edgible login" first.');
             }
@@ -317,7 +304,7 @@ class ApplicationServiceImpl {
      */
     async listApiKeys(applicationId) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             const response = await this.apiClient.listApplicationApiKeys(applicationId);
             return response.keys || [];
         }
@@ -331,7 +318,7 @@ class ApplicationServiceImpl {
      */
     async createApiKey(applicationId, name, expiresAt) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             const response = await this.apiClient.createApplicationApiKey(applicationId, name, expiresAt);
             return response;
         }
@@ -345,7 +332,7 @@ class ApplicationServiceImpl {
      */
     async deleteApiKey(applicationId, keyId) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             await this.apiClient.deleteApplicationApiKey(applicationId, keyId);
         }
         catch (error) {
@@ -358,7 +345,7 @@ class ApplicationServiceImpl {
      */
     async listShortCodes(applicationId) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             const response = await this.apiClient.listApplicationShortCodes(applicationId);
             return response.codes || [];
         }
@@ -372,7 +359,7 @@ class ApplicationServiceImpl {
      */
     async createShortCode(applicationId, name, expiresAt, maxUses) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             const response = await this.apiClient.createApplicationShortCode(applicationId, name, expiresAt, maxUses);
             return response;
         }
@@ -386,7 +373,7 @@ class ApplicationServiceImpl {
      */
     async updateShortCode(applicationId, codeId, updates) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             const response = await this.apiClient.updateApplicationShortCode(applicationId, codeId, updates);
             return response;
         }
@@ -400,7 +387,7 @@ class ApplicationServiceImpl {
      */
     async deleteShortCode(applicationId, codeId) {
         try {
-            await this.authService.attemptAutoRelogin();
+            await this.tokenManager.ensureValidToken(this.apiClient, this.authService.loginDevice.bind(this.authService));
             await this.apiClient.deleteApplicationShortCode(applicationId, codeId);
         }
         catch (error) {

package/dist/services/auth/AuthService.d.ts

@@ -4,7 +4,8 @@
  */
 import { LoginResponse } from '../../client';
 import { CreateDeviceWithOrphanedOrganizationResponse, GetUserOrganizationsResponse } from '../../types/ApiResponses';
-import { ConfigRepository } from '../../repositories/config-repository';
+import { ConfigManager } from '../../state/config';
+import { TokenManager } from '../token/TokenManager';
 import { Logger } from '../../utils/logger';
 export interface AuthService {
     loginUser(email: string, password: string): Promise<LoginResponse>;
@@ -21,13 +22,12 @@ export interface AuthService {
 }
 export declare class AuthServiceImpl implements AuthService {
     private apiClient;
-    private configRepository;
+    private configManager;
+    private tokenManager;
     private logger;
     private baseUrl;
-    constructor(baseUrl: string, configRepository: ConfigRepository, logger: Logger);
-    private restoreTokensFromConfig;
+    constructor(baseUrl: string, configManager: ConfigManager, tokenManager: TokenManager, logger: Logger);
     attemptAutoRelogin(): Promise<boolean>;
-    private saveTokensToConfig;
     loginUser(email: string, password: string): Promise<LoginResponse>;
     createDeviceWithOrganization(deviceName: string, password: string, userEmail?: string): Promise<CreateDeviceWithOrphanedOrganizationResponse>;
     checkAccount(email: string): Promise<boolean>;

package/dist/services/auth/AuthService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthService.d.ts","sourceRoot":"","sources":["../../../src/services/auth/AuthService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAA4C,aAAa,EAAE,MAAM,cAAc,CAAC;AAEvF,OAAO,EAAE,4CAA4C,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAEtH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACnE,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACxE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9E,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,4CAA4C,CAAC,CAAC;IACzD,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC3E,cAAc,IAAI,MAAM,GAAG,SAAS,CAAC;IACrC,UAAU,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;IACtC,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAAS;gBAGtB,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM;IAShB,OAAO,CAAC,uBAAuB;IAsBzB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAkB5C,OAAO,CAAC,kBAAkB;IAkBpB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYlE,4BAA4B,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,4CAA4C,CAAC;IA0BlD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYvE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C7E,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1D,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,UAAU,IAAI,MAAM,GAAG,SAAS;IAIhC,eAAe,IAAI,MAAM,GAAG,SAAS;IAI/B,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAQjF"}
+{"version":3,"file":"AuthService.d.ts","sourceRoot":"","sources":["../../../src/services/auth/AuthService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAA4C,aAAa,EAAE,MAAM,cAAc,CAAC;AAEvF,OAAO,EAAE,4CAA4C,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAEtH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACnE,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACxE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9E,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,4CAA4C,CAAC,CAAC;IACzD,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC3E,cAAc,IAAI,MAAM,GAAG,SAAS,CAAC;IACrC,UAAU,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;IACtC,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAAS;gBAGtB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAUV,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAOtC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYlE,4BAA4B,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,4CAA4C,CAAC;IA0BlD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYvE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C7E,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1D,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,UAAU,IAAI,MAAM,GAAG,SAAS;IAIhC,eAAe,IAAI,MAAM,GAAG,SAAS;IAI/B,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAQjF"}

package/dist/services/auth/AuthService.js

@@ -8,70 +8,22 @@ exports.AuthServiceImpl = void 0;
 const client_1 = require("../../client");
 const passwordValidation_1 = require("../../utils/passwordValidation");
 class AuthServiceImpl {
-    constructor(baseUrl, configRepository, logger) {
+    constructor(baseUrl, configManager, tokenManager, logger) {
         this.baseUrl = baseUrl;
-        this.configRepository = configRepository;
+        this.configManager = configManager;
+        this.tokenManager = tokenManager;
         this.logger = logger;
         this.apiClient = (0, client_1.createApiClient)(baseUrl);
-        this.restoreTokensFromConfig();
-    }
-    restoreTokensFromConfig() {
-        const config = this.configRepository.getConfig();
-        if (config.accessToken) {
-            this.apiClient.setAccessToken(config.accessToken);
-        }
-        if (config.idToken) {
-            this.apiClient.setIdToken(config.idToken);
-        }
-        if (config.refreshToken) {
-            this.apiClient.setRefreshToken(config.refreshToken);
-        }
-        //
-        // this.logger.debug('Token restoration', {
-        //   hasAccessToken: !!config.accessToken,
-        //   hasIdToken: !!config.idToken,
-        //   hasRefreshToken: !!config.refreshToken,
-        //   organizationId: config.organizationId,
-        //   deviceId: config.deviceId,
-        // });
+        this.tokenManager.restoreTokensFromConfig(this.apiClient);
     }
     async attemptAutoRelogin() {
-        const config = this.configRepository.getConfig();
-        // If no tokens but we have device credentials, attempt automatic re-login
-        if (!config.idToken && !config.accessToken && config.deviceId && config.devicePassword) {
-            this.logger.debug('No tokens available, attempting automatic device re-login');
-            try {
-                await this.loginDevice(config.deviceId, config.devicePassword);
-                this.logger.debug('Automatic re-login successful');
-                return true;
-            }
-            catch (error) {
-                this.logger.warn('Automatic re-login failed', error instanceof Error ? error.message : String(error));
-                return false;
-            }
-        }
-        return false;
-    }
-    saveTokensToConfig() {
-        const accessToken = this.apiClient.getAccessToken();
-        const idToken = this.apiClient.getIdToken();
-        const refreshToken = this.apiClient.getRefreshToken();
-        this.logger.debug('Saving tokens', {
-            hasAccessToken: !!accessToken,
-            hasIdToken: !!idToken,
-            hasRefreshToken: !!refreshToken,
-        });
-        this.configRepository.updateConfig({
-            accessToken,
-            idToken,
-            refreshToken,
-        });
+        return this.tokenManager.ensureValidToken(this.apiClient, this.loginDevice.bind(this));
     }
     async loginUser(email, password) {
         try {
             const loginRequest = { email, password };
             const response = await this.apiClient.login(loginRequest);
-            this.saveTokensToConfig();
+            this.tokenManager.saveTokensToConfig(this.apiClient);
             return response;
         }
         catch (error) {
@@ -131,7 +83,7 @@ class AuthServiceImpl {
         try {
             const loginRequest = { email: deviceId, password };
             const response = await this.apiClient.login(loginRequest);
-            this.saveTokensToConfig();
+            this.tokenManager.saveTokensToConfig(this.apiClient);
             return response;
         }
         catch (error) {
@@ -184,7 +136,7 @@ class AuthServiceImpl {
     async refreshToken(refreshToken) {
         try {
             const response = await this.apiClient.refreshToken({ refreshToken });
-            this.saveTokensToConfig();
+            this.tokenManager.saveTokensToConfig(this.apiClient);
             return response;
         }
         catch (error) {
@@ -193,13 +145,13 @@ class AuthServiceImpl {
         }
     }
     getAccessToken() {
-        return this.apiClient.getAccessToken();
+        return this.tokenManager.getAccessToken();
     }
     getIdToken() {
-        return this.apiClient.getIdToken();
+        return this.tokenManager.getIdToken();
     }
     getRefreshToken() {
-        return this.apiClient.getRefreshToken();
+        return this.tokenManager.getRefreshToken();
     }
     async getUserOrganizations(email) {
         try {