Merge pull request #10 from bcgov/dev

Sync main with dev

Author: bzimonjaSDPR

server/api/controllers/communications.controller.ts

@@ -2,10 +2,6 @@ import { Request, Response } from 'express';
 import ICMService from '../services/icm.service';
 
 export class CommunicationsController {
-  saveData(req: Request, res: Response): void {
-    res.json({ endpoint: 'saveForm', payload: req.body });
-  }
-
   async generateForm(req: Request, res: Response): Promise<void> {
     const originalServer = req.headers['x-original-server'] as string;
     const { token, username, ...params } = req.body;
@@ -78,7 +74,7 @@ export class CommunicationsController {
     }
   }
 
-  async clearICMLockedFlag(req: Request, res: Response): Promise<void> {
+  async unlockICMData(req: Request, res: Response): Promise<void> {
     const { token, username, ...params } = req.body;
 
     const authHeader = req.headers.authorization;
@@ -152,6 +148,29 @@ export class CommunicationsController {
     }
   }
 
+  async generatePortalForm(req: Request, res: Response): Promise<void> {
+    const originalServer = req.headers['x-original-server'] as string;
+    const { token, username, ...params } = req.body;
+
+    const authHeader = req.headers.authorization;
+    const authToken =
+      token ||
+      (authHeader?.startsWith('Bearer ')
+        ? authHeader.substring(7)
+        : authHeader);
+
+    const result = await ICMService.generatePortalForm(
+      { ...params, username, originalServer },
+      authToken
+    );
+
+    if (result.success) {
+      res.status(200).json(result.data);
+    } else {
+      res.status(result.status || 500).json({ error: result.error });
+    }
+  }
+
   async loadPortalForm(req: Request, res: Response): Promise<void> {
     try {
       const requestData = req.body;
@@ -187,12 +206,143 @@ export class CommunicationsController {
     }
   }
 
-  generatePDFFromJson(req: Request, res: Response): void {
-    res.json({ endpoint: 'generatePDFFromJson', payload: req.body });
+  async loadBoundForm(req: Request, res: Response): Promise<void> {
+    try {
+      const originalServer = req.headers['x-original-server'] as string;
+      const { token, username, isPortalIntegrated, ...params } = req.body;
+
+      const authHeader = req.headers.authorization;
+      const authToken =
+        token ||
+        (authHeader?.startsWith('Bearer ')
+          ? authHeader.substring(7)
+          : authHeader);
+
+      let result;
+      if (isPortalIntegrated) {
+        result = await ICMService.loadPortalForm(
+          { ...params },
+          authToken,
+          originalServer
+        );
+      } else {
+        result = await ICMService.loadICMData(
+          { ...params, username, originalServer },
+          authToken
+        );
+      }
+
+      if (result.success) {
+        const boundData = await ICMService.bindFormData(result.data);
+        res.status(200).json(boundData);
+      } else {
+        res.status(result.status || 500).json({ error: result.error });
+      }
+    } catch (error) {
+      let errorMessage = 'Internal server error';
+      if (error instanceof Error && error.message) {
+        errorMessage = error.message;
+      }
+      res.status(500).json({
+        error: errorMessage,
+      });
+    }
+  }
+
+  async bindPreviewForm(req: Request, res: Response): Promise<void> {
+    try {
+      const { formData } = req.body;
+
+      if (!formData) {
+        res.status(400).json({ error: 'Form data is required' });
+        return;
+      }
+
+      const boundData = await ICMService.bindFormData(formData);
+      res.status(200).json(boundData);
+    } catch (error) {
+      let errorMessage = 'Internal server error';
+      if (error instanceof Error && error.message) {
+        errorMessage = error.message;
+      }
+      res.status(500).json({
+        error: errorMessage,
+      });
+    }
+  }
+
+  async submitForPortalAction(req: Request, res: Response): Promise<void> {
+    try {
+      const { tokenId, savedForm, config } = req.body;
+
+      // TODO: Implement authentication/authorization when available
+
+      const result = await ICMService.submitForPortalAction({
+        tokenId,
+        savedForm,
+        config,
+      });
+
+      if (result.success) {
+        res.status(200).json(result.data);
+      } else {
+        res.status(result.status || 500).json({ error: result.error });
+      }
+    } catch (error) {
+      let errorMessage = 'Internal server error';
+      if (error instanceof Error && error.message) {
+        errorMessage = error.message;
+      }
+      res.status(500).json({
+        error: errorMessage,
+      });
+    }
   }
 
-  generateNewTemplate(req: Request, res: Response): void {
-    res.json({ endpoint: 'generateNewTemplate', payload: req.body });
+  async saveFormData(req: Request, res: Response): Promise<void> {
+    try {
+      const {
+        action,
+        formState,
+        groupState,
+        formDefinition,
+        metadata,
+        items,
+        sessionParams,
+      } = req.body;
+
+      const authHeader = req.headers.authorization;
+      const token = authHeader?.startsWith('Bearer ')
+        ? authHeader.substring(7)
+        : authHeader;
+
+      const result = await ICMService.saveFormData(
+        {
+          action,
+          formState,
+          groupState,
+          formDefinition,
+          metadata,
+          items,
+          sessionParams,
+        },
+        token
+      );
+
+      if (result.success) {
+        res.status(200).json(result.data);
+      } else {
+        res.status(result.status || 500).json({ error: result.error });
+      }
+    } catch (error) {
+      let errorMessage = 'Internal server error';
+      if (error instanceof Error && error.message) {
+        errorMessage = error.message;
+      }
+      res.status(500).json({
+        error: errorMessage,
+      });
+    }
   }
 }
 

server/api/controllers/router.ts

@@ -12,9 +12,6 @@ const router = express.Router();
 router.post('/saveICMData', (req, res) =>
   CommunicationsController.saveICMData(req, res)
 );
-router.post('/saveForm', (req, res) =>
-  CommunicationsController.saveData(req, res)
-);
 router.post('/generateForm', (req, res) =>
   CommunicationsController.generateForm(req, res)
 );
@@ -24,24 +21,33 @@ router.post('/editForm', (req, res) =>
 router.post('/loadICMData', (req, res) =>
   CommunicationsController.loadICMData(req, res)
 );
-router.post('/clearICMLockedFlag', (req, res) =>
-  CommunicationsController.clearICMLockedFlag(req, res)
+router.post('/unlockICMData', (req, res) =>
+  CommunicationsController.unlockICMData(req, res)
 );
 router.post('/loadSavedJson', (req, res) =>
   CommunicationsController.loadSavedJson(req, res)
 );
 router.post('/pdfRender/:pdfTemplateId', (req, res) =>
   CommunicationsController.pdfRender(req, res)
 );
-router.post('/generatePDFFromJson', (req, res) =>
-  CommunicationsController.generatePDFFromJson(req, res)
-);
-router.post('/generateNewTemplate', (req, res) =>
-  CommunicationsController.generateNewTemplate(req, res)
+router.post('/generatePortalForm', (req, res) =>
+  CommunicationsController.generatePortalForm(req, res)
 );
 router.post('/loadPortalForm', (req, res) =>
   CommunicationsController.loadPortalForm(req, res)
 );
+router.post('/submitForPortalAction', (req, res) =>
+  CommunicationsController.submitForPortalAction(req, res)
+);
+router.post('/loadBoundForm', (req, res) =>
+  CommunicationsController.loadBoundForm(req, res)
+);
+router.post('/bindPreviewForm', (req, res) =>
+  CommunicationsController.bindPreviewForm(req, res)
+);
+router.post('/saveFormData', (req, res) =>
+  CommunicationsController.saveFormData(req, res)
+);
 
 // Kiln Renderer Routes
 router.get('/view', (req, res) => RendererController.viewForm(req, res));

server/api/services/icm.client.ts

@@ -252,6 +252,34 @@ export class ICMClient {
     }
   }
 
+  async generatePortalForm(
+    payload: Record<string, any>,
+    originalServer?: string
+  ) {
+    const url = (
+      process.env.COMM_API_GENERATE_PORTAL_FORM_ENDPOINT_URL || ''
+    ).trim();
+    if (!url) {
+      throw new Error(
+        'COMM_API_GENERATE_PORTAL_FORM_ENDPOINT_URL environment variable is required'
+      );
+    }
+
+    const timeout = parseInt(process.env.COMM_API_TIMEOUT || '30000', 10);
+
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+    };
+    if (originalServer) headers['X-Original-Server'] = originalServer;
+
+    try {
+      const res = await axios.post(url, payload, { headers, timeout });
+      return this.createJsonResponse(res);
+    } catch (error) {
+      return this.handleJsonError(error, 'generatePortalForm');
+    }
+  }
+
   async loadPortalForm(
     payload: any,
     originalServer?: string
@@ -287,4 +315,33 @@ export class ICMClient {
       return this.handleJsonError(error, 'loadPortalForm');
     }
   }
+
+  async submitForPortalAction(payload: any): Promise<ICMJsonResponse> {
+    try {
+      const url = process.env.COMM_API_SUBMIT_TO_ACTION_ENDPOINT_URL;
+
+      if (!url) {
+        throw new Error(
+          'COMM_API_SUBMIT_TO_ACTION_ENDPOINT_URL environment variable is required'
+        );
+      }
+
+      const timeout = process.env.COMM_API_TIMEOUT
+        ? parseInt(process.env.COMM_API_TIMEOUT, 10)
+        : 30000;
+
+      const headers: Record<string, string> = {
+        'Content-Type': 'application/json',
+      };
+
+      const response = await axios.post(url, payload, {
+        headers,
+        timeout,
+      });
+
+      return this.createJsonResponse(response);
+    } catch (error) {
+      return this.handleJsonError(error, 'submitForPortalAction');
+    }
+  }
 }