@dishantlangayan/sc-cli-core 0.6.0 → 0.7.1

package/lib/auth/broker-auth-manager.d.ts

@@ -53,6 +53,11 @@ export declare class BrokerAuthManager {
      * @returns Broker configuration or null if not found
      */
     getBroker(name: string): Promise<BrokerAuth | null>;
+    /**
+     * Get the default broker
+     * @returns Default broker or null if no default is set
+     */
+    getDefaultBroker(): Promise<BrokerAuth | null>;
     /**
      * Initialize the auth manager with encryption key derived from OS keychain and machine ID
      */
@@ -67,6 +72,11 @@ export declare class BrokerAuthManager {
      * @param name - Broker name to remove
      */
     removeBroker(name: string): Promise<void>;
+    /**
+     * Set a broker as the default
+     * @param name - Broker name to set as default
+     */
+    setDefaultBroker(name: string): Promise<void>;
     /**
      * Update existing broker configuration
      * @param name - Broker name to update
@@ -90,6 +100,10 @@ export declare class BrokerAuthManager {
      * Save storage to encrypted file
      */
     private saveStorage;
+    /**
+     * Unset the default flag on all brokers
+     */
+    private unsetAllDefaults;
     /**
      * Validate broker configuration
      * @param broker - Broker to validate

package/lib/auth/broker-auth-manager.js

@@ -49,6 +49,10 @@ export class BrokerAuthManager {
         if (existing) {
             throw new BrokerAuthError(`Broker '${broker.name}' already exists`, BrokerAuthErrorCode.BROKER_ALREADY_EXISTS);
         }
+        // If this broker is being set as default, unset any existing default
+        if (broker.isDefault) {
+            this.unsetAllDefaults();
+        }
         // Add broker
         this.storage.brokers.push(broker);
         // Save to file
@@ -84,7 +88,7 @@ export class BrokerAuthManager {
             throw new BrokerAuthError(`Broker '${brokerName}' not found`, BrokerAuthErrorCode.BROKER_NOT_FOUND);
         }
         const baseURL = `${broker.sempEndpoint}:${broker.sempPort}`;
-        const accessToken = broker.accessToken;
+        const { accessToken } = broker;
         return new ScConnection(baseURL, accessToken, {
             apiType: 'semp',
             authType: broker.authType === AuthType.BASIC ? 'basic' : 'bearer',
@@ -109,6 +113,15 @@ export class BrokerAuthManager {
         const broker = this.storage.brokers.find((b) => b.name === name);
         return broker ?? null;
     }
+    /**
+     * Get the default broker
+     * @returns Default broker or null if no default is set
+     */
+    async getDefaultBroker() {
+        this.ensureInitialized();
+        const broker = this.storage.brokers.find((b) => b.isDefault === true);
+        return broker ?? null;
+    }
     /**
      * Initialize the auth manager with encryption key derived from OS keychain and machine ID
      */
@@ -171,6 +184,23 @@ export class BrokerAuthManager {
         // Save to file
         await this.saveStorage();
     }
+    /**
+     * Set a broker as the default
+     * @param name - Broker name to set as default
+     */
+    async setDefaultBroker(name) {
+        this.ensureInitialized();
+        const index = this.storage.brokers.findIndex((b) => b.name === name);
+        if (index === -1) {
+            throw new BrokerAuthError(`Broker '${name}' not found`, BrokerAuthErrorCode.BROKER_NOT_FOUND);
+        }
+        // Unset all existing defaults
+        this.unsetAllDefaults();
+        // Set this broker as default
+        this.storage.brokers[index].isDefault = true;
+        // Save to file
+        await this.saveStorage();
+    }
     /**
      * Update existing broker configuration
      * @param name - Broker name to update
@@ -182,6 +212,10 @@ export class BrokerAuthManager {
         if (index === -1) {
             throw new BrokerAuthError(`Broker '${name}' not found`, BrokerAuthErrorCode.BROKER_NOT_FOUND);
         }
+        // If setting this broker as default, unset any existing default
+        if (updates.isDefault === true) {
+            this.unsetAllDefaults();
+        }
         // Merge updates
         const updated = {
             ...this.storage.brokers[index],
@@ -244,14 +278,31 @@ export class BrokerAuthManager {
             if (!this.masterKey || !this.machineId) {
                 throw new BrokerAuthError('Auth manager not initialized', BrokerAuthErrorCode.NOT_INITIALIZED);
             }
+            // If storage is empty, delete the file instead of saving
+            if (this.storage.brokers.length === 0) {
+                try {
+                    await unlink(this.configFile);
+                }
+                catch (error) {
+                    // Ignore if file doesn't exist (ENOENT)
+                    if (error.code !== 'ENOENT') {
+                        throw error;
+                    }
+                }
+                return;
+            }
             // Ensure directory exists
             await mkdir(this.configDir, { mode: 0o700, recursive: true });
-            // Encrypt data
-            const encrypted = await AuthEncryption.encrypt(this.storage, this.encryptionKey);
-            // Re-derive key with new salt for next save
+            // Generate new salt and derive key for THIS save
             const combinedKey = `${this.masterKey}:${this.machineId}`;
-            const newSalt = Buffer.from(encrypted.salt, 'base64');
-            this.encryptionKey = await AuthEncryption.deriveKey(combinedKey, newSalt);
+            const newSalt = AuthEncryption.generateSalt();
+            const newKey = await AuthEncryption.deriveKey(combinedKey, newSalt);
+            // Encrypt data with the new key
+            const encrypted = await AuthEncryption.encrypt(this.storage, newKey);
+            // Update the salt in encrypted data to match the salt we used for key derivation
+            encrypted.salt = newSalt.toString('base64');
+            // Store the new key for next operation
+            this.encryptionKey = newKey;
             // Write to temp file first (atomic write)
             const jsonData = JSON.stringify(encrypted, null, 2);
             const tempFile = `${this.configFile}.tmp`;
@@ -277,6 +328,14 @@ export class BrokerAuthManager {
             throw new BrokerAuthError('Failed to save broker storage', BrokerAuthErrorCode.FILE_WRITE_ERROR, error);
         }
     }
+    /**
+     * Unset the default flag on all brokers
+     */
+    unsetAllDefaults() {
+        for (const broker of this.storage.brokers) {
+            broker.isDefault = false;
+        }
+    }
     /**
      * Validate broker configuration
      * @param broker - Broker to validate

package/lib/auth/broker-auth-types.d.ts

@@ -8,15 +8,16 @@ export declare enum AuthType {
 /**
  * Broker authentication configuration
  *
- * @property authType - Type of authentication (BASIC or OAUTH)
- * @property name - Human-readable name/alias for the broker
- * @property sempEndpoint - SEMP endpoint URL (must start with http:// or https://)
- * @property sempPort - SEMP port number (1-65535)
- * @property accessToken - For OAuth: access token string. For Basic: base64-encoded credentials
+ * @property {string} accessToken - For OAuth: access token string. For Basic: base64-encoded credentials
+ * @property {AuthType} authType - Type of authentication (BASIC or OAUTH)
+ * @property {string} name - Human-readable name/alias for the broker
+ * @property {string} sempEndpoint - SEMP endpoint URL (must start with http:// or https://)
+ * @property {number} sempPort - SEMP port number (1-65535)
  */
 export interface BrokerAuth {
     accessToken: string;
     authType: AuthType;
+    isDefault?: boolean;
     name: string;
     sempEndpoint: string;
     sempPort: number;

package/lib/auth/index.d.ts

@@ -4,7 +4,7 @@
  */
 export { AuthEncryption } from './auth-encryption.js';
 export { type EncryptedData, type EncryptionMetadata } from './auth-types.js';
-export { AuthType, type BrokerAuth, BrokerAuthError, BrokerAuthErrorCode, type BrokerAuthStorage, } from './broker-auth-types.js';
 export { BrokerAuthManager } from './broker-auth-manager.js';
+export { AuthType, type BrokerAuth, BrokerAuthError, BrokerAuthErrorCode, type BrokerAuthStorage, } from './broker-auth-types.js';
 export { OrgManager } from './org-manager.js';
 export { type OrgConfig, OrgError, OrgErrorCode, type OrgStorage } from './org-types.js';

package/lib/auth/index.js

@@ -3,7 +3,7 @@
  * Provides encrypted storage for broker and organization credentials
  */
 export { AuthEncryption } from './auth-encryption.js';
-export { AuthType, BrokerAuthError, BrokerAuthErrorCode, } from './broker-auth-types.js';
 export { BrokerAuthManager } from './broker-auth-manager.js';
+export { AuthType, BrokerAuthError, BrokerAuthErrorCode, } from './broker-auth-types.js';
 export { OrgManager } from './org-manager.js';
 export { OrgError, OrgErrorCode } from './org-types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dishantlangayan/sc-cli-core",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Base library for the Solace Cloud CLI and plugins",
   "license": "Apache-2.0",
   "author": "Dishant Langayan",