@yrpri/api 9.0.139 → 9.0.140

package/agents/models/testData/old/updateAgentWorkflowConfiguration.js

@@ -1,5 +1,6 @@
 import { YpAgentProduct } from "../../agentProduct.js";
 import { YpSubscriptionPlan } from "../../subscriptionPlan.js";
+import log from "../../../../utils/loggerTs.js";
 async function setupAgentProductsConfiguration() {
     const competitionAgentWorkflow = {
         currentStepIndex: 0,
@@ -69,7 +70,7 @@ async function setupAgentProductsConfiguration() {
         await competitorAgentFreeTrial.save();
     }
     else {
-        console.log("CompetitorAgentFreeTrial not found");
+        log.info("CompetitorAgentFreeTrial not found");
     }
     const competitorAgentPaid = await YpAgentProduct.findByPk(2);
     if (competitorAgentPaid) {
@@ -186,7 +187,7 @@ async function setupAgentProductsConfiguration() {
         await fundingSubscriptionPlan.save();
     }
     else {
-        console.log("FundingSubscriptionPlan not found");
+        log.info("FundingSubscriptionPlan not found");
     }
     // Update subscription plans 2-5 to coming_soon
     for (let planId = 2; planId <= 5; planId++) {
@@ -200,7 +201,7 @@ async function setupAgentProductsConfiguration() {
             await subscriptionPlan.save();
         }
         else {
-            console.log(`SubscriptionPlan ${planId} not found`);
+            log.info(`SubscriptionPlan ${planId} not found`);
         }
     }
     for (let planId = 1; planId <= 2; planId++) {
@@ -223,7 +224,7 @@ async function setupAgentProductsConfiguration() {
             await subscriptionPlan.save();
         }
         else {
-            console.log(`SubscriptionPlan ${planId} not found`);
+            log.info(`SubscriptionPlan ${planId} not found`);
         }
     }
 }

package/agents/models/testData/updateAgentWorkflowConfiguration.js

@@ -1,5 +1,6 @@
 import { YpAgentProduct } from "../agentProduct.js";
 import { YpSubscriptionPlan } from "../subscriptionPlan.js";
+import log from "../../../utils/loggerTs.js";
 async function setupAgentProductsConfiguration() {
     const competitionAgentWorkflow = {
         currentStepIndex: 0,
@@ -69,7 +70,7 @@ async function setupAgentProductsConfiguration() {
         await competitorAgentFreeTrial.save();
     }
     else {
-        console.log("CompetitorAgentFreeTrial not found");
+        log.info("CompetitorAgentFreeTrial not found");
     }
     const competitorAgentPaid = await YpAgentProduct.findByPk(2);
     if (competitorAgentPaid) {
@@ -186,7 +187,7 @@ async function setupAgentProductsConfiguration() {
         await fundingSubscriptionPlan.save();
     }
     else {
-        console.log("FundingSubscriptionPlan not found");
+        log.info("FundingSubscriptionPlan not found");
     }
     // Update subscription plans 2-5 to coming_soon
     for (let planId = 2; planId <= 5; planId++) {
@@ -200,7 +201,7 @@ async function setupAgentProductsConfiguration() {
             await subscriptionPlan.save();
         }
         else {
-            console.log(`SubscriptionPlan ${planId} not found`);
+            log.info(`SubscriptionPlan ${planId} not found`);
         }
     }
     for (let planId = 1; planId <= 2; planId++) {
@@ -223,7 +224,7 @@ async function setupAgentProductsConfiguration() {
             await subscriptionPlan.save();
         }
         else {
-            console.log(`SubscriptionPlan ${planId} not found`);
+            log.info(`SubscriptionPlan ${planId} not found`);
         }
     }
 }

package/agents/tools/setTemplateWorkflowCommunityId.js

@@ -1,5 +1,6 @@
 import { sequelize } from "@policysynth/agents/dbModels/index.js";
 import { YpAgentProduct } from "../models/agentProduct.js";
+import log from "../../utils/loggerTs.js";
 /**
  * Updates the templateWorkflowCommunityId in the   configuration of a specific agent product.
  *
@@ -11,7 +12,7 @@ async function setTemplateWorkflowCommunityId(agentProductId, templateWorkflowCo
         // Find the Agent Product by ID
         const agentProduct = await YpAgentProduct.findByPk(agentProductId);
         if (!agentProduct) {
-            console.error(`Agent Product with ID ${agentProductId} not found.`);
+            log.error(`Agent Product with ID ${agentProductId} not found.`);
             return;
         }
         // If the product is found, update its configuration
@@ -21,10 +22,10 @@ async function setTemplateWorkflowCommunityId(agentProductId, templateWorkflowCo
         agentProduct.configuration = currentConfig;
         agentProduct.changed('configuration', true);
         await agentProduct.save();
-        console.log(`Successfully updated Agent Product ${agentProductId} with templateWorkflowCommunityId = ${templateWorkflowCommunityId}`);
+        log.info(`Successfully updated Agent Product ${agentProductId} with templateWorkflowCommunityId = ${templateWorkflowCommunityId}`);
     }
     catch (error) {
-        console.error(`Error updating templateWorkflowCommunityId for Agent Product ${agentProductId}:`, error);
+        log.error(`Error updating templateWorkflowCommunityId for Agent Product ${agentProductId}:`, error);
     }
     finally {
         // Close the database connection
@@ -34,12 +35,12 @@ async function setTemplateWorkflowCommunityId(agentProductId, templateWorkflowCo
 // --- Parse command line arguments ---
 const args = process.argv.slice(2);
 if (args.length !== 2) {
-    console.error("Usage: ts-node setTemplateWorkflowCommunityId.ts <agentProductId> <templateWorkflowCommunityId>");
+    log.error("Usage: ts-node setTemplateWorkflowCommunityId.ts <agentProductId> <templateWorkflowCommunityId>");
     process.exit(1);
 }
 const [agentProductId, templateWorkflowCommunityId] = args.map((arg) => Number(arg));
 if (isNaN(agentProductId) || isNaN(templateWorkflowCommunityId)) {
-    console.error("Both arguments must be valid numbers.");
+    log.error("Both arguments must be valid numbers.");
     process.exit(1);
 }
 // --- Run the function ---

package/app.d.ts

@@ -35,8 +35,9 @@ export declare class YourPrioritiesApi {
     setupDomainAndCommunity(): void;
     initializeRateLimiting(): Promise<void>;
     setupSitemapRoute(): void;
-    bearerCallback: () => void;
+    bearerCallback: () => import("winston").Logger;
     checkAuthForSsoInit(): void;
+    setupExpresLogger: (req: express.Request, res: express.Response, next: express.NextFunction) => void;
     initializeMiddlewares(): void;
     initializeEsControllers(): Promise<void>;
     setupStaticFileServing(): void;

package/app.js

@@ -1,7 +1,6 @@
 import express from "express";
 import session from "express-session";
 import path from "path";
-import morgan from "morgan";
 import bodyParser from "body-parser";
 import { RedisStore } from "connect-redis";
 import useragent from "express-useragent";
@@ -14,10 +13,10 @@ import models from "./models/index.cjs";
 if (process.env.NEW_RELIC_APP_NAME) {
     import("newrelic")
         .then((newrelic) => {
-        console.log("New Relic imported", newrelic);
+        log.info("New Relic imported", newrelic);
     })
         .catch((err) => {
-        console.error("Failed to import New Relic", err);
+        log.error("Failed to import New Relic", err);
     });
 }
 import auth from "./authorization.cjs";
@@ -64,10 +63,10 @@ if (process.env.AIRBRAKE_PROJECT_ID && process.env.AIRBRAKE_API_KEY) {
     });
 }
 process.on("uncaughtException", (err) => {
-    console.error("There was an uncaught error", err);
+    log.error("There was an uncaught error", err);
     log.error("There was an uncaught error", err);
     if (err.stack) {
-        console.error(err.stack);
+        log.error(err.stack);
         log.error(err.stack);
     }
     if (airbrake) {
@@ -85,10 +84,10 @@ process.on("uncaughtException", (err) => {
     process.exit(1);
 });
 process.on("unhandledRejection", (reason, promise) => {
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
+    log.error("Unhandled Rejection at:", promise, "reason:", reason);
     log.error("Unhandled Rejection at:", promise, "reason:", reason);
     if (reason.stack) {
-        console.error(reason.stack);
+        log.error(reason.stack);
         log.error("Unhandled Rejection at:", promise, "reason:", reason);
     }
     if (airbrake) {
@@ -130,7 +129,31 @@ export class YourPrioritiesApi {
             return false;
         };
         this.bearerCallback = function () {
-            return console.log("The user has tried to authenticate with a bearer token");
+            return log.info("The user has tried to authenticate with a bearer token");
+        };
+        this.setupExpresLogger = (req, res, next) => {
+            const start = Date.now();
+            // run after response is finished
+            res.on("finish", () => {
+                const duration = Date.now() - start;
+                // Pick level based on status code
+                const level = res.statusCode >= 500
+                    ? "error"
+                    : res.statusCode >= 400
+                        ? "warn"
+                        : "info";
+                log[level](`${req.method} ${req.originalUrl}`, {
+                    component: "express",
+                    method: req.method,
+                    url: req.originalUrl,
+                    status: res.statusCode,
+                    bytes: res.get("content-length") || 0,
+                    duration,
+                    ip: req.ip,
+                    ua: req.headers["user-agent"],
+                });
+            });
+            next();
         };
         this.completeRegisterUserLogin = (user, // Replace 'any' with the actual user type
         loginType, req, // Replace 'any' with 'YpRequest' if it's the correct type
@@ -235,7 +258,7 @@ export class YourPrioritiesApi {
                 req.session.useNewVersion = req.useNewVersion;
             }
             else {
-                console.error("Session not found in request");
+                log.error("Session not found in request");
             }
             next();
         });
@@ -260,22 +283,22 @@ export class YourPrioritiesApi {
             this.redisClient = createClient({ legacyMode: false });
         }
         this.redisClient.on("error", (err) => {
-            console.error("App Redis client error", err);
+            log.error("App Redis client error", err);
         });
         this.redisClient.on("connect", () => {
-            console.log("App Redis client is connected");
+            log.info("App Redis client is connected");
         });
         this.redisClient.on("reconnecting", () => {
-            console.log("App Redis client is reconnecting");
+            log.info("App Redis client is reconnecting");
         });
         this.redisClient.on("ready", () => {
-            console.log("App Redis client is ready");
+            log.info("App Redis client is ready");
         });
         try {
             await this.redisClient.connect();
         }
         catch (err) {
-            console.error("App Failed to connect Redis client", err);
+            log.error("App Failed to connect Redis client", err);
         }
     }
     addRedisToRequest() {
@@ -353,15 +376,15 @@ export class YourPrioritiesApi {
                         // Mark invite as used
                         invite.joined_at = new Date();
                         await invite.save();
-                        console.log("Invite joined at", invite.joined_at);
+                        log.info("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");
+                        log.info("User logged in for anon invite");
                         return next();
                     }
                     else {
-                        console.error("Invite not found");
+                        log.error("Invite not found");
                         return next();
                     }
                 }
@@ -498,7 +521,7 @@ export class YourPrioritiesApi {
         });
     }
     initializeMiddlewares() {
-        this.app.use(morgan("combined"));
+        this.app.use(this.setupExpresLogger);
         this.app.use(useragent.express());
         this.app.use(requestIp.mw());
         this.app.use(bodyParser.json({ limit: "100mb", strict: false }));
@@ -543,11 +566,11 @@ export class YourPrioritiesApi {
         this.app.use(session(sessionConfig));
     }
     async initializeEsControllers() {
-        console.log("Initializing ES controllers");
+        log.info("Initializing ES controllers");
         const { AllOurIdeasController } = await import("./controllers/allOurIdeas.js");
-        console.log("Initializing ES controllers 2 " + this.wsClients);
+        log.info("Initializing ES controllers 2 " + this.wsClients);
         const aoiController = new AllOurIdeasController(this.wsClients);
-        console.log(`Controller path: ${aoiController.path} ${aoiController.router}`);
+        log.info(`Controller path: ${aoiController.path} ${aoiController.router}`);
         this.app.use(aoiController.path, aoiController.router);
         const { PolicySynthAgentsController } = await import("./agents/controllers/policySynthAgents.js");
         const policySynthAgentsController = new PolicySynthAgentsController(this.wsClients);
@@ -608,7 +631,7 @@ export class YourPrioritiesApi {
             const staticPath = req.path.startsWith("/admin")
                 ? req.adminAppPath
                 : req.clientAppPath;
-            //console.log("Static path", staticPath);
+            //log.info("Static path", staticPath);
             // Check if the request is for index.html
             if (req.path === "/" || req.path === "/index.html") {
                 index(req, res, next); // Use your dynamic handler
@@ -629,7 +652,7 @@ export class YourPrioritiesApi {
         this.app.use("/post", index);
         this.app.use("/user", index);
         this.app.use("/admin", index);
-        this.app.use('/survey*splat', index);
+        this.app.use("/survey*splat", index);
         this.app.use("/api/domains", domains);
         this.app.use("/api/organizations", organizations);
         this.app.use("/api/communities", communities);
@@ -653,24 +676,24 @@ export class YourPrioritiesApi {
         this.app.use("/pages", legacyPages);
         // Additional routes for authentication and other functionalities
         this.app.post("/authenticate_from_island_is", (req, res) => {
-            console.log("SAML SAML 1", { domainId: req.ypDomain.id });
+            log.info("SAML SAML 1", { domainId: req.ypDomain.id });
             req.sso.authenticate(`saml-strategy-${req.ypDomain.id}`, {}, req, res, (error) => {
-                console.log("SAML SAML 2", {
+                log.info("SAML SAML 2", {
                     domainId: req.ypDomain.id,
                     err: error,
                 });
                 if (error) {
-                    console.error("Error from SAML login", { err: error });
+                    log.error("Error from SAML login", { err: error });
                     error.url = req.url;
                     res.sendStatus(401);
                 }
                 else {
                     if (req.user.DestinationSSN === "6012101260") {
-                        console.log("SAML SAML 3", { domainId: req.ypDomain.id });
+                        log.info("SAML SAML 3", { domainId: req.ypDomain.id });
                         res.render("samlLoginComplete", {});
                     }
                     else {
-                        console.error("Error from SAML login", {
+                        log.error("Error from SAML login", {
                             err: "Failed DestinationSSN check",
                         });
                         res.sendStatus(401);
@@ -679,14 +702,14 @@ export class YourPrioritiesApi {
             });
         });
         this.app.post("/saml_assertion", (req, res) => {
-            console.log("SAML SAML 1 General", { domainId: req.ypDomain.id });
+            log.info("SAML SAML 1 General", { domainId: req.ypDomain.id });
             req.sso.authenticate(`saml-strategy-${req.ypDomain.id}`, {}, req, res, (error, user) => {
-                console.log("SAML SAML 2 General", {
+                log.info("SAML SAML 2 General", {
                     domainId: req.ypDomain.id,
                     err: error,
                 });
                 if (error) {
-                    console.error("Error from SAML General login", { err: error });
+                    log.error("Error from SAML General login", { err: error });
                     if (error === "customError") {
                         res.render("samlCustomError", {
                             customErrorHTML: req.ypDomain.configuration.customSAMLErrorHTML,
@@ -695,12 +718,12 @@ export class YourPrioritiesApi {
                     }
                     else {
                         error.url = req.url;
-                        console.error("Error from SAML General login", { err: error });
+                        log.error("Error from SAML General login", { err: error });
                         res.sendStatus(500);
                     }
                 }
                 else {
-                    console.log("SAML SAML 3 General", { domainId: req.ypDomain.id });
+                    log.info("SAML SAML 3 General", { domainId: req.ypDomain.id });
                     res.render("samlLoginComplete", {});
                 }
             });
@@ -961,7 +984,10 @@ export class YourPrioritiesApi {
             });
         }
         else {
-            server = this.app.listen(portNumber, function () {
+            server = this.app.listen(portNumber, function (err) {
+                if (err) {
+                    log.error("Error listening on port", { err });
+                }
                 log.info("Your Priorities Platform API Server listening on port " +
                     server.address().port +
                     ` on ${process.env.NODE_ENV}`);

package/authorization.cjs

@@ -1647,13 +1647,13 @@ auth.entity("createGroupPoint", function (req, done) {
 });
 // Create group
 auth.role("createCommunityGroup.createGroup", function (community, req, done) {
-    console.error(`createCommunityGroup.createGroup`);
+    log.error(`createCommunityGroup.createGroup`);
     models.Community.findOne({
         where: { id: community.id },
     })
         .then(function (community) {
-        console.log(`community`, community);
-        console.log(`XXX: ${auth.isAuthenticated(req)} ${process.env.PS_TEMP_AGENTS_FABRIC_GROUP_API_KEY}`);
+        log.info(`community`, community);
+        log.info(`XXX: ${auth.isAuthenticated(req)} ${process.env.PS_TEMP_AGENTS_FABRIC_GROUP_API_KEY}`);
         if (!auth.isAuthenticated(req) &&
             //TODO: Come up with a better way to handle this than a master API key
             !process.env.PS_TEMP_AGENTS_FABRIC_GROUP_API_KEY) {
@@ -1661,7 +1661,7 @@ auth.role("createCommunityGroup.createGroup", function (community, req, done) {
         }
         else if (!auth.isAuthenticated(req) &&
             process.env.PS_TEMP_AGENTS_FABRIC_GROUP_API_KEY) {
-            console.log(`XXXY: ${req.headers["x-api-key"]}`);
+            log.info(`XXXY: ${req.headers["x-api-key"]}`);
             if (req.headers["x-api-key"] ===
                 process.env.PS_TEMP_AGENTS_FABRIC_GROUP_API_KEY) {
                 done(null, true);