@yrpri/api 9.0.116 → 9.0.117

package/controllers/users.cjs

@@ -143,7 +143,7 @@ router.post('/login', function (req, res) {
     const startTime = new Date();
     log.info('User Login start', { elapsedTime: (new Date() - startTime), userId: req.user ? req.user.id : null });
     req.sso.authenticate('local-strategy', {}, req, res, function (err, user) {
-        log.info(`User Login before get ${req.user ? "HASUSER" : "NOUSER"}`, { elapsedTime: (new Date() - startTime), userId: req.user ? req.user.id : null });
+        log.info(`User Login before get ${req.user ? "HASUSER" : "NOUSER"}`, err, { elapsedTime: (new Date() - startTime), userId: req.user ? req.user.id : null });
         getUserWithAll(req.user.id, true, async function (error, user) {
             log.info('User Login completed', { elapsedTime: (new Date() - startTime), userId: req.user ? req.user.id : null });
             if (error || !user) {

package/models/domain.cjs

@@ -365,6 +365,7 @@ module.exports = (sequelize, DataTypes) => {
                         req.url.indexOf("/login") > -1 ||
                         req.url.indexOf("saml_assertion") > -1) {
                         sequelize.models.Domain.getLoginProviders(req, domain, (error, providers) => {
+                            log.info("Login Providers", { providers });
                             req.ypDomain.loginProviders = providers;
                             sequelize.models.Domain.getLoginHosts(domain, (error, hosts) => {
                                 req.ypDomain.loginHosts = hosts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.116",
+  "version": "9.0.117",
   "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.94",
+    "@policysynth/agents": "^1.3.95",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
     "aws-sdk": "^2.1692.0",

package/utils/seedModels.js

@@ -1,8 +1,8 @@
 import fs from "fs";
 import path from "path";
-import { fileURLToPath, pathToFileURL } from 'url';
-import crypto from 'crypto';
-import bcrypt from 'bcrypt';
+import { fileURLToPath, pathToFileURL } from "url";
+import crypto from "crypto";
+import bcrypt from "bcrypt";
 import { Sequelize, DataTypes, Op } from "sequelize";
 import { sequelize as psSequelize } from "@policysynth/agents/dbModels/index.js";
 const __filename = fileURLToPath(import.meta.url);
@@ -134,7 +134,7 @@ const mainCompoundIndexCommands = [
     'CREATE INDEX groupheaderimage_idx2_group_id_c ON "GroupHeaderImage" (group_id, created_at)',
     'CREATE INDEX grouplogoimage_idx2_group_id_c ON "GroupLogoImage" (group_id, created_at)',
     'CREATE INDEX grouplogovideo_idx2_group_id_c ON "GroupLogoVideo" (group_id, created_at)',
-    'CREATE INDEX idx2_group_categories_name ON Categories (group_id, name)',
+    "CREATE INDEX idx2_group_categories_name ON Categories (group_id, name)",
     'CREATE INDEX organizationlogoimag_idx_organization_id ON "OrganizationLogoImage" (organization_id)',
     'CREATE INDEX organizationlogoimag_idx_organization_id_u ON "OrganizationLogoImage" (organization_id, updated_at)',
     'CREATE INDEX organizationlogoimag_idx_organization_id_c ON "OrganizationLogoImage" (organization_id, created_at)',
@@ -145,7 +145,7 @@ const mainCompoundIndexCommands = [
     'CREATE INDEX pointvideo_idx2_point_id_u ON "PointVideo" (point_id, updated_at)',
     'CREATE INDEX pointaudio_idx2_point_id_c ON "PointAudio" (point_id, created_at)',
     'CREATE INDEX pointvideo_idx2_point_id_c ON "PointVideo" (point_id, created_at)',
-    'CREATE INDEX points_idx2_counter_sum_post_id_status_value_deleted ON points ((counter_quality_up-counter_quality_down), post_id, status, value, deleted)',
+    "CREATE INDEX points_idx2_counter_sum_post_id_status_value_deleted ON points ((counter_quality_up-counter_quality_down), post_id, status, value, deleted)",
     'CREATE INDEX userprofileimage_idx2_user_id ON "UserProfileImage" (user_id)',
     'CREATE INDEX userprofileimage_idx2_user_id_u ON "UserProfileImage" (user_id, updated_at)',
     'CREATE INDEX userprofileimage_idx2_user_id_c ON "UserProfileImage" (user_id, created_at)',
@@ -167,8 +167,8 @@ const mainCompoundIndexCommands = [
     'CREATE INDEX idx2_post_images_c ON "PostImage" (post_id, created_at)',
     'CREATE INDEX idx2_post_audios_c ON "PostAudio" (post_id, created_at)',
     'CREATE INDEX idx2_post_videos_c ON "PostVideo" (post_id, created_at)',
-    'CREATE INDEX posts_idx2_counter_sum_group_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,deleted)',
-    'CREATE INDEX posts_idx2_counter_sum_group_id_category_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,category_id,deleted)',
+    "CREATE INDEX posts_idx2_counter_sum_group_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,deleted)",
+    "CREATE INDEX posts_idx2_counter_sum_group_id_category_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,category_id,deleted)",
 ];
 async function createMainCompoundIndexes(sequelizeInstance, indexCommands) {
     for (const command of indexCommands) {
@@ -190,7 +190,8 @@ async function createMainCompoundIndexes(sequelizeInstance, indexCommands) {
 async function syncMainDatabase() {
     console.log("Starting main database synchronization...");
     const modelsPath = path.join(__dirname, "../models");
-    const modelFiles = fs.readdirSync(modelsPath)
+    const modelFiles = fs
+        .readdirSync(modelsPath)
         .filter((file) => file.indexOf(".") !== 0 &&
         file.endsWith(".cjs") &&
         !file.endsWith(".d.cjs") &&
@@ -212,7 +213,8 @@ async function syncMainDatabase() {
     }
     const acModelsPath = path.join(__dirname, "../services/models");
     if (fs.existsSync(acModelsPath)) {
-        const acModelFiles = fs.readdirSync(acModelsPath)
+        const acModelFiles = fs
+            .readdirSync(acModelsPath)
             .filter((file) => file.indexOf(".") !== 0 &&
             file.endsWith(".cjs") &&
             !file.endsWith(".d.cjs") &&
@@ -236,7 +238,8 @@ async function syncMainDatabase() {
         console.warn(`Directory not found, skipping services models: ${acModelsPath}`);
     }
     Object.keys(mainDb).forEach((modelName) => {
-        if (mainDb[modelName] && typeof mainDb[modelName].associate === "function") {
+        if (mainDb[modelName] &&
+            typeof mainDb[modelName].associate === "function") {
             mainDb[modelName].associate(mainDb);
         }
     });
@@ -326,9 +329,11 @@ async function seedAllModels() {
         const newUser = mainDb.User.build({
             email: userEmail,
             name: userName, // Or a dedicated name argument if preferred
-            status: 'active',
+            status: "active",
             // Attempt to set default notifications, fallback if AcNotification not on mainDb
-            notifications_settings: mainDb.AcNotification ? mainDb.AcNotification.defaultNotificationSettings : { email: true },
+            notifications_settings: mainDb.AcNotification
+                ? mainDb.AcNotification.defaultNotificationSettings
+                : { email: true },
         });
         // createPasswordHash is an instance method on User model from user.cjs
         const salt = bcrypt.genSaltSync(10);
@@ -336,31 +341,38 @@ async function seedAllModels() {
         await newUser.save();
         console.log(`User ${newUser.email} created with ID: ${newUser.id}`);
         // Create Domain
-        const randomDomainName = crypto.randomBytes(8).toString('hex') + ".seed.local"; // Shorter and identifiable
+        const randomDomainName = crypto.randomBytes(8).toString("hex") + ".seed.local"; // Shorter and identifiable
         console.log(`Attempting to create domain: ${randomDomainName} for user ${newUser.id}`);
         const newDomain = mainDb.Domain.build({
             name: `Default Domain for ${userName}`,
             domain_name: randomDomainName,
-            access: mainDb.Domain.ACCESS_PUBLIC !== undefined ? mainDb.Domain.ACCESS_PUBLIC : 0, // Use constant if available
+            access: mainDb.Domain.ACCESS_PUBLIC !== undefined
+                ? mainDb.Domain.ACCESS_PUBLIC
+                : 0, // Use constant if available
             default_locale: "en",
-            ip_address: "::1",
+            ip_address: "::1", // Using localhost IP
             user_agent: "seedModelsScript/1.0",
             user_id: newUser.id, // Associate domain with the new user
             configuration: {},
+            secret_api_keys: {},
+            data: {},
+            other_social_media_info: {},
+            public_api_keys: {},
+            info_texts: {},
             // Fill other required non-nullable fields based on domain.cjs definition if any
             // deleted: false, (already defaults to false)
         });
         await newDomain.save();
         console.log(`Domain ${newDomain.name} created with ID: ${newDomain.id} and domain_name: ${newDomain.domain_name}`);
         // Associate User with Domain
-        if (typeof newDomain.addDomainUsers === 'function') {
+        if (typeof newDomain.addDomainUsers === "function") {
             await newDomain.addDomainUsers(newUser);
             console.log(`User ${newUser.email} added to domain ${newDomain.domain_name} as a user.`);
         }
         else {
             console.warn(`newDomain.addDomainUsers is not a function. Skipping adding user to domain users.`);
         }
-        if (typeof newDomain.addDomainAdmins === 'function') {
+        if (typeof newDomain.addDomainAdmins === "function") {
             await newDomain.addDomainAdmins(newUser);
             console.log(`User ${newUser.email} added to domain ${newDomain.domain_name} as an admin.`);
         }