@friggframework/admin-scripts 2.0.0--canary.517.300ded3.0 → 2.0.0--canary.522.cbd3d5a.0

package/src/infrastructure/admin-auth-middleware.js

@@ -1,11 +1,49 @@
+const { createAdminScriptCommands } = require('@friggframework/core/application/commands/admin-script-commands');
+
 /**
  * Admin API Key Authentication Middleware
  *
- * Re-exports shared admin auth middleware from @friggframework/core.
- * Uses simple ENV-based API key validation.
- * Expects: x-frigg-admin-api-key header
+ * Validates admin API keys for script endpoints.
+ * Expects: Authorization: Bearer <api-key>
  */
+async function adminAuthMiddleware(req, res, next) {
+    try {
+        const authHeader = req.headers.authorization;
+
+        if (!authHeader || !authHeader.startsWith('Bearer ')) {
+            return res.status(401).json({
+                error: 'Missing or invalid Authorization header',
+                code: 'MISSING_AUTH'
+            });
+        }
+
+        const apiKey = authHeader.substring(7); // Remove 'Bearer '
+        const commands = createAdminScriptCommands();
+        const result = await commands.validateAdminApiKey(apiKey);
+
+        if (result.error) {
+            return res.status(result.error).json({
+                error: result.reason,
+                code: result.code
+            });
+        }
+
+        // Attach validated key info to request for audit trail
+        req.adminApiKey = result.apiKey;
+        req.adminAudit = {
+            apiKeyName: result.apiKey.name,
+            apiKeyLast4: result.apiKey.keyLast4,
+            ipAddress: req.ip || req.connection?.remoteAddress || 'unknown'
+        };
 
-const { validateAdminApiKey } = require('@friggframework/core/handlers/middleware/admin-auth');
+        next();
+    } catch (error) {
+        console.error('Admin auth middleware error:', error);
+        res.status(500).json({
+            error: 'Authentication failed',
+            code: 'AUTH_ERROR'
+        });
+    }
+}
 
-module.exports = { validateAdminApiKey };
+module.exports = { adminAuthMiddleware };

package/src/infrastructure/admin-script-router.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const serverless = require('serverless-http');
-const { validateAdminApiKey } = require('./admin-auth-middleware');
+const { adminAuthMiddleware } = require('./admin-auth-middleware');
 const { getScriptFactory } = require('../application/script-factory');
 const { createScriptRunner } = require('../application/script-runner');
 const { createAdminScriptCommands } = require('@friggframework/core/application/commands/admin-script-commands');
@@ -11,7 +11,7 @@ const { ScheduleManagementUseCase } = require('../application/schedule-managemen
 const router = express.Router();
 
 // Apply auth middleware to all admin routes
-router.use(validateAdminApiKey);
+router.use(adminAuthMiddleware);
 
 /**
  * Create ScheduleManagementUseCase instance
@@ -87,10 +87,10 @@ router.get('/scripts/:scriptName', async (req, res) => {
 });
 
 /**
- * POST /admin/scripts/:scriptName
+ * POST /admin/scripts/:scriptName/execute
  * Execute a script (sync, async, or dry-run)
  */
-router.post('/scripts/:scriptName', async (req, res) => {
+router.post('/scripts/:scriptName/execute', async (req, res) => {
     try {
         const { scriptName } = req.params;
         const { params = {}, mode = 'async', dryRun = false } = req.body;
@@ -110,6 +110,7 @@ router.post('/scripts/:scriptName', async (req, res) => {
                 trigger: 'MANUAL',
                 mode: 'sync',
                 dryRun: true,
+                audit: req.adminAudit,
             });
             return res.json(result);
         }
@@ -120,18 +121,20 @@ router.post('/scripts/:scriptName', async (req, res) => {
             const result = await runner.execute(scriptName, params, {
                 trigger: 'MANUAL',
                 mode: 'sync',
+                audit: req.adminAudit,
             });
             return res.json(result);
         }
 
         // Async execution - queue and return immediately
         const commands = createAdminScriptCommands();
-        const execution = await commands.createAdminProcess({
+        const execution = await commands.createScriptExecution({
             scriptName,
             scriptVersion: factory.get(scriptName).Definition.version,
             trigger: 'MANUAL',
             mode: 'async',
             input: params,
+            audit: req.adminAudit,
         });
 
         // Queue the execution
@@ -158,14 +161,14 @@ router.post('/scripts/:scriptName', async (req, res) => {
 });
 
 /**
- * GET /admin/scripts/:scriptName/executions/:executionId
- * Get execution status for specific script
+ * GET /admin/executions/:executionId
+ * Get execution status
  */
-router.get('/scripts/:scriptName/executions/:executionId', async (req, res) => {
+router.get('/executions/:executionId', async (req, res) => {
     try {
         const { executionId } = req.params;
         const commands = createAdminScriptCommands();
-        const execution = await commands.findAdminProcessById(executionId);
+        const execution = await commands.findScriptExecutionById(executionId);
 
         if (execution.error) {
             return res.status(execution.error).json({
@@ -182,13 +185,12 @@ router.get('/scripts/:scriptName/executions/:executionId', async (req, res) => {
 });
 
 /**
- * GET /admin/scripts/:scriptName/executions
- * List recent executions for specific script
+ * GET /admin/executions
+ * List recent executions
  */
-router.get('/scripts/:scriptName/executions', async (req, res) => {
+router.get('/executions', async (req, res) => {
     try {
-        const { scriptName } = req.params;
-        const { status, limit = 50 } = req.query;
+        const { scriptName, status, limit = 50 } = req.query;
         const commands = createAdminScriptCommands();
 
         const executions = await commands.findRecentExecutions({

package/src/infrastructure/script-executor-handler.js

@@ -21,7 +21,7 @@ async function handler(event) {
 
             // If executionId provided (async from API), update existing record
             if (executionId) {
-                await commands.updateAdminProcessState(executionId, 'RUNNING');
+                await commands.updateScriptExecutionStatus(executionId, 'RUNNING');
             }
 
             const result = await runner.execute(scriptName, params, {
@@ -45,7 +45,7 @@ async function handler(event) {
             if (executionId) {
                 const commands = createAdminScriptCommands();
                 await commands
-                    .completeAdminProcess(executionId, {
+                    .completeScriptExecution(executionId, {
                         status: 'FAILED',
                         error: {
                             name: error.name,