@fink-andreas/pi-linear-tools 0.1.0 → 0.2.0

package/src/settings.js

@@ -10,8 +10,13 @@ import { debug, warn, error as logError } from './logger.js';
 
 export function getDefaultSettings() {
   return {
-    schemaVersion: 1,
-    linearApiKey: null,
+    schemaVersion: 2,
+    authMethod: 'api-key', // 'api-key' or 'oauth'
+    apiKey: null, // Legacy API key (migrated from linearApiKey)
+    oauth: {
+      clientId: 'a3e177176c6697611367f1a2405d4a34',
+      redirectUri: 'http://localhost:34711/callback',
+    },
     defaultTeam: null,
     defaultWorkspace: null,
     projects: {},
@@ -21,12 +26,70 @@ export function getDefaultSettings() {
 function migrateSettings(settings) {
   const migrated = { ...(settings || {}) };
 
+  // Set default schema version if not set
   if (migrated.schemaVersion === undefined) {
     migrated.schemaVersion = 1;
   }
 
-  if (migrated.linearApiKey === undefined) {
-    migrated.linearApiKey = null;
+  // Migration from schema version 1 to 2
+  if (migrated.schemaVersion === 1) {
+    debug('Migrating settings from schema version 1 to 2');
+
+    // Migrate linearApiKey to apiKey
+    if (migrated.linearApiKey !== undefined) {
+      migrated.apiKey = migrated.linearApiKey;
+      delete migrated.linearApiKey;
+    } else {
+      migrated.apiKey = null;
+    }
+
+    // Set default auth method
+    migrated.authMethod = 'api-key';
+
+    // Add OAuth config
+    if (!migrated.oauth || typeof migrated.oauth !== 'object') {
+      migrated.oauth = {
+        clientId: 'a3e177176c6697611367f1a2405d4a34',
+        redirectUri: 'http://localhost:34711/callback',
+      };
+    }
+
+    // Update schema version
+    migrated.schemaVersion = 2;
+
+    debug('Settings migration to version 2 complete');
+  }
+
+  // Ensure authMethod is set
+  if (migrated.authMethod === undefined) {
+    migrated.authMethod = 'api-key';
+  }
+
+  // Ensure apiKey is set (for backward compatibility)
+  if (migrated.apiKey === undefined) {
+    migrated.apiKey = null;
+  }
+
+  // Ensure oauth config exists
+  if (!migrated.oauth || typeof migrated.oauth !== 'object') {
+    migrated.oauth = {
+      clientId: 'a3e177176c6697611367f1a2405d4a34',
+      redirectUri: 'http://localhost:34711/callback',
+    };
+  }
+
+  // Ensure oauth has clientId and redirectUri
+  if (migrated.oauth.clientId === undefined) {
+    migrated.oauth.clientId = 'a3e177176c6697611367f1a2405d4a34';
+  }
+
+  if (migrated.oauth.redirectUri === undefined) {
+    migrated.oauth.redirectUri = 'http://localhost:34711/callback';
+  }
+
+  // Legacy: ensure linearApiKey is null (for validation)
+  if (migrated.linearApiKey !== undefined) {
+    delete migrated.linearApiKey;
   }
 
   if (migrated.defaultTeam === undefined) {
@@ -37,10 +100,17 @@ function migrateSettings(settings) {
     migrated.defaultWorkspace = null;
   }
 
+  // Remove deprecated debug_reload field
+  if (Object.prototype.hasOwnProperty.call(migrated, 'debug_reload')) {
+    delete migrated.debug_reload;
+  }
+
+  // Ensure projects is an object
   if (!migrated.projects || typeof migrated.projects !== 'object' || Array.isArray(migrated.projects)) {
     migrated.projects = {};
   }
 
+  // Migrate project scopes
   for (const [projectId, cfg] of Object.entries(migrated.projects)) {
     if (!cfg || typeof cfg !== 'object' || Array.isArray(cfg)) {
       migrated.projects[projectId] = { scope: { team: null } };
@@ -71,8 +141,39 @@ export function validateSettings(settings) {
     errors.push('settings.schemaVersion must be a positive number');
   }
 
-  if (settings.linearApiKey !== null && settings.linearApiKey !== undefined && typeof settings.linearApiKey !== 'string') {
-    errors.push('settings.linearApiKey must be a string or null');
+  // Validate authMethod
+  if (settings.authMethod !== undefined && settings.authMethod !== null) {
+    if (typeof settings.authMethod !== 'string') {
+      errors.push('settings.authMethod must be a string');
+    } else if (
+!['api-key', 'oauth'].includes(settings.authMethod)
+) {
+      errors.push('settings.authMethod must be "api-key" or "oauth"');
+    }
+  }
+
+  // Validate apiKey (for backward compatibility)
+  if (settings.apiKey !== null && settings.apiKey !== undefined && typeof settings.apiKey !== 'string') {
+    errors.push('settings.apiKey must be a string or null');
+  }
+
+  // Reject legacy linearApiKey field
+  if (settings.linearApiKey !== undefined) {
+    errors.push('settings.linearApiKey is deprecated. Use settings.apiKey instead.');
+  }
+
+  // Validate oauth config
+  if (settings.oauth !== undefined && settings.oauth !== null) {
+    if (typeof settings.oauth !== 'object' || Array.isArray(settings.oauth)) {
+      errors.push('settings.oauth must be an object');
+    } else {
+      if (settings.oauth.clientId !== undefined && typeof settings.oauth.clientId !== 'string') {
+        errors.push('settings.oauth.clientId must be a string');
+      }
+      if (settings.oauth.redirectUri !== undefined && typeof settings.oauth.redirectUri !== 'string') {
+        errors.push('settings.oauth.redirectUri must be a string');
+      }
+    }
   }
 
   if (settings.defaultTeam !== null && settings.defaultTeam !== undefined && typeof settings.defaultTeam !== 'string') {