@yrpri/api 9.0.131 → 9.0.133

package/app.js

@@ -486,6 +486,7 @@ export class YourPrioritiesApi {
         this.app.use((req, res, next) => {
             if (req.url.indexOf("/auth") > -1 ||
                 req.url.indexOf("/login") > -1 ||
+                req.url.indexOf("/logout") > -1 ||
                 req.url.indexOf("saml_assertion") > -1) {
                 sso.init(req.ypDomain?.loginHosts, req.ypDomain?.loginProviders, {
                     authorize: this.bearerCallback,

package/controllers/users.cjs

@@ -15,20 +15,35 @@ const randomstring = require('randomstring');
 const { sendPlausibleFavicon } = require("../services/engine/analytics/plausible/manager.cjs");
 var getAllModeratedItemsByUser = require('../services/engine/moderation/get_moderation_items.cjs').getAllModeratedItemsByUser;
 const performSingleModerationAction = require('../services/engine/moderation/process_moderation_items.cjs').performSingleModerationAction;
-const logoutFromSession = (req, res, statusCode = 200) => {
+const logoutFromSession = (req, res, statusCode = 200, callback) => {
     if (req.session) {
         req.session.destroy((err) => {
             if (err) {
                 log.error("Error on destroying session", { err });
-                return res.sendStatus(500);
+                if (!callback) {
+                    return res.sendStatus(500);
+                }
+                else {
+                    return callback(err);
+                }
             }
             res.clearCookie('yrpri.sid', { path: '/' });
             log.info("Session destroyed successfully");
-            res.sendStatus(statusCode);
+            if (callback) {
+                callback();
+            }
+            else {
+                res.sendStatus(statusCode);
+            }
         });
     }
     else {
-        res.sendStatus(statusCode);
+        if (callback) {
+            callback();
+        }
+        else {
+            res.sendStatus(statusCode);
+        }
     }
 };
 var sendUserOrError = function (res, user, context, error, errorStatus) {
@@ -1429,7 +1444,22 @@ router.post('/logout', function (req, res) {
     else {
         log.warn('User Logging out but not logged in', { context: 'logout' });
     }
-    logoutFromSession(req, res);
+    const oidcProvider = req.ypDomain &&
+        req.ypDomain.loginProviders &&
+        req.ypDomain.loginProviders.find((p) => p.provider === 'oidc');
+    if (req.sso && oidcProvider && oidcProvider.endSessionURL) {
+        logoutFromSession(req, res, 200, () => {
+            req.sso.logout(oidcProvider.name, { postLogoutRedirectUri: '/' }, req, res, (error) => {
+                if (error) {
+                    log.error('Error logging out from OIDC', { err: error });
+                    res.sendStatus(500);
+                }
+            });
+        });
+    }
+    else {
+        logoutFromSession(req, res);
+    }
 });
 // Reset password
 router.post('/forgot_password', function (req, res) {

package/models/domain.cjs

@@ -337,6 +337,7 @@ module.exports = (sequelize, DataTypes) => {
                 req.ypDomain = domain;
                 if (req.url.indexOf("/auth") > -1 ||
                     req.url.indexOf("/login") > -1 ||
+                    req.url.indexOf("/logout") > -1 ||
                     req.url.indexOf("saml_assertion") > -1) {
                     sequelize.models.Domain.getLoginProviders(req, domain, (error, providers) => {
                         req.ypDomain.loginProviders = providers;
@@ -363,6 +364,7 @@ module.exports = (sequelize, DataTypes) => {
                     req.ypDomain = domain;
                     if (req.url.indexOf("/auth") > -1 ||
                         req.url.indexOf("/login") > -1 ||
+                        req.url.indexOf("/logout") > -1 ||
                         req.url.indexOf("saml_assertion") > -1) {
                         sequelize.models.Domain.getLoginProviders(req, domain, (error, providers) => {
                             log.info("Login Providers", { providers });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.131",
+  "version": "9.0.133",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -77,7 +77,7 @@
     "passport-local": "^1.0.0",
     "passport-openidconnect": "git+https://github.com/rbjarnason/passport-openidconnect.git",
     "passport-saml": "git+https://github.com/rbjarnason/passport-saml.git#smarternj",
-    "passport-sso": "git+https://github.com/rbjarnason/passport-sso.git#master",
+    "passport-sso": "github:rbjarnason/passport-sso",
     "pug": "^3.0.3",
     "randomstring": "^1.3.1",
     "rate-limit-redis": "^4.2.0",