@yrpri/api 9.0.77 → 9.0.78

package/active-citizen/workers/notification_delivery.cjs

@@ -172,6 +172,9 @@ NotificationDeliveryWorker.prototype.process = function (notificationJson, callb
                     else if (notification.AcActivities[0].community_id) {
                         inviteFromName = notification.AcActivities[0].Community.name;
                     }
+                    if (process.env.DEFAULT_HOSTNAME) {
+                        community.hostname = process.env.DEFAULT_HOSTNAME;
+                    }
                     queue.add('send-one-email', {
                         subject: { translateToken: 'notification.email.user_invite', contentName: inviteFromName },
                         template: 'user_invite',

package/agents/controllers/assistantsController.js

@@ -1,4 +1,6 @@
 import express from "express";
+import { marked } from "marked";
+import HTMLtoDOCX from "html-to-docx";
 import auth from "../../authorization.cjs";
 import { YpAgentAssistant } from "../assistants/agentAssistant.js";
 import { YpAgentProductBundle } from "../models/agentProductBundle.js";
@@ -11,6 +13,7 @@ import { YpSubscriptionUser } from "../models/subscriptionUser.js";
 import { YpDiscount } from "../models/discount.js";
 import { sequelize } from "@policysynth/agents/dbModels/index.js";
 import { NotificationAgentQueueManager } from "../managers/notificationAgentQueueManager.js";
+import { AgentQueueManager } from "@policysynth/agents/operations/agentQueueManager.js";
 const models = {
     YpAgentProduct,
     YpAgentProductBundle,
@@ -44,6 +47,35 @@ export class AssistantController {
                 process.exit(1);
             }
         };
+        this.getDocxReport = async (req, res) => {
+            try {
+                const { agentId } = req.params;
+                let lastStatusMessage = await this.getLastStatusMessageFromDB(parseInt(agentId));
+                if (!lastStatusMessage) {
+                    return res.status(404).send("No status message found.");
+                }
+                const regex = /<markdownReport>([\s\S]*?)<\/markdownReport>/i;
+                const match = lastStatusMessage.match(regex);
+                console.debug(`match: ${JSON.stringify(match, null, 2)}`);
+                if (!match || match.length < 2) {
+                    console.error("No <markdownReport>...</markdownReport> content found.");
+                    return res
+                        .status(400)
+                        .send("No <markdownReport>...</markdownReport> content found.");
+                }
+                const markdownContent = match[1];
+                const htmlContent = await marked(markdownContent);
+                const docxBuffer = await HTMLtoDOCX(htmlContent);
+                console.debug(`docxBuffer: ${docxBuffer.length}`);
+                res.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+                res.setHeader("Content-disposition", 'attachment; filename="converted.docx"');
+                return res.send(docxBuffer);
+            }
+            catch (error) {
+                console.error("Error converting Markdown to DOCX:", error);
+                return res.status(500).send("Server error");
+            }
+        };
         this.advanceOrStopCurrentWorkflowStep = async (req, res) => {
             const { groupId, agentId, runId } = req.params;
             const { status, wsClientId } = req.body;
@@ -271,6 +303,7 @@ export class AssistantController {
             }
         };
         this.wsClients = wsClients;
+        this.agentQueueManager = new AgentQueueManager();
         this.initializeRoutes();
         this.initializeModels();
     }
@@ -286,6 +319,11 @@ export class AssistantController {
         this.router.post("/:groupId/:agentId/startNextWorkflowStep", this.startNextWorkflowStep.bind(this));
         this.router.post("/:groupId/:agentId/stopCurrentWorkflowStep", this.stopCurrentWorkflowStep.bind(this));
         this.router.put("/:groupId/:agentId/:runId/advanceOrStopWorkflow", this.advanceOrStopCurrentWorkflowStep.bind(this));
+        this.router.get("/:groupId/:agentId/getDocxReport", auth.can("view domain"), this.getDocxReport.bind(this));
+    }
+    async getLastStatusMessageFromDB(agentId) {
+        const status = await this.agentQueueManager.getAgentStatus(agentId);
+        return status ? status.messages[status.messages.length - 1] : null;
     }
     async startVoiceSession(req, res) {
         try {

package/agents/managers/subscriptionManager.js

@@ -267,6 +267,9 @@ export class SubscriptionManager {
             if (step.agentClassUuid && agentUuidMap.has(step.agentClassUuid)) {
                 newStep.agentId = agentUuidMap.get(step.agentClassUuid);
             }
+            else if (step.agentClassUuid) {
+                console.error("agentClassUuid not found in agentUuidMap", step.agentClassUuid);
+            }
             if (newStep.type === "engagmentFromInputConnector" && newStep.agentId) {
                 newStep.groupId = agentInputConnectorGroupsIds.get(newStep.agentId);
             }

package/app.js

@@ -203,11 +203,11 @@ export class YourPrioritiesApi {
         this.handleShortenedRedirects();
         this.initializeRateLimiting();
         this.setupDomainAndCommunity();
-        this.setupStaticFileServing();
         this.setupSitemapRoute();
         this.initializePassportStrategies();
-        this.checkAuthForSsoInit();
         this.addInviteAsAnonMiddleWare();
+        this.setupStaticFileServing();
+        this.checkAuthForSsoInit();
         this.initializeRoutes();
         this.initializeEsControllers();
     }
@@ -221,11 +221,11 @@ export class YourPrioritiesApi {
         this.handleShortenedRedirects();
         this.initializeRateLimiting();
         this.setupDomainAndCommunity();
-        this.setupStaticFileServing();
         this.setupSitemapRoute();
         this.initializePassportStrategies();
-        this.checkAuthForSsoInit();
         this.addInviteAsAnonMiddleWare();
+        this.setupStaticFileServing();
+        this.checkAuthForSsoInit();
         this.initializeRoutes();
         this.initializeEsControllers();
     }
@@ -327,7 +327,7 @@ export class YourPrioritiesApi {
                                 notifications_settings: models.AcNotification
                                     .anonymousNotificationSettings,
                                 status: "active",
-                                //TODO: Having this block security for the cloned groups, find a better solution
+                                //TODO: Having this blocks security for the cloned groups, find a better solution
                                 //profile_data: { isAnonymousUser: true },
                             });
                         }
@@ -348,9 +348,15 @@ export class YourPrioritiesApi {
                         // Mark invite as used
                         invite.joined_at = new Date();
                         await invite.save();
+                        console.log("Invite joined at", invite.joined_at);
                         await new Promise((resolve, reject) => {
                             req.logIn(user, (error) => (error ? reject(error) : resolve()));
                         });
+                        console.log("User logged in for anon invite");
+                        return next();
+                    }
+                    else {
+                        console.error("Invite not found");
                         return next();
                     }
                 }

package/controllers/groups.cjs

@@ -1013,7 +1013,7 @@ router.post("/:groupId/sendEmailInvitesForAnons", auth.can("edit group"), async
                 community_id: group.community_id,
                 from_user_id: req.user.id,
             });
-            const invite_link = `/group/${group.id}?anonInvite=1&token=${token}`;
+            const invite_link = `/group/${group.id}?anonInvite=1&token=${token}&forAgentBundle=1`;
             const createActivityPromise = new Promise((resolve, reject) => {
                 models.AcActivity.inviteCreated({
                     email: email,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.77",
+  "version": "9.0.78",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -51,6 +51,7 @@
     "express-session": "git+https://github.com/rbjarnason/session.git#upgrade-21",
     "express-useragent": "^1.0.13",
     "farmhash": "3.3.1",
+    "html-to-docx": "^1.8.0",
     "i18next": "^23.12.2",
     "i18next-node-fs-backend": "^2.1.3",
     "image-size": "^1.0.2",
@@ -60,6 +61,7 @@
     "jsonrepair": "^3.5.0",
     "knuth-shuffle-seeded": "^1.0.6",
     "lodash": "^4.17.15",
+    "marked": "^15.0.4",
     "moment": "^2.24.0",
     "morgan": "~1.10.0",
     "multer": "1.4.5-lts.1",
@@ -111,6 +113,8 @@
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.17.3",
     "@types/express-useragent": "^1.0.5",
+    "@types/html-docx-js": "^0.3.4",
+    "@types/marked": "^6.0.0",
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.14.12",
     "@types/passport": "^1.0.16",