@orange-soft/strapi-deployment-trigger 1.0.0 → 1.1.0

package/server/src/routes/admin/index.js

@@ -33,5 +33,30 @@ export default () => ({
         policies: [],
       },
     },
+    // Target CRUD routes
+    {
+      method: 'POST',
+      path: '/targets',
+      handler: 'controller.addTarget',
+      config: {
+        policies: [],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/targets/:id',
+      handler: 'controller.updateTarget',
+      config: {
+        policies: [],
+      },
+    },
+    {
+      method: 'DELETE',
+      path: '/targets/:id',
+      handler: 'controller.deleteTarget',
+      config: {
+        policies: [],
+      },
+    },
   ],
 });

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,40 +35,52 @@ const service = ({ strapi }) => ({
     return { owner: null, repo: null };
   },
 
-  async getSettings() {
-    // 1. Try database (core store)
-    const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
-    const dbSettings = await store.get({ key: STORE_KEY });
-    const envToken = process.env.GITHUB_PERSONAL_ACCESS_TOKEN;
+  // 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;
+    }
 
-    if (dbSettings && dbSettings.repoUrl) {
-      const token = dbSettings.githubToken || envToken;
+    // Old format detected - migrate
+    if (settings.workflow || settings.branch) {
       return {
-        ...dbSettings,
-        githubToken: undefined, // Never expose full token
-        hasToken: !!token,
-        maskedToken: this.maskToken(token),
+        repoUrl: settings.repoUrl || '',
+        githubToken: settings.githubToken || '',
+        targets: [{
+          id: generateId(),
+          name: 'Default',
+          workflow: settings.workflow || 'deploy.yml',
+          branch: settings.branch || 'master',
+        }],
       };
     }
 
-    // 2. Fallback to plugin config (convert old format if needed)
-    const pluginConfig = strapi.config.get(`plugin::${PLUGIN_ID}`) || {};
-    if (pluginConfig.githubOwner && pluginConfig.githubRepo) {
+    return settings;
+  },
+
+  async getSettings() {
+    const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
+    let dbSettings = await store.get({ key: STORE_KEY });
+
+    // Migrate if needed
+    dbSettings = this.migrateSettings(dbSettings);
+
+    if (!dbSettings) {
       return {
-        repoUrl: `https://github.com/${pluginConfig.githubOwner}/${pluginConfig.githubRepo}`,
-        workflow: pluginConfig.workflow || DEFAULT_SETTINGS.workflow,
-        branch: pluginConfig.branch || DEFAULT_SETTINGS.branch,
-        hasToken: !!envToken,
-        maskedToken: this.maskToken(envToken),
+        ...DEFAULT_SETTINGS,
+        hasToken: false,
+        maskedToken: null,
       };
     }
 
-    // 3. Return defaults merged with any partial DB settings
-    const token = dbSettings?.githubToken || envToken;
+    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),
     };
@@ -74,45 +88,101 @@ 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 || !!process.env.GITHUB_PERSONAL_ACCESS_TOKEN,
+      hasToken: !!settingsToSave.githubToken,
+      maskedToken: this.maskToken(settingsToSave.githubToken),
     };
   },
 
-  async getToken() {
-    // Priority: DB token > Environment variable
+  async addTarget(target) {
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
-    const dbSettings = await store.get({ key: STORE_KEY });
+    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',
+    };
 
-    if (dbSettings?.githubToken) {
-      return dbSettings.githubToken;
-    }
+    settings.targets = [...(settings.targets || []), newTarget];
+    await store.set({ key: STORE_KEY, value: settings });
 
-    return process.env.GITHUB_PERSONAL_ACCESS_TOKEN;
+    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 });
+    let dbSettings = await store.get({ key: STORE_KEY });
+    dbSettings = this.migrateSettings(dbSettings);
+    return dbSettings?.githubToken || null;
   },
 
   async isConfigured() {
     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() {