@yrpri/api 9.0.127 → 9.0.129

package/app.js

@@ -904,21 +904,20 @@ export class YourPrioritiesApi {
                     err: bodyError,
                 });
             }
-            log.error("General Error", {
-                context: "generalError",
-                user: req.user ? toJson(req.user) : null,
-                err: err,
-                protocol: req.protocol,
-                host: req.get("host"),
-                originalUrl: req.originalUrl,
-                body,
-                errStack: err.stack,
-                errorStatus: status,
-            });
-            err.url = req.url;
-            err.params = req.params;
-            if (status !== 404 && status !== 401) {
-                // Optionally notify an error tracking service like Airbrake
+            if (status >= 500) {
+                log.error("General Error", {
+                    context: "generalError",
+                    user: req.user ? toJson(req.user) : null,
+                    err: err,
+                    protocol: req.protocol,
+                    host: req.get("host"),
+                    originalUrl: req.originalUrl,
+                    body,
+                    errStack: err.stack,
+                    errorStatus: status,
+                });
+                err.url = req.url;
+                err.params = req.params;
                 if (airbrake) {
                     airbrake.notify(err).then((airbrakeErr) => {
                         if (airbrakeErr.error) {
@@ -932,6 +931,18 @@ export class YourPrioritiesApi {
                     });
                 }
             }
+            else {
+                log.warn("Client Error", {
+                    context: "clientError",
+                    user: req.user ? toJson(req.user) : null,
+                    err: err.message || err,
+                    protocol: req.protocol,
+                    host: req.get("host"),
+                    originalUrl: req.originalUrl,
+                    body,
+                    errorStatus: status,
+                });
+            }
             res.sendStatus(status);
         });
     }

package/controllers/domains.cjs

@@ -860,6 +860,9 @@ function updateDomainProperties(domain, req) {
     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.customerAiTokenMarkupPercent', req.body.customerAiTokenMarkupPercent && req.body.customerAiTokenMarkupPercent !== ''
+        ? parseInt(req.body.customerAiTokenMarkupPercent)
+        : null);
     domain.set('configuration.onlyAllowCreateUserOnInvite', truthValueFromBody(req.body.onlyAllowCreateUserOnInvite));
     domain.name = req.body.name;
     domain.description = req.body.description;

package/controllers/users.cjs

@@ -2227,10 +2227,20 @@ router.get('/auth/oidc/callback', function (req, res) {
     req.sso.authenticate('oidc-strategy-' + req.ypDomain.id, {}, req, res, function (error, user) {
         if (error) {
             log.error("Error from OIDC login", { err: error });
-            res.sendStatus(500);
+            if (process.env.REDIRECT_AFTER_OIDC_ERROR_URL) {
+                res.redirect(process.env.REDIRECT_AFTER_OIDC_ERROR_URL);
+            }
+            else {
+                res.sendStatus(500);
+            }
         }
         else {
-            res.render('samlLoginComplete', {});
+            if (process.env.REDIRECT_TO_ROOT_AFTER_OIDC) {
+                res.redirect('/');
+            }
+            else {
+                res.render('samlLoginComplete', {});
+            }
         }
     });
 });
@@ -2239,10 +2249,20 @@ router.get('/auth/audkenni/callback', async function (req, res) {
     req.sso.authenticate('oidc-strategy-' + req.ypDomain.id, {}, req, res, function (error, user) {
         if (error) {
             log.error("Error from Audkenni login", { err: error });
-            res.sendStatus(500);
+            if (process.env.REDIRECT_AFTER_OIDC_ERROR_URL) {
+                res.redirect(process.env.REDIRECT_AFTER_OIDC_ERROR_URL);
+            }
+            else {
+                res.sendStatus(500);
+            }
         }
         else {
-            res.render('samlLoginComplete', {});
+            if (process.env.REDIRECT_TO_ROOT_AFTER_OIDC) {
+                res.redirect('/');
+            }
+            else {
+                res.render('samlLoginComplete', {});
+            }
         }
     });
 });

package/package.json

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

package/scripts/domains/importDomainsFromXls.js

@@ -2,11 +2,17 @@ import ExcelJS from 'exceljs';
 import models from '../../models/index.cjs';
 (async () => {
     try {
-        const [xlsPath] = process.argv.slice(2);
+        const [xlsPath, clientId, clientSecret, issuer, authorizationURL, tokenURL, userInfoURL,] = process.argv.slice(2);
         if (!xlsPath) {
-            console.log('Usage: node importDomainsFromXls.js <path-to-xls>');
+            console.log('Usage: node importDomainsFromXls.js <path-to-xls> [clientId clientSecret issuer authorizationURL tokenURL userInfoURL]');
             process.exit(1);
         }
+        const oidcProvided = clientId &&
+            clientSecret &&
+            issuer &&
+            authorizationURL &&
+            tokenURL &&
+            userInfoURL;
         const workbook = new ExcelJS.Workbook();
         await workbook.xlsx.readFile(xlsPath);
         const worksheet = workbook.getWorksheet(1);
@@ -15,6 +21,16 @@ import models from '../../models/index.cjs';
             process.exit(1);
         }
         await models.sequelize.transaction(async (t) => {
+            const oidcKeys = oidcProvided
+                ? {
+                    client_id: clientId,
+                    client_secret: clientSecret,
+                    issuer,
+                    authorizationURL,
+                    tokenURL,
+                    userInfoURL,
+                }
+                : null;
             for (let i = 2; i <= worksheet.rowCount; i++) {
                 const row = worksheet.getRow(i);
                 const name = String(row.getCell(1).text).trim();
@@ -26,7 +42,16 @@ import models from '../../models/index.cjs';
                     transaction: t
                 });
                 if (existing) {
-                    await existing.update({ description }, { transaction: t });
+                    const updateFields = { description };
+                    if (oidcKeys) {
+                        const e = existing;
+                        const secretKeys = e.secret_api_keys || {};
+                        secretKeys.oidc = oidcKeys;
+                        e.secret_api_keys = secretKeys;
+                        e.changed('secret_api_keys', true);
+                        updateFields.secret_api_keys = secretKeys;
+                    }
+                    await existing.update(updateFields, { transaction: t });
                     console.log(`Updated domain ${existing.domain_name}`);
                 }
                 else {
@@ -41,7 +66,8 @@ import models from '../../models/index.cjs';
                         ip_address: '127.0.0.1',
                         user_agent: 'import-script',
                         default_locale: 'en',
-                        configuration: {}
+                        configuration: {},
+                        ...(oidcKeys ? { secret_api_keys: { oidc: oidcKeys } } : {})
                     }, { transaction: t });
                     console.log(`Created domain ${domainName}`);
                 }

package/src/server.d.ts

@@ -37,6 +37,7 @@ interface DomainClass extends DbData {
     ltp?: {
       crt?: LtpCurrentRealityTreeData
     }
+    customerAiTokenMarkupPercent?: number;
   };
 }