@yrpri/api 9.0.124 → 9.0.126

package/app.js

@@ -502,7 +502,15 @@ export class YourPrioritiesApi {
         this.app.use(requestIp.mw());
         this.app.use(bodyParser.json({ limit: "100mb", strict: false }));
         this.app.use(bodyParser.urlencoded({ limit: "100mb", extended: true }));
-        this.app.use(cors());
+        if (process.env.ALLOWED_ORIGINS) {
+            this.app.use(cors({
+                origin: process.env.ALLOWED_ORIGINS.split(","),
+                credentials: true,
+            }));
+        }
+        else {
+            this.app.use(cors());
+        }
         this.app.use(compression());
         this.app.set("views", __dirname + "/views");
         this.app.set("view engine", "pug");
@@ -510,13 +518,19 @@ export class YourPrioritiesApi {
         if (!process.env.SESSION_SECRET) {
             throw new Error("SESSION_SECRET is not set");
         }
+        let cookieValues = {
+            autoSubDomain: true,
+        };
+        if (process.env.ALLOWED_ORIGINS) {
+            cookieValues.sameSite = "none";
+        }
         const sessionConfig = {
             store: store,
             name: "yrpri.sid",
             secret: process.env.SESSION_SECRET,
             resave: false,
             proxy: process.env.USING_NGINX_PROXY ? true : undefined,
-            cookie: { autoSubDomain: true },
+            cookie: cookieValues,
             saveUninitialized: false,
         };
         if (this.app.get("env") === "production") {

package/package.json

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

package/scripts/domains/importDomainsFromXls.d.ts

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

package/scripts/domains/importDomainsFromXls.js

@@ -0,0 +1,58 @@
+import ExcelJS from 'exceljs';
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [xlsPath] = process.argv.slice(2);
+        if (!xlsPath) {
+            console.log('Usage: node importDomainsFromXls.js <path-to-xls>');
+            process.exit(1);
+        }
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(xlsPath);
+        const worksheet = workbook.getWorksheet(1);
+        if (!worksheet) {
+            console.error('No worksheet found in file');
+            process.exit(1);
+        }
+        await models.sequelize.transaction(async (t) => {
+            for (let i = 2; i <= worksheet.rowCount; i++) {
+                const row = worksheet.getRow(i);
+                const name = String(row.getCell(1).text).trim();
+                const description = String(row.getCell(2).text).trim();
+                if (!name)
+                    continue;
+                const existing = await models.Domain.findOne({
+                    where: { name },
+                    transaction: t
+                });
+                if (existing) {
+                    await existing.update({ description }, { transaction: t });
+                    console.log(`Updated domain ${existing.domain_name}`);
+                }
+                else {
+                    const randomPart = Math.random().toString(36).substring(2, 10);
+                    const domainName = `domain_${randomPart}`;
+                    await models.Domain.create({
+                        name,
+                        description,
+                        domain_name: domainName,
+                        access: 1,
+                        user_id: 1,
+                        ip_address: '127.0.0.1',
+                        user_agent: 'import-script',
+                        default_locale: 'en',
+                        configuration: {}
+                    }, { transaction: t });
+                    console.log(`Created domain ${domainName}`);
+                }
+            }
+        });
+        await models.sequelize.close();
+        console.log('Import completed');
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

package/scripts/users/importUsersForDomainsFromXls.d.ts

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

package/scripts/users/importUsersForDomainsFromXls.js

@@ -0,0 +1,77 @@
+import ExcelJS from 'exceljs';
+import models from '../../models/index.cjs';
+(async () => {
+    try {
+        const [filePath] = process.argv.slice(2);
+        if (!filePath) {
+            console.log('Usage: node importUsersForDomainsFromXls.js <xlsFilePath>');
+            process.exit(1);
+        }
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(filePath);
+        const sheet = workbook.worksheets[0];
+        const transaction = await models.sequelize.transaction();
+        try {
+            for (let i = 2; i <= sheet.rowCount; i++) {
+                const row = sheet.getRow(i);
+                const domainName = String(row.getCell(1).text).trim();
+                const fullUserName = String(row.getCell(2).text).trim();
+                const userEmail = String(row.getCell(3).text).trim().toLowerCase();
+                const userSsn = String(row.getCell(4).text).trim();
+                const userSsnNumber = userSsn ? Number(userSsn) : undefined;
+                if (!domainName || !fullUserName || !userEmail) {
+                    throw new Error(`Missing data in row ${i}`);
+                }
+                const existingEmail = await models.User.unscoped().findOne({
+                    where: { email: userEmail },
+                    transaction,
+                });
+                if (existingEmail) {
+                    throw new Error(`User with email ${userEmail} already exists`);
+                }
+                if (userSsn) {
+                    const existingSsn = await models.User.unscoped().findOne({
+                        where: { ssn: userSsn },
+                        transaction,
+                    });
+                    if (existingSsn) {
+                        throw new Error(`User with ssn ${userSsn} already exists`);
+                    }
+                }
+                let domain = await models.Domain.findOne({
+                    where: { domain_name: domainName },
+                    transaction,
+                });
+                if (!domain) {
+                    domain = await models.Domain.create({
+                        domain_name: domainName,
+                        name: domainName,
+                        access: 1,
+                        ip_address: '127.0.0.1',
+                        user_agent: 'xls-import',
+                        default_locale: 'en',
+                        configuration: {},
+                    }, { transaction });
+                }
+                const user = await models.User.create({
+                    email: userEmail,
+                    name: fullUserName,
+                    status: 'active',
+                    ssn: userSsnNumber,
+                }, { transaction });
+                await domain.addDomainUsers(user, { transaction });
+            }
+            await transaction.commit();
+            console.log('Import completed');
+            process.exit(0);
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();