@yrpri/api 9.0.117 → 9.0.120

package/app.js

@@ -507,10 +507,13 @@ export class YourPrioritiesApi {
         this.app.set("views", __dirname + "/views");
         this.app.set("view engine", "pug");
         const store = new RedisStore({ client: this.redisClient, ttl: 86400 });
+        if (!process.env.SESSION_SECRET) {
+            throw new Error("SESSION_SECRET is not set");
+        }
         const sessionConfig = {
             store: store,
             name: "yrpri.sid",
-            secret: process.env.SESSION_SECRET || "not so secret... use env var.",
+            secret: process.env.SESSION_SECRET,
             resave: false,
             proxy: process.env.USING_NGINX_PROXY ? true : undefined,
             cookie: { autoSubDomain: true },

package/authorization.cjs

@@ -270,7 +270,7 @@ auth.authNeedsGroupAdminForCreate = function (group, req, done) {
         done(null, false);
     });
 };
-auth.authNeedsCommunnityAdminForCreate = function (community, req, done) {
+auth.authNeedsCommunityAdminForCreate = function (community, req, done) {
     models.Community.findOne({
         where: { id: community.id },
         attributes: ["id", "access", "user_id", "configuration"],
@@ -932,6 +932,10 @@ auth.entity("group", function (req, done) {
         match = req.originalUrl.match(/allOurIdeas\/(\w+)/);
     if (!match)
         match = req.originalUrl.match(/agents\/(\w+)/);
+    if (!match)
+        match = req.originalUrl.match(/pdf_processing\/(\w+)/);
+    if (!match)
+        match = req.originalUrl.match(/feedback\/(\w+)/);
     if (!match)
         match = req.originalUrl.match(/assistants\/(\w+)/);
     if (!match)
@@ -1577,7 +1581,7 @@ auth.entity("category", function (req, done) {
 // CREATE
 // Create bulkStatusUpdate
 auth.role("createCommunityBulkStatusUpdate.createBulkStatusUpdate", function (community, req, done) {
-    auth.authNeedsCommunnityAdminForCreate(community, req, done);
+    auth.authNeedsCommunityAdminForCreate(community, req, done);
 });
 auth.entity("createCommunityBulkStatusUpdate", function (req, done) {
     var match = req.originalUrl.match(/bulk_status_updates\/(\w+)/);
@@ -1772,7 +1776,7 @@ auth.role("createDomainOrganization.createDomainOrganization", function (domain,
         done(null, false);
     });
 });
-auth.role("createCommunityOrganization.createCommunityOrganization", function (domain, req, done) {
+auth.role("createCommunityOrganization.createCommunityOrganization", function (community, req, done) {
     models.Community.findOne({
         where: { id: community.id },
     })
@@ -1780,7 +1784,7 @@ auth.role("createCommunityOrganization.createCommunityOrganization", function (d
         if (!auth.isAuthenticated(req)) {
             done(null, false);
         }
-        else if (community.access === models.Domain.ACCESS_PUBLIC) {
+        else if (community.access === models.Community.ACCESS_PUBLIC) {
             done(null, true);
         }
         else if (community.user_id === req.user.id) {

package/controllers/allOurIdeas.d.ts

@@ -26,7 +26,7 @@ export declare class AllOurIdeasController {
     showEarl(req: Request, res: Response): Promise<void>;
     vote(req: Request, res: Response): Promise<void>;
     createQuestion(req: Request, res: Response): Promise<void>;
-    updateCoiceData(req: Request, res: Response): Promise<void>;
+    updateChoiceData(req: Request, res: Response): Promise<void>;
     updateActive(req: Request, res: Response): Promise<void>;
     updateQuestionName(req: Request, res: Response): Promise<void>;
     skip(req: Request, res: Response): Promise<void>;

package/controllers/allOurIdeas.js

@@ -47,9 +47,9 @@ export class AllOurIdeasController {
         this.router.post("/:groupId/questions/:questionId/prompts/:promptId/skips", auth.can("view group"), this.skip.bind(this));
         this.router.post("/:groupId/questions/:questionId/addIdea", auth.can("view group"), this.addIdea.bind(this));
         this.router.get("/:groupId/questions/:wsClientSocketId/:analysisIndex/:analysisTypeIndex/analysis", auth.can("view group"), this.analysis.bind(this));
-        this.router.put("/:communityId/questions/:questionId/choices/:choiceId", auth.can("create group"), this.updateCoiceData.bind(this));
-        this.router.put("/:domainId/questions/:questionId/choices/:choiceId/throughDomain", auth.can("create community"), this.updateCoiceData.bind(this));
-        this.router.put("/:groupId/questions/:questionId/choices/:choiceId/throughGroup", auth.can("view group"), this.updateCoiceData.bind(this));
+        this.router.put("/:communityId/questions/:questionId/choices/:choiceId", auth.can("create group"), this.updateChoiceData.bind(this));
+        this.router.put("/:domainId/questions/:questionId/choices/:choiceId/throughDomain", auth.can("create community"), this.updateChoiceData.bind(this));
+        this.router.put("/:groupId/questions/:questionId/choices/:choiceId/throughGroup", auth.can("view group"), this.updateChoiceData.bind(this));
         this.router.put("/:communityId/questions/:questionId/choices/:choiceId/active", auth.can("create group"), this.updateActive.bind(this));
         this.router.put("/:domainId/questions/:questionId/choices/:choiceId/active/throughDomain", auth.can("create community"), this.updateActive.bind(this));
         this.router.put("/:communityId/questions/:questionId/name", auth.can("create group"), this.updateQuestionName.bind(this));
@@ -409,7 +409,7 @@ export class AllOurIdeasController {
                 .json({ error: "An error occurred during question creation" });
         }
     }
-    async updateCoiceData(req, res) {
+    async updateChoiceData(req, res) {
         try {
             const response = await fetch(`${PAIRWISE_API_HOST}/questions/${req.params.questionId}/choices/${req.params.choiceId}.json`, {
                 method: "PUT",

package/controllers/categories.cjs

@@ -92,16 +92,27 @@ router.post('/:groupId', auth.can('create category'), function (req, res) {
     });
     category.save().then(function () {
         log.info('Category Created', { category: category, context: 'create', user: toJson(req.user) });
-        models.AcActivity.createActivity({
-            type: 'activity.category.created',
-            userId: req.user.id,
-            domainId: req.ypDomain.id,
-            groupId: req.params.groupId,
-            //      communityId: req.ypCommunity ?  req.ypCommunity.id : null,
-            object: { categoryId: category.id }
-        }, function () {
-            category.setupImages(req.body, function (error) {
-                sendCategoryOrError(res, category, 'setupImages', req.user, error);
+        models.Group.findOne({
+            where: { id: req.params.groupId },
+            attributes: ['id', 'community_id'],
+            include: [
+                {
+                    model: models.Community,
+                    attributes: ['id', 'domain_id']
+                }
+            ]
+        }).then(function (group) {
+            models.AcActivity.createActivity({
+                type: 'activity.category.created',
+                userId: req.user.id,
+                domainId: group && group.Community ? group.Community.domain_id : req.ypDomain.id,
+                groupId: req.params.groupId,
+                //      communityId: req.ypCommunity ?  req.ypCommunity.id : null,
+                object: { categoryId: category.id }
+            }, function () {
+                category.setupImages(req.body, function (error) {
+                    sendCategoryOrError(res, category, 'setupImages', req.user, error);
+                });
             });
         });
     }).catch(function (error) {

package/controllers/communities.cjs

@@ -729,6 +729,7 @@ const updateCommunityConfigParameters = function (req, community) {
     community.set("configuration.disableGroupDynamicFontSizes", truthValueFromBody(req.body.disableGroupDynamicFontSizes));
     community.set("configuration.hideGroupListCardObjectives", truthValueFromBody(req.body.hideGroupListCardObjectives));
     community.set("configuration.alwaysHideLogoImage", truthValueFromBody(req.body.alwaysHideLogoImage));
+    community.set("configuration.hideItemCount", truthValueFromBody(req.body.hideItemCount));
     community.set("configuration.recalculateCountersRecursively", truthValueFromBody(req.body.recalculateCountersRecursively));
     if (req.body.google_analytics_code && req.body.google_analytics_code != "") {
         community.google_analytics_code = req.body.google_analytics_code;
@@ -812,6 +813,7 @@ const updateCommunityConfigParameters = function (req, community) {
         ? req.body.themeOverrideBackgroundColor
         : null);
     community.set("configuration.sortBySortOrder", truthValueFromBody(req.body.sortBySortOrder));
+    community.set("configuration.sortAlphabetically", truthValueFromBody(req.body.sortAlphabetically));
     community.set("configuration.orderByRandom", truthValueFromBody(req.body.orderByRandom));
     community.set("configuration.enableFraudDetection", truthValueFromBody(req.body.enableFraudDetection));
     community.set("configuration.useZiggeo", truthValueFromBody(req.body.useZiggeo));
@@ -1038,16 +1040,28 @@ router.post("/:communityId/:userEmail/invite_user", auth.can("edit community"),
         },
         function (callback) {
             if (!req.query.addToCommunityDirectly) {
-                models.AcActivity.inviteCreated({
-                    email: req.params.userEmail,
-                    user_id: user ? user.id : null,
-                    sender_user_id: req.user.id,
-                    community_id: req.params.communityId,
-                    sender_name: req.user.name,
-                    domain_id: req.ypDomain.id,
-                    invite_id: invite.id,
-                    token: token,
-                }, function (error) {
+                models.Community.findOne({
+                    where: {
+                        id: req.params.communityId,
+                    },
+                    attributes: ["id", "domain_id"],
+                })
+                    .then(function (community) {
+                    const domainId = community ? community.domain_id : req.ypDomain.id;
+                    models.AcActivity.inviteCreated({
+                        email: req.params.userEmail,
+                        user_id: user ? user.id : null,
+                        sender_user_id: req.user.id,
+                        community_id: req.params.communityId,
+                        sender_name: req.user.name,
+                        domain_id: domainId,
+                        invite_id: invite.id,
+                        token: token,
+                    }, function (error) {
+                        callback(error);
+                    });
+                })
+                    .catch(function (error) {
                     callback(error);
                 });
             }

package/controllers/domains.cjs

@@ -807,6 +807,7 @@ function updateDomainProperties(domain, req) {
     domain.set('configuration.ziggeoApplicationToken', (req.body.ziggeoApplicationToken && req.body.ziggeoApplicationToken !== "") ? req.body.ziggeoApplicationToken : null);
     domain.set('configuration.ga4Tag', (req.body.ga4Tag && req.body.ga4Tag !== "") ? req.body.ga4Tag : null);
     domain.set('configuration.useLoginOnDomainIfNotLoggedIn', truthValueFromBody(req.body.useLoginOnDomainIfNotLoggedIn));
+    domain.set('configuration.forceElectronicIds', truthValueFromBody(req.body.forceElectronicIds));
     if (req.body.google_analytics_code && req.body.google_analytics_code !== "") {
         domain.google_analytics_code = req.body.google_analytics_code;
     }
@@ -854,6 +855,8 @@ function updateDomainProperties(domain, req) {
     domain.set('configuration.hideDomainNews', truthValueFromBody(req.body.hideDomainNews));
     domain.set('configuration.hideDomainTabs', truthValueFromBody(req.body.hideDomainTabs));
     domain.set('configuration.hideAllTabs', truthValueFromBody(req.body.hideAllTabs));
+    domain.set('configuration.hideItemCount', truthValueFromBody(req.body.hideItemCount));
+    domain.set('configuration.sortAlphabetically', truthValueFromBody(req.body.sortAlphabetically));
     domain.set('configuration.useFixedTopAppBar', truthValueFromBody(req.body.useFixedTopAppBar));
     domain.set('configuration.disableArrowBasedTopNavigation', truthValueFromBody(req.body.disableArrowBasedTopNavigation));
     domain.set('configuration.onlyAllowCreateUserOnInvite', truthValueFromBody(req.body.onlyAllowCreateUserOnInvite));

package/controllers/groups.cjs

@@ -181,6 +181,7 @@ var updateGroupConfigParameters = function (req, group) {
     group.set("configuration.canVote", truthValueFromBody(req.body.canVote));
     group.set("configuration.canAddNewPosts", truthValueFromBody(req.body.canAddNewPosts));
     group.set("configuration.disableDebate", truthValueFromBody(req.body.disableDebate));
+    group.set("configuration.hideDebate", truthValueFromBody(req.body.hideDebate));
     group.set("configuration.locationHidden", truthValueFromBody(req.body.locationHidden));
     group.set("configuration.showWhoPostedPosts", truthValueFromBody(req.body.showWhoPostedPosts));
     group.set("configuration.allowAnonymousUsers", truthValueFromBody(req.body.allowAnonymousUsers));
@@ -287,6 +288,7 @@ var updateGroupConfigParameters = function (req, group) {
     group.set("configuration.showNameUnderLogoImage", truthValueFromBody(req.body.showNameUnderLogoImage));
     group.set("configuration.alwaysHideLogoImage", truthValueFromBody(req.body.alwaysHideLogoImage));
     group.set("configuration.hideStatsAndMembership", truthValueFromBody(req.body.hideStatsAndMembership));
+    group.set("configuration.hideItemCount", truthValueFromBody(req.body.hideItemCount));
     group.set("configuration.centerGroupName", truthValueFromBody(req.body.centerGroupName));
     group.set("configuration.noGroupCardShadow", truthValueFromBody(req.body.noGroupCardShadow));
     group.set("configuration.hideNewestFromFilter", truthValueFromBody(req.body.hideNewestFromFilter));
@@ -1088,16 +1090,36 @@ router.post("/:groupId/:userEmail/invite_user", auth.can("edit group"), function
         },
         function (callback) {
             if (!req.query.addToGroupDirectly) {
-                models.AcActivity.inviteCreated({
-                    email: req.params.userEmail,
-                    user_id: user ? user.id : null,
-                    sender_user_id: req.user.id,
-                    sender_name: req.user.name,
-                    group_id: req.params.groupId,
-                    domain_id: req.ypDomain.id,
-                    invite_id: invite.id,
-                    token: token,
-                }, function (error) {
+                models.Group.findOne({
+                    where: {
+                        id: req.params.groupId,
+                    },
+                    attributes: ["id", "community_id"],
+                    include: [
+                        {
+                            model: models.Community,
+                            attributes: ["id", "domain_id"],
+                        },
+                    ],
+                })
+                    .then(function (group) {
+                    const domainId = group && group.Community
+                        ? group.Community.domain_id
+                        : req.ypDomain.id;
+                    models.AcActivity.inviteCreated({
+                        email: req.params.userEmail,
+                        user_id: user ? user.id : null,
+                        sender_user_id: req.user.id,
+                        sender_name: req.user.name,
+                        group_id: req.params.groupId,
+                        domain_id: domainId,
+                        invite_id: invite.id,
+                        token: token,
+                    }, function (error) {
+                        callback(error);
+                    });
+                })
+                    .catch(function (error) {
                     callback(error);
                 });
             }

package/controllers/images.cjs

@@ -43,17 +43,28 @@ var sendError = function (res, image, context, user, error) {
     res.sendStatus(500);
 };
 var sendPostUserImageActivity = function (req, type, post, image, callback) {
-    models.AcActivity.createActivity({
-        type: type,
-        userId: post.user_id,
-        domainId: req.ypDomain.id,
-        groupId: post.group_id,
-        //    communityId: req.ypCommunity ?  req.ypCommunity.id : null,
-        postId: post.id,
-        imageId: image.id,
-        access: models.AcActivity.ACCESS_PUBLIC,
-    }, function (error) {
-        callback(error);
+    models.Group.findOne({
+        where: { id: post.group_id },
+        attributes: ["id", "community_id"],
+        include: [
+            {
+                model: models.Community,
+                attributes: ["id", "domain_id"],
+            },
+        ],
+    }).then(function (group) {
+        models.AcActivity.createActivity({
+            type: type,
+            userId: post.user_id,
+            domainId: group && group.Community ? group.Community.domain_id : req.ypDomain.id,
+            groupId: post.group_id,
+            //    communityId: req.ypCommunity ?  req.ypCommunity.id : null,
+            postId: post.id,
+            imageId: image.id,
+            access: models.AcActivity.ACCESS_PUBLIC,
+        }, function (error) {
+            callback(error);
+        });
     });
 };
 var addUserImageToPost = function (postId, imageId, callback) {

package/controllers/index.cjs

@@ -421,7 +421,9 @@ async function initializeIndexCache() {
         log.error("Failed to initialize index cache", { error });
     }
 }
-initializeIndexCache();
+if (!process.env.SKIP_INDEX_HTML_CACHE) {
+    initializeIndexCache();
+}
 router.get("/", function (req, res) {
     sendIndex(req, res);
 });

package/controllers/points.cjs

@@ -422,40 +422,53 @@ router.put("/:pointId", auth.can("edit point"), function (req, res) {
                     userId: req.user ? req.user.id : -1,
                 });
                 queue.add("process-similarities", { type: "update-collection", pointId: point.id }, "low");
-                models.AcActivity.createActivity({
-                    type: "activity.point.edited",
-                    userId: point.user_id,
-                    domainId: req.ypDomain.id,
-                    //          communityId: req.ypCommunity ?  req.ypCommunity.id : null,
-                    groupId: point.group_id,
-                    postId: point.post_id,
-                    pointId: point.id,
-                    access: models.AcActivity.ACCESS_PUBLIC,
-                }, function (error) {
-                    loadPointWithAll(point.id, function (error, loadedPoint) {
-                        if (error) {
-                            log.error("Could not reload point point", {
-                                err: error,
-                                context: "createPoint",
-                                user: toJson(req.user.simple()),
-                            });
-                            res.sendStatus(500);
-                        }
-                        else {
-                            if (loadedPoint.PointRevisions &&
-                                loadedPoint.PointRevisions.length > 0 &&
-                                loadedPoint.PointRevisions[loadedPoint.PointRevisions.length - 1].content !== "") {
-                                log.info("process-moderation point toxicity after create point");
-                                queue.add("process-moderation", {
-                                    type: "estimate-point-toxicity",
-                                    pointId: loadedPoint.id,
-                                }, "high");
+                models.Group.findOne({
+                    where: { id: point.group_id },
+                    attributes: ["id", "community_id"],
+                    include: [
+                        {
+                            model: models.Community,
+                            attributes: ["id", "domain_id"],
+                        },
+                    ],
+                }).then(function (group) {
+                    models.AcActivity.createActivity({
+                        type: "activity.point.edited",
+                        userId: point.user_id,
+                        domainId: group && group.Community
+                            ? group.Community.domain_id
+                            : req.ypDomain.id,
+                        //          communityId: req.ypCommunity ?  req.ypCommunity.id : null,
+                        groupId: point.group_id,
+                        postId: point.post_id,
+                        pointId: point.id,
+                        access: models.AcActivity.ACCESS_PUBLIC,
+                    }, function (error) {
+                        loadPointWithAll(point.id, function (error, loadedPoint) {
+                            if (error) {
+                                log.error("Could not reload point point", {
+                                    err: error,
+                                    context: "createPoint",
+                                    user: toJson(req.user.simple()),
+                                });
+                                res.sendStatus(500);
                             }
                             else {
-                                log.info("No process-moderation toxicity for empty text on point");
+                                if (loadedPoint.PointRevisions &&
+                                    loadedPoint.PointRevisions.length > 0 &&
+                                    loadedPoint.PointRevisions[loadedPoint.PointRevisions.length - 1].content !== "") {
+                                    log.info("process-moderation point toxicity after create point");
+                                    queue.add("process-moderation", {
+                                        type: "estimate-point-toxicity",
+                                        pointId: loadedPoint.id,
+                                    }, "high");
+                                }
+                                else {
+                                    log.info("No process-moderation toxicity for empty text on point");
+                                }
+                                res.send(loadedPoint);
                             }
-                            res.send(loadedPoint);
-                        }
+                        });
                     });
                 });
             });
@@ -714,17 +727,30 @@ router.post("/:groupId", auth.can("create point"), function (req, res) {
                 });
             },
             (parallelCallback) => {
-                models.AcActivity.createActivity({
-                    type: "activity.point.new",
-                    userId: point.user_id,
-                    domainId: req.ypDomain.id,
-                    //        communityId: req.ypCommunity ?  req.ypCommunity.id : null,
-                    groupId: point.group_id,
-                    postId: point.post_id,
-                    pointId: point.id,
-                    access: models.AcActivity.ACCESS_PUBLIC,
-                }, function (error) {
-                    parallelCallback(error);
+                models.Group.findOne({
+                    where: { id: point.group_id },
+                    attributes: ["id", "community_id"],
+                    include: [
+                        {
+                            model: models.Community,
+                            attributes: ["id", "domain_id"],
+                        },
+                    ],
+                }).then(function (group) {
+                    models.AcActivity.createActivity({
+                        type: "activity.point.new",
+                        userId: point.user_id,
+                        domainId: group && group.Community
+                            ? group.Community.domain_id
+                            : req.ypDomain.id,
+                        //        communityId: req.ypCommunity ?  req.ypCommunity.id : null,
+                        groupId: point.group_id,
+                        postId: point.post_id,
+                        pointId: point.id,
+                        access: models.AcActivity.ACCESS_PUBLIC,
+                    }, function (error) {
+                        parallelCallback(error);
+                    });
                 });
             },
             (parallelCallback) => {
@@ -950,20 +976,33 @@ router.post("/:id/pointQuality", auth.can("vote on point"), function (req, res)
                     }
                 },
                 function (seriesCallback) {
-                    models.AcActivity.createActivity({
-                        type: pointQuality.value > 0
-                            ? "activity.point.helpful.new"
-                            : "activity.point.unhelpful.new",
-                        userId: pointQuality.user_id,
-                        domainId: req.ypDomain.id,
-                        //            communityId: req.ypCommunity ?  req.ypCommunity.id : null,
-                        pointQualityId: pointQuality.id,
-                        groupId: point.group_id,
-                        postId: point.post_id,
-                        pointId: point.id,
-                        access: models.AcActivity.ACCESS_PUBLIC,
-                    }, function (error) {
-                        seriesCallback(error);
+                    models.Group.findOne({
+                        where: { id: point.group_id },
+                        attributes: ["id", "community_id"],
+                        include: [
+                            {
+                                model: models.Community,
+                                attributes: ["id", "domain_id"],
+                            },
+                        ],
+                    }).then(function (group) {
+                        models.AcActivity.createActivity({
+                            type: pointQuality.value > 0
+                                ? "activity.point.helpful.new"
+                                : "activity.point.unhelpful.new",
+                            userId: pointQuality.user_id,
+                            domainId: group && group.Community
+                                ? group.Community.domain_id
+                                : req.ypDomain.id,
+                            //            communityId: req.ypCommunity ?  req.ypCommunity.id : null,
+                            pointQualityId: pointQuality.id,
+                            groupId: point.group_id,
+                            postId: point.post_id,
+                            pointId: point.id,
+                            access: models.AcActivity.ACCESS_PUBLIC,
+                        }, function (error) {
+                            seriesCallback(error);
+                        });
                     });
                 },
                 function (seriesCallback) {

package/controllers/posts.cjs

@@ -1088,7 +1088,13 @@ router.post("/:groupId", auth.can("create post"), async function (req, res) {
         where: {
             id: req.params.groupId,
         },
-        attributes: ["id", "configuration"],
+        attributes: ["id", "configuration", "community_id"],
+        include: [
+            {
+                model: models.Community,
+                attributes: ["id", "domain_id"],
+            },
+        ],
     })
         .then((group) => {
         var post = models.Post.build({
@@ -1135,7 +1141,9 @@ router.post("/:groupId", auth.can("create post"), async function (req, res) {
                                 models.AcActivity.createActivity({
                                     type: "activity.post.new",
                                     userId: post.user_id,
-                                    domainId: req.ypDomain.id,
+                                    domainId: group && group.Community
+                                        ? group.Community.domain_id
+                                        : req.ypDomain.id,
                                     groupId: post.group_id,
                                     //                communityId: req.ypCommunity ?  req.ypCommunity.id : null,
                                     postId: post.id,
@@ -1702,7 +1710,9 @@ router.post("/:id/endorse", auth.can("vote on post"), async function (req, res)
                         });
                         async.series([
                             function (seriesCallback) {
-                                if (post) {
+                                if (post &&
+                                    post.Group &&
+                                    post.Group.Community) {
                                     endorsement.dataValues.Post = post;
                                     seriesCallback();
                                 }
@@ -1710,6 +1720,18 @@ router.post("/:id/endorse", auth.can("vote on post"), async function (req, res)
                                     models.Post.findOne({
                                         where: { id: endorsement.post_id },
                                         attributes: ["id", "group_id"],
+                                        include: [
+                                            {
+                                                model: models.Group,
+                                                attributes: ["id", "community_id"],
+                                                include: [
+                                                    {
+                                                        model: models.Community,
+                                                        attributes: ["id", "domain_id"],
+                                                    },
+                                                ],
+                                            },
+                                        ],
                                     }).then(function (results) {
                                         if (results) {
                                             post = results;
@@ -1728,7 +1750,11 @@ router.post("/:id/endorse", auth.can("vote on post"), async function (req, res)
                                         ? "activity.post.endorsement.new"
                                         : "activity.post.opposition.new",
                                     userId: endorsement.user_id,
-                                    domainId: req.ypDomain.id,
+                                    domainId: post &&
+                                        post.Group &&
+                                        post.Group.Community
+                                        ? post.Group.Community.domain_id
+                                        : req.ypDomain.id,
                                     endorsementId: endorsement.id,
                                     //            communityId: req.ypCommunity ?  req.ypCommunity.id : null,
                                     groupId: post.group_id,

package/controllers/ratings.cjs

@@ -110,16 +110,38 @@ router.post('/:post_id/:type_index', auth.can('rate post'), function (req, res)
                     });
                 },
                 function (seriesCallback) {
-                    models.AcActivity.createActivity({
-                        type: 'activity.post.rating.new',
-                        userId: rating.user_id,
-                        domainId: req.ypDomain.id,
-                        groupId: post.group_id,
-                        ratingId: rating.id,
-                        postId: post.id,
-                        access: models.AcActivity.ACCESS_PRIVATE
-                    }, function (error) {
-                        seriesCallback(error);
+                    models.Post.findOne({
+                        where: { id: rating.post_id },
+                        attributes: ['id', 'group_id'],
+                        include: [
+                            {
+                                model: models.Group,
+                                attributes: ['id', 'community_id'],
+                                include: [
+                                    {
+                                        model: models.Community,
+                                        attributes: ['id', 'domain_id']
+                                    }
+                                ]
+                            }
+                        ]
+                    }).then(function (loadedPost) {
+                        const domainId = loadedPost &&
+                            loadedPost.Group &&
+                            loadedPost.Group.Community
+                            ? loadedPost.Group.Community.domain_id
+                            : req.ypDomain.id;
+                        models.AcActivity.createActivity({
+                            type: 'activity.post.rating.new',
+                            userId: rating.user_id,
+                            domainId: domainId,
+                            groupId: post.group_id,
+                            ratingId: rating.id,
+                            postId: post.id,
+                            access: models.AcActivity.ACCESS_PRIVATE
+                        }, function (error) {
+                            seriesCallback(error);
+                        });
                     });
                 }
             ], function (error) {

package/controllers/users.cjs

@@ -1246,6 +1246,12 @@ const setSAMLSettingsOnUser = (req, user, done) => {
                     customSamlLoginMessage = community.configuration.customSamlLoginMessage;
                 }
             }
+            if (!forceSecureSamlLogin &&
+                req.ypDomain &&
+                req.ypDomain.configuration &&
+                req.ypDomain.configuration.forceElectronicIds) {
+                forceSecureSamlLogin = true;
+            }
             if (user.dataValues) {
                 user.dataValues.forceSecureSamlLogin = forceSecureSamlLogin;
                 user.dataValues.customSamlDeniedMessage = customSamlDeniedMessage;
@@ -1581,14 +1587,28 @@ router.post('/reset/:token', function (req, res) {
         },
         function (done) {
             if (req.user) {
-                models.AcActivity.createActivity({
-                    type: 'activity.password.changed',
-                    userId: req.user.id,
-                    domainId: req.ypDomain.id,
-                    groupId: req.params.groupId
-                    //          communityId: req.ypCommunity ?  req.ypCommunity.id : null
-                }, function (error) {
-                    done(error);
+                const fetchGroup = req.params.groupId
+                    ? models.Group.findOne({
+                        where: { id: req.params.groupId },
+                        attributes: ['id', 'community_id'],
+                        include: [
+                            {
+                                model: models.Community,
+                                attributes: ['id', 'domain_id']
+                            }
+                        ]
+                    })
+                    : Promise.resolve(null);
+                fetchGroup.then(function (group) {
+                    models.AcActivity.createActivity({
+                        type: 'activity.password.changed',
+                        userId: req.user.id,
+                        domainId: group && group.Community ? group.Community.domain_id : req.ypDomain.id,
+                        groupId: req.params.groupId
+                        //          communityId: req.ypCommunity ?  req.ypCommunity.id : null
+                    }, function (error) {
+                        done(error);
+                    });
                 });
             }
             else {

package/models/post.cjs

@@ -206,6 +206,7 @@ module.exports = (sequelize, DataTypes) => {
     Post.CONTENT_BLOG = 4;
     Post.CONTENT_QUESTION = 5;
     Post.CONTENT_SURVEY = 6;
+    Post.CONTENT_AGENT_CONVERSATION = 7;
     Post.getSearchVector = () => {
         return 'PostText';
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.117",
+  "version": "9.0.120",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -25,7 +25,7 @@
     "@google-cloud/vertexai": "^1.10.0",
     "@google-cloud/vision": "^5.1.0",
     "@node-saml/passport-saml": "^5.0.1",
-    "@policysynth/agents": "^1.3.95",
+    "@policysynth/agents": "^1.3.101",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
     "aws-sdk": "^2.1692.0",

package/scripts/users/createUserAddDomain.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/users/createUserAddDomain.js

@@ -0,0 +1,37 @@
+import bcrypt from 'bcrypt';
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [domainIdArg, email, name, password, ssn] = process.argv.slice(2);
+        if (!domainIdArg || !email || !name || !password) {
+            console.log('Usage: node createUserAddDomain.js <domainId> <email> <name> <password> [ssn]');
+            process.exit(1);
+        }
+        const domainId = Number(domainIdArg);
+        const domain = await models.Domain.findOne({ where: { id: domainId } });
+        if (!domain) {
+            console.error(`Domain ${domainId} not found`);
+            process.exit(1);
+        }
+        const existing = await models.User.findOne({ where: { email } });
+        if (existing) {
+            console.error(`User with email ${email} already exists`);
+            process.exit(1);
+        }
+        const hashed = await bcrypt.hash(password, 10);
+        const user = await models.User.create({
+            email,
+            name,
+            status: 'active',
+            ssn: ssn ? Number(ssn) : undefined,
+            encrypted_password: hashed,
+        });
+        await domain.addDomainUsers(user);
+        console.log(`User ${email} created and added to domain ${domain.name}`);
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/scripts/users/listDomainUsersWithSsn.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/users/listDomainUsersWithSsn.js

@@ -0,0 +1,30 @@
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [domainIdArg] = process.argv.slice(2);
+        if (!domainIdArg) {
+            console.log('Usage: node listDomainUsersWithSsn.js <domainId>');
+            process.exit(1);
+        }
+        const domainId = Number(domainIdArg);
+        const domain = await models.Domain.findOne({
+            where: { id: domainId },
+            include: [{ model: models.User, as: 'DomainUsers' }],
+        });
+        if (!domain) {
+            console.error(`Domain ${domainId} not found`);
+            process.exit(1);
+        }
+        console.log('email,name,ssn');
+        for (const user of domain.DomainUsers) {
+            if (user.ssn) {
+                console.log(`${user.email},${user.name},${user.ssn}`);
+            }
+        }
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/scripts/users/removeUserFromDomain.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/users/removeUserFromDomain.js

@@ -0,0 +1,28 @@
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [domainIdArg, email] = process.argv.slice(2);
+        if (!domainIdArg || !email) {
+            console.log('Usage: node removeUserFromDomain.js <domainId> <email>');
+            process.exit(1);
+        }
+        const domainId = Number(domainIdArg);
+        const domain = await models.Domain.findOne({ where: { id: domainId } });
+        if (!domain) {
+            console.error(`Domain ${domainId} not found`);
+            process.exit(1);
+        }
+        const user = await models.User.findOne({ where: { email } });
+        if (!user) {
+            console.error(`User ${email} not found`);
+            process.exit(1);
+        }
+        await domain.removeDomainUsers(user);
+        console.log(`Removed ${email} from domain ${domain.name}`);
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/scripts/users/updatePasswordFromSsn.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/users/updatePasswordFromSsn.js

@@ -0,0 +1,25 @@
+import bcrypt from 'bcrypt';
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [ssnArg, password] = process.argv.slice(2);
+        if (!ssnArg || !password) {
+            console.log('Usage: node updatePasswordFromSsn.js <ssn> <newPassword>');
+            process.exit(1);
+        }
+        const ssn = Number(ssnArg);
+        const user = await models.User.findOne({ where: { ssn } });
+        if (!user) {
+            console.error(`User with ssn ${ssn} not found`);
+            process.exit(1);
+        }
+        user.encrypted_password = await bcrypt.hash(password, 10);
+        await user.save();
+        console.log(`Updated password for ${user.email}`);
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/scripts/users/updateUserSsnFromEmail.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/users/updateUserSsnFromEmail.js

@@ -0,0 +1,24 @@
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [email, ssnArg] = process.argv.slice(2);
+        if (!email || !ssnArg) {
+            console.log('Usage: node updateUserSsnFromEmail.js <email> <ssn>');
+            process.exit(1);
+        }
+        const user = await models.User.findOne({ where: { email } });
+        if (!user) {
+            console.error(`User ${email} not found`);
+            process.exit(1);
+        }
+        const ssn = Number(ssnArg);
+        user.ssn = ssn;
+        await user.save();
+        console.log(`Updated SSN for ${email}`);
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/services/engine/moderation/image_labeling/ImageLabelingBase.cjs

@@ -32,16 +32,29 @@ class ImageLabelingBase {
                 const fileNameWithPath = '/tmp/' + fileName;
                 downloadFile(imageUrl, { filename: fileName, directory: '/tmp/' }, async (error) => {
                     if (error) {
-                        fs.unlink(fileNameWithPath, unlinkError => {
+                        fs.unlink(fileNameWithPath, () => {
                             reject('Could not download file');
-                            return;
                         });
+                        return;
                     }
                     else {
-                        const [result] = await this.visionClient.annotateImage({
-                            ...this.visionRequesBase,
-                            image: { source: { filename: fileNameWithPath } }
-                        });
+                        let result;
+                        try {
+                            ;
+                            [result] = await this.visionClient.annotateImage({
+                                ...this.visionRequesBase,
+                                image: { content: fs.readFileSync(fileNameWithPath) }
+                            });
+                        }
+                        catch (annotationError) {
+                            log.error('Vision API annotateImage failed', annotationError);
+                            fs.unlink(fileNameWithPath, unlinkErr => {
+                                if (unlinkErr)
+                                    log.error(unlinkErr);
+                            });
+                            resolve();
+                            return;
+                        }
                         try {
                             fs.unlink(fileNameWithPath, async (unlinkError) => {
                                 if (unlinkError)

package/services/llms/imageGeneration/chatGptImageGenerator.d.ts

@@ -4,7 +4,7 @@ export declare class ChatGptImageGenerator implements IImageGenerator {
     private readonly openAiKey?;
     constructor(openAiKey?: string);
     /**
-     * Generates an image URL from a prompt using OpenAI’s gpt-image-1 model.
+     * Generates an image URL from a prompt using OpenAI's gpt-image-1 model.
      * The returned link remains live for ~60 minutes – be sure to download
      * or cache it right away in the calling service.
      */

package/services/llms/imageGeneration/chatGptImageGenerator.js

@@ -7,7 +7,7 @@ export class ChatGptImageGenerator {
         this.openAiKey = openAiKey;
     }
     /**
-     * Generates an image URL from a prompt using OpenAI’s gpt-image-1 model.
+     * Generates an image URL from a prompt using OpenAI's gpt-image-1 model.
      * The returned link remains live for ~60 minutes – be sure to download
      * or cache it right away in the calling service.
      */
@@ -33,12 +33,15 @@ export class ChatGptImageGenerator {
                     prompt: finalPrompt,
                     quality: "medium",
                     n: 1,
-                    size
+                    size,
                 });
-                const url = res?.data?.[0]?.url;
-                if (url)
-                    return url;
-                throw new Error("No URL returned");
+                console.log("res", JSON.stringify(res, null, 2));
+                const b64Json = res?.data?.[0]?.b64_json;
+                if (b64Json) {
+                    // Assuming the image is a PNG, adjust if another format is expected
+                    return `data:image/png;base64,${b64Json}`;
+                }
+                throw new Error("No b64_json returned");
             }
             catch (err) {
                 retryCount += 1;

package/services/llms/imageGeneration/collectionImageGenerator.js

@@ -69,11 +69,22 @@ export class CollectionImageGenerator {
                     newImageUrl = imageUrl;
                 }
                 else {
-                    // 2) Download image to temporary location
-                    await this.imageProcessorService.downloadImage(imageUrl, imageFilePath, axios);
-                    console.debug(fs.existsSync(imageFilePath)
-                        ? "File downloaded successfully."
-                        : "File download failed.");
+                    // 2) Download image to temporary location or write data URI to file
+                    if (imageUrl.startsWith("data:image")) {
+                        const base64Data = imageUrl.split(",")[1];
+                        if (!base64Data) {
+                            return reject("Invalid data URI format.");
+                        }
+                        const imageBuffer = Buffer.from(base64Data, "base64");
+                        fs.writeFileSync(imageFilePath, imageBuffer);
+                        console.debug("Data URI written to file successfully.");
+                    }
+                    else {
+                        await this.imageProcessorService.downloadImage(imageUrl, imageFilePath, axios);
+                        console.debug(fs.existsSync(imageFilePath)
+                            ? "File downloaded successfully."
+                            : "File download failed.");
+                    }
                     // (Optional) If you want to resize the image before upload:
                     // const resizedPath = await this.imageProcessorService.resizeImage(imageFilePath, 1024, 1024);
                     // Upload the `resizedPath` instead of `imageFilePath`