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

package/dist/server/index.mjs

@@ -68,6 +68,30 @@ const controller = ({ strapi }) => ({
   },
   // Trigger deployment for a specific target
   async trigger(ctx) {
+    const service2 = getService(strapi);
+    const { targetId } = ctx.request.body || {};
+    let target;
+    if (targetId) {
+      target = await service2.getTarget(targetId);
+      if (!target) {
+        return ctx.badRequest("Target not found");
+      }
+    } else {
+      const settings = await service2.getSettings();
+      target = settings.targets?.[0];
+      if (!target) {
+        return ctx.badRequest("No deployment targets configured");
+      }
+    }
+    const targetType = target.type || "github";
+    if (targetType === "vercel") {
+      return this.triggerVercel(ctx, target);
+    } else {
+      return this.triggerGitHub(ctx, target);
+    }
+  },
+  // Trigger GitHub Actions deployment
+  async triggerGitHub(ctx, target) {
     const service2 = getService(strapi);
     const githubToken = await service2.getToken();
     if (!githubToken) {
@@ -78,22 +102,9 @@ const controller = ({ strapi }) => ({
     if (!owner || !repo) {
       return ctx.badRequest("GitHub repository URL is not configured or invalid. Please configure it in Settings.");
     }
-    const { targetId, workflow: overrideWorkflow, branch: overrideBranch } = ctx.request.body || {};
-    let workflow, branch, targetName;
-    if (targetId) {
-      const target = await service2.getTarget(targetId);
-      if (!target) {
-        return ctx.badRequest("Target not found");
-      }
-      workflow = overrideWorkflow || target.workflow;
-      branch = overrideBranch || target.branch;
-      targetName = target.name;
-    } else {
-      const firstTarget = settings.targets?.[0];
-      workflow = overrideWorkflow || firstTarget?.workflow || "deploy.yml";
-      branch = overrideBranch || firstTarget?.branch || "master";
-      targetName = firstTarget?.name || "Default";
-    }
+    const workflow = target.workflow || "deploy.yml";
+    const branch = target.branch || "master";
+    const targetName = target.name;
     const url = `https://api.github.com/repos/${owner}/${repo}/actions/workflows/${workflow}/dispatches`;
     try {
       const response = await fetch(url, {
@@ -110,11 +121,12 @@ const controller = ({ strapi }) => ({
         strapi.log.error(`GitHub API error: ${response.status} - ${errorText}`);
         return ctx.badRequest(`GitHub API error: ${response.status} - ${errorText}`);
       }
-      strapi.log.info(`Deployment triggered for ${owner}/${repo} [${targetName}] on branch ${branch}`);
+      strapi.log.info(`GitHub deployment triggered for ${owner}/${repo} [${targetName}] on branch ${branch}`);
       const actionsUrl = `https://github.com/${owner}/${repo}/actions`;
       ctx.body = {
         data: {
           success: true,
+          type: "github",
           message: `Deployment triggered successfully for ${owner}/${repo}`,
           repository: `${owner}/${repo}`,
           targetName,
@@ -124,9 +136,39 @@ const controller = ({ strapi }) => ({
         }
       };
     } catch (error) {
-      strapi.log.error("Error triggering deployment:", error);
+      strapi.log.error("Error triggering GitHub deployment:", error);
       return ctx.badRequest(`Failed to trigger deployment: ${error.message}`);
     }
+  },
+  // Trigger Vercel deployment via webhook
+  async triggerVercel(ctx, target) {
+    const webhookUrl = target.webhookUrl;
+    const targetName = target.name;
+    if (!webhookUrl) {
+      return ctx.badRequest("Vercel webhook URL is not configured for this target.");
+    }
+    try {
+      const response = await fetch(webhookUrl, {
+        method: "POST"
+      });
+      if (!response.ok) {
+        const errorText = await response.text();
+        strapi.log.error(`Vercel webhook error: ${response.status} - ${errorText}`);
+        return ctx.badRequest(`Vercel webhook error: ${response.status} - ${errorText}`);
+      }
+      strapi.log.info(`Vercel deployment triggered [${targetName}]`);
+      ctx.body = {
+        data: {
+          success: true,
+          type: "vercel",
+          message: "Vercel deployment triggered successfully",
+          targetName
+        }
+      };
+    } catch (error) {
+      strapi.log.error("Error triggering Vercel deployment:", error);
+      return ctx.badRequest(`Failed to trigger Vercel deployment: ${error.message}`);
+    }
   }
 });
 const controllers = {
@@ -248,7 +290,14 @@ const service = ({ strapi }) => ({
   migrateSettings(settings) {
     if (!settings) return null;
     if (Array.isArray(settings.targets)) {
-      return settings;
+      const targetsWithType = settings.targets.map((target) => ({
+        ...target,
+        type: target.type || "github"
+      }));
+      return {
+        ...settings,
+        targets: targetsWithType
+      };
     }
     if (settings.workflow || settings.branch) {
       return {
@@ -256,6 +305,7 @@ const service = ({ strapi }) => ({
         githubToken: settings.githubToken || "",
         targets: [{
           id: generateId(),
+          type: "github",
           name: "Default",
           workflow: settings.workflow || "deploy.yml",
           branch: settings.branch || "master"
@@ -267,7 +317,11 @@ const service = ({ strapi }) => ({
   async getSettings() {
     const store = strapi.store({ type: "plugin", name: PLUGIN_ID });
     let dbSettings = await store.get({ key: STORE_KEY });
+    const needsMigration = dbSettings && !Array.isArray(dbSettings.targets) && (dbSettings.workflow || dbSettings.branch);
     dbSettings = this.migrateSettings(dbSettings);
+    if (needsMigration && dbSettings) {
+      await store.set({ key: STORE_KEY, value: dbSettings });
+    }
     if (!dbSettings) {
       return {
         ...DEFAULT_SETTINGS,
@@ -308,12 +362,18 @@ const service = ({ strapi }) => ({
     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 targetType = target.type || "github";
     const newTarget = {
       id: generateId(),
-      name: target.name || "New Target",
-      workflow: target.workflow || "deploy.yml",
-      branch: target.branch || "master"
+      type: targetType,
+      name: target.name || "New Target"
     };
+    if (targetType === "github") {
+      newTarget.workflow = target.workflow || "deploy.yml";
+      newTarget.branch = target.branch || "master";
+    } else if (targetType === "vercel") {
+      newTarget.webhookUrl = target.webhookUrl || "";
+    }
     settings.targets = [...settings.targets || [], newTarget];
     await store.set({ key: STORE_KEY, value: settings });
     return newTarget;
@@ -325,12 +385,20 @@ const service = ({ strapi }) => ({
     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
+    const existingTarget = settings.targets[targetIndex];
+    const targetType = updates.type || existingTarget.type || "github";
+    const updatedTarget = {
+      id: targetId,
+      type: targetType,
+      name: updates.name !== void 0 ? updates.name : existingTarget.name
     };
+    if (targetType === "github") {
+      updatedTarget.workflow = updates.workflow !== void 0 ? updates.workflow : existingTarget.workflow;
+      updatedTarget.branch = updates.branch !== void 0 ? updates.branch : existingTarget.branch;
+    } else if (targetType === "vercel") {
+      updatedTarget.webhookUrl = updates.webhookUrl !== void 0 ? updates.webhookUrl : existingTarget.webhookUrl;
+    }
+    settings.targets[targetIndex] = updatedTarget;
     await store.set({ key: STORE_KEY, value: settings });
     return settings.targets[targetIndex];
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orange-soft/strapi-deployment-trigger",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Strapi v5 plugin to trigger GitHub Actions workflow deployments from the admin panel",
   "license": "MIT",
   "author": "Justin Moh <moh@os.my>",

package/server/src/controllers/controller.js

@@ -70,6 +70,37 @@ const controller = ({ strapi }) => ({
 
   // Trigger deployment for a specific target
   async trigger(ctx) {
+    const service = getService(strapi);
+    const { targetId } = ctx.request.body || {};
+
+    // Get target
+    let target;
+    if (targetId) {
+      target = await service.getTarget(targetId);
+      if (!target) {
+        return ctx.badRequest('Target not found');
+      }
+    } else {
+      // Fallback for backwards compatibility - use first target
+      const settings = await service.getSettings();
+      target = settings.targets?.[0];
+      if (!target) {
+        return ctx.badRequest('No deployment targets configured');
+      }
+    }
+
+    const targetType = target.type || 'github';
+
+    // Branch by target type
+    if (targetType === 'vercel') {
+      return this.triggerVercel(ctx, target);
+    } else {
+      return this.triggerGitHub(ctx, target);
+    }
+  },
+
+  // Trigger GitHub Actions deployment
+  async triggerGitHub(ctx, target) {
     const service = getService(strapi);
     const githubToken = await service.getToken();
 
@@ -84,27 +115,9 @@ const controller = ({ strapi }) => ({
       return ctx.badRequest('GitHub repository URL is not configured or invalid. Please configure it in Settings.');
     }
 
-    // Get target from request body or params
-    const { targetId, workflow: overrideWorkflow, branch: overrideBranch } = ctx.request.body || {};
-
-    let workflow, branch, targetName;
-
-    if (targetId) {
-      // Trigger specific target
-      const target = await service.getTarget(targetId);
-      if (!target) {
-        return ctx.badRequest('Target not found');
-      }
-      workflow = overrideWorkflow || target.workflow;
-      branch = overrideBranch || target.branch;
-      targetName = target.name;
-    } else {
-      // Fallback for backwards compatibility - use first target or provided values
-      const firstTarget = settings.targets?.[0];
-      workflow = overrideWorkflow || firstTarget?.workflow || 'deploy.yml';
-      branch = overrideBranch || firstTarget?.branch || 'master';
-      targetName = firstTarget?.name || 'Default';
-    }
+    const workflow = target.workflow || 'deploy.yml';
+    const branch = target.branch || 'master';
+    const targetName = target.name;
 
     const url = `https://api.github.com/repos/${owner}/${repo}/actions/workflows/${workflow}/dispatches`;
 
@@ -125,13 +138,14 @@ const controller = ({ strapi }) => ({
         return ctx.badRequest(`GitHub API error: ${response.status} - ${errorText}`);
       }
 
-      strapi.log.info(`Deployment triggered for ${owner}/${repo} [${targetName}] on branch ${branch}`);
+      strapi.log.info(`GitHub deployment triggered for ${owner}/${repo} [${targetName}] on branch ${branch}`);
 
       const actionsUrl = `https://github.com/${owner}/${repo}/actions`;
 
       ctx.body = {
         data: {
           success: true,
+          type: 'github',
           message: `Deployment triggered successfully for ${owner}/${repo}`,
           repository: `${owner}/${repo}`,
           targetName,
@@ -141,10 +155,46 @@ const controller = ({ strapi }) => ({
         },
       };
     } catch (error) {
-      strapi.log.error('Error triggering deployment:', error);
+      strapi.log.error('Error triggering GitHub deployment:', error);
       return ctx.badRequest(`Failed to trigger deployment: ${error.message}`);
     }
   },
+
+  // Trigger Vercel deployment via webhook
+  async triggerVercel(ctx, target) {
+    const webhookUrl = target.webhookUrl;
+    const targetName = target.name;
+
+    if (!webhookUrl) {
+      return ctx.badRequest('Vercel webhook URL is not configured for this target.');
+    }
+
+    try {
+      const response = await fetch(webhookUrl, {
+        method: 'POST',
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        strapi.log.error(`Vercel webhook error: ${response.status} - ${errorText}`);
+        return ctx.badRequest(`Vercel webhook error: ${response.status} - ${errorText}`);
+      }
+
+      strapi.log.info(`Vercel deployment triggered [${targetName}]`);
+
+      ctx.body = {
+        data: {
+          success: true,
+          type: 'vercel',
+          message: 'Vercel deployment triggered successfully',
+          targetName,
+        },
+      };
+    } catch (error) {
+      strapi.log.error('Error triggering Vercel deployment:', error);
+      return ctx.badRequest(`Failed to trigger Vercel deployment: ${error.message}`);
+    }
+  },
 });
 
 export default controller;

package/server/src/services/service.js

@@ -39,9 +39,17 @@ const service = ({ strapi }) => ({
   migrateSettings(settings) {
     if (!settings) return null;
 
-    // Already in new format
+    // Already in new format with targets array
     if (Array.isArray(settings.targets)) {
-      return settings;
+      // Ensure all targets have a type field (backward compatibility)
+      const targetsWithType = settings.targets.map(target => ({
+        ...target,
+        type: target.type || 'github',
+      }));
+      return {
+        ...settings,
+        targets: targetsWithType,
+      };
     }
 
     // Old format detected - migrate
@@ -51,6 +59,7 @@ const service = ({ strapi }) => ({
         githubToken: settings.githubToken || '',
         targets: [{
           id: generateId(),
+          type: 'github',
           name: 'Default',
           workflow: settings.workflow || 'deploy.yml',
           branch: settings.branch || 'master',
@@ -65,9 +74,17 @@ const service = ({ strapi }) => ({
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
     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);
+
     // 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 {
         ...DEFAULT_SETTINGS,
@@ -116,13 +133,22 @@ const service = ({ strapi }) => ({
     let settings = await store.get({ key: STORE_KEY }) || DEFAULT_SETTINGS;
     settings = this.migrateSettings(settings) || DEFAULT_SETTINGS;
 
+    const targetType = target.type || 'github';
+
     const newTarget = {
       id: generateId(),
+      type: targetType,
       name: target.name || 'New Target',
-      workflow: target.workflow || 'deploy.yml',
-      branch: target.branch || 'master',
     };
 
+    // Add type-specific fields
+    if (targetType === 'github') {
+      newTarget.workflow = target.workflow || 'deploy.yml';
+      newTarget.branch = target.branch || 'master';
+    } else if (targetType === 'vercel') {
+      newTarget.webhookUrl = target.webhookUrl || '';
+    }
+
     settings.targets = [...(settings.targets || []), newTarget];
     await store.set({ key: STORE_KEY, value: settings });
 
@@ -139,12 +165,25 @@ const service = ({ strapi }) => ({
     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
+    const existingTarget = settings.targets[targetIndex];
+    const targetType = updates.type || existingTarget.type || 'github';
+
+    // Build updated target with type-specific fields
+    const updatedTarget = {
+      id: targetId,
+      type: targetType,
+      name: updates.name !== undefined ? updates.name : existingTarget.name,
     };
 
+    if (targetType === 'github') {
+      updatedTarget.workflow = updates.workflow !== undefined ? updates.workflow : existingTarget.workflow;
+      updatedTarget.branch = updates.branch !== undefined ? updates.branch : existingTarget.branch;
+    } else if (targetType === 'vercel') {
+      updatedTarget.webhookUrl = updates.webhookUrl !== undefined ? updates.webhookUrl : existingTarget.webhookUrl;
+    }
+
+    settings.targets[targetIndex] = updatedTarget;
+
     await store.set({ key: STORE_KEY, value: settings });
     return settings.targets[targetIndex];
   },