@orange-soft/strapi-deployment-trigger 1.0.1 → 1.1.2

package/server/src/services/service.js

@@ -3,10 +3,12 @@ const STORE_KEY = 'settings';
 
 const DEFAULT_SETTINGS = {
   repoUrl: '',
-  workflow: 'deploy.yml',
-  branch: 'master',
+  githubToken: '',
+  targets: [],
 };
 
+const generateId = () => Math.random().toString(36).substring(2, 9);
+
 const service = ({ strapi }) => ({
   getWelcomeMessage() {
     return 'Welcome to Strapi Deployment Trigger';
@@ -33,26 +35,60 @@ const service = ({ strapi }) => ({
     return { owner: null, repo: null };
   },
 
+  // Migrate old single-config format to new multi-target format
+  migrateSettings(settings) {
+    if (!settings) return null;
+
+    // Already in new format
+    if (Array.isArray(settings.targets)) {
+      return settings;
+    }
+
+    // Old format detected - migrate
+    if (settings.workflow || settings.branch) {
+      return {
+        repoUrl: settings.repoUrl || '',
+        githubToken: settings.githubToken || '',
+        targets: [{
+          id: generateId(),
+          name: 'Default',
+          workflow: settings.workflow || 'deploy.yml',
+          branch: settings.branch || 'master',
+        }],
+      };
+    }
+
+    return settings;
+  },
+
   async getSettings() {
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
-    const dbSettings = await store.get({ key: STORE_KEY });
+    let dbSettings = await store.get({ key: STORE_KEY });
+
+    // Check if migration is needed (old format has workflow/branch but no targets array)
+    const needsMigration = dbSettings && !Array.isArray(dbSettings.targets) && (dbSettings.workflow || dbSettings.branch);
 
-    if (dbSettings && dbSettings.repoUrl) {
-      const token = dbSettings.githubToken;
+    // Migrate if needed
+    dbSettings = this.migrateSettings(dbSettings);
+
+    // Persist the migration so IDs remain stable
+    if (needsMigration && dbSettings) {
+      await store.set({ key: STORE_KEY, value: dbSettings });
+    }
+
+    if (!dbSettings) {
       return {
-        ...dbSettings,
-        githubToken: undefined, // Never expose full token
-        hasToken: !!token,
-        maskedToken: this.maskToken(token),
+        ...DEFAULT_SETTINGS,
+        hasToken: false,
+        maskedToken: null,
       };
     }
 
-    // Return defaults merged with any partial DB settings
-    const token = dbSettings?.githubToken;
+    const token = dbSettings.githubToken;
     return {
-      ...DEFAULT_SETTINGS,
-      ...dbSettings,
-      githubToken: undefined,
+      repoUrl: dbSettings.repoUrl || '',
+      targets: dbSettings.targets || [],
+      githubToken: undefined, // Never expose full token
       hasToken: !!token,
       maskedToken: this.maskToken(token),
     };
@@ -60,31 +96,92 @@ const service = ({ strapi }) => ({
 
   async saveSettings(settings) {
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
-
-    // Get existing settings to preserve token if not provided
     const existingSettings = await store.get({ key: STORE_KEY }) || {};
 
+    // Migrate existing if needed
+    const migrated = this.migrateSettings(existingSettings);
+
     const settingsToSave = {
-      repoUrl: settings.repoUrl,
-      workflow: settings.workflow || DEFAULT_SETTINGS.workflow,
-      branch: settings.branch || DEFAULT_SETTINGS.branch,
+      repoUrl: settings.repoUrl !== undefined ? settings.repoUrl : (migrated?.repoUrl || ''),
+      targets: settings.targets !== undefined ? settings.targets : (migrated?.targets || []),
       // Only update token if a new one is provided
-      githubToken: settings.githubToken || existingSettings.githubToken,
+      githubToken: settings.githubToken || migrated?.githubToken || '',
     };
 
     await store.set({ key: STORE_KEY, value: settingsToSave });
 
-    // Return without exposing token
     return {
-      ...settingsToSave,
+      repoUrl: settingsToSave.repoUrl,
+      targets: settingsToSave.targets,
       githubToken: undefined,
       hasToken: !!settingsToSave.githubToken,
+      maskedToken: this.maskToken(settingsToSave.githubToken),
+    };
+  },
+
+  async addTarget(target) {
+    const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
+    let settings = await store.get({ key: STORE_KEY }) || DEFAULT_SETTINGS;
+    settings = this.migrateSettings(settings) || DEFAULT_SETTINGS;
+
+    const newTarget = {
+      id: generateId(),
+      name: target.name || 'New Target',
+      workflow: target.workflow || 'deploy.yml',
+      branch: target.branch || 'master',
     };
+
+    settings.targets = [...(settings.targets || []), newTarget];
+    await store.set({ key: STORE_KEY, value: settings });
+
+    return newTarget;
+  },
+
+  async updateTarget(targetId, updates) {
+    const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
+    let settings = await store.get({ key: STORE_KEY });
+    settings = this.migrateSettings(settings);
+
+    if (!settings?.targets) return null;
+
+    const targetIndex = settings.targets.findIndex(t => t.id === targetId);
+    if (targetIndex === -1) return null;
+
+    settings.targets[targetIndex] = {
+      ...settings.targets[targetIndex],
+      ...updates,
+      id: targetId, // Preserve ID
+    };
+
+    await store.set({ key: STORE_KEY, value: settings });
+    return settings.targets[targetIndex];
+  },
+
+  async deleteTarget(targetId) {
+    const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
+    let settings = await store.get({ key: STORE_KEY });
+    settings = this.migrateSettings(settings);
+
+    if (!settings?.targets) return false;
+
+    const initialLength = settings.targets.length;
+    settings.targets = settings.targets.filter(t => t.id !== targetId);
+
+    if (settings.targets.length === initialLength) return false;
+
+    await store.set({ key: STORE_KEY, value: settings });
+    return true;
+  },
+
+  async getTarget(targetId) {
+    const settings = await this.getSettings();
+    return settings.targets?.find(t => t.id === targetId) || null;
   },
 
   async getToken() {
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
-    const dbSettings = await store.get({ key: STORE_KEY });
+    let dbSettings = await store.get({ key: STORE_KEY });
+    dbSettings = this.migrateSettings(dbSettings);
     return dbSettings?.githubToken || null;
   },
 
@@ -92,7 +189,8 @@ const service = ({ strapi }) => ({
     const settings = await this.getSettings();
     const hasToken = await this.getToken();
     const { owner, repo } = this.parseRepoUrl(settings.repoUrl);
-    return !!(owner && repo && hasToken);
+    const hasTargets = settings.targets && settings.targets.length > 0;
+    return !!(owner && repo && hasToken && hasTargets);
   },
 
   async hasToken() {