@oslokommune/auth-bff 1.6.0-beta1 → 1.6.0-beta3

package/dist/middleware/oidc.mjs

@@ -158,7 +158,7 @@ export class OidcMiddleware {
             console.log(`Front channel logout: params iss=${iss}, sid=${redact(sid)}`);
             if (sid) {
                 try {
-                    yield ((_a = req.destroySessionByIdTokenSid) === null || _a === void 0 ? void 0 : _a.call(req, sid));
+                    yield ((_a = req.destroySessionByIdpSid) === null || _a === void 0 ? void 0 : _a.call(req, sid));
                 }
                 catch (e) {
                     console.error("Failed to destroy session", e);

package/dist/middleware/proxy-routes.mjs

@@ -18,7 +18,7 @@ export function proxyRoutes(config, oidcMiddleware) {
                     proxyReq.removeHeader("Cookie");
                 },
                 proxyRes: (proxyRes, req, res) => {
-                    console.log(`proxyied ${req.originalUrl}: ${proxyRes.statusCode}`);
+                    console.log(`Proxied ${req.originalUrl}: ${proxyRes.statusCode}`);
                 }
             }
         }));

package/dist/middleware/sessions/dynamoDbSessionStore.d.mts

@@ -0,0 +1,2 @@
+export function dynamoDbSessionStore(config?: {}): any;
+//# sourceMappingURL=dynamoDbSessionStore.d.mts.map

package/dist/middleware/sessions/dynamoDbSessionStore.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dynamoDbSessionStore.d.mts","sourceRoot":"","sources":["../../../src/middleware/sessions/dynamoDbSessionStore.mjs"],"names":[],"mappings":"AA6BA,uDAcC"}

package/dist/middleware/sessions/dynamoDbSessionStore.mjs

@@ -0,0 +1,46 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { DeleteItemCommand, DynamoDBClient, QueryCommand } from "@aws-sdk/client-dynamodb";
+import dynamoDbStore from "connect-dynamodb";
+import session from "express-session";
+import { redact } from "../../utils.js";
+const destroyByIdpSid = (config, client) => {
+    return (idpSid) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log(`Front channel logout: deleting session(s) with idp-sid=${redact(idpSid)}`);
+        const query = new QueryCommand({
+            TableName: config.table,
+            IndexName: "idp-sid-index",
+            ExpressionAttributeValues: { ":sid": { S: idpSid } },
+            ExpressionAttributeNames: { "#k": "idp-sid" },
+            KeyConditionExpression: "#k = :sid",
+            ProjectionExpression: "id"
+        });
+        const res = yield client.send(query);
+        yield Promise.all(res.Items.map((item) => {
+            var _a;
+            console.log(`Front channel logout: deleting session ${redact((_a = item.id) === null || _a === void 0 ? void 0 : _a.S, 10)}`);
+            return client.send(new DeleteItemCommand({
+                TableName: config.table,
+                Key: { id: item.id }
+            }));
+        }));
+        console.log(`Front channel logout: completed. ${res.Count} session(s) deleted`);
+    });
+};
+export function dynamoDbSessionStore(config = {}) {
+    const client = new DynamoDBClient({});
+    const DynamoDbStore = dynamoDbStore({ session });
+    const sessionStoreConfig = Object.assign(Object.assign({}, config), { client, specialKeys: [
+            { name: "idp-sid", type: "S" }
+        ], skipThrowMissingSpecialKeys: true });
+    const sessionStore = new DynamoDbStore(sessionStoreConfig);
+    sessionStore.destroyByIdpSid = destroyByIdpSid(config, client);
+    return sessionStore;
+}

package/dist/middleware/sessions/memorySessionStore.d.mts

@@ -0,0 +1,2 @@
+export function memorySessionStore(config?: {}): any;
+//# sourceMappingURL=memorySessionStore.d.mts.map

package/dist/middleware/sessions/memorySessionStore.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memorySessionStore.d.mts","sourceRoot":"","sources":["../../../src/middleware/sessions/memorySessionStore.mjs"],"names":[],"mappings":"AAQA,qDAIC"}

package/dist/middleware/sessions/memorySessionStore.mjs

@@ -0,0 +1,11 @@
+import session from "express-session";
+import { redact } from "../../utils.js";
+const destroyByIdpSid = (idpSid) => {
+    // This is not supposed to be used outside localhost, so it is not implemented
+    console.log(`Pretending to destroyByIdpSid. idp-sid=${redact(idpSid)}`);
+};
+export function memorySessionStore(config = {}) {
+    const sessionStore = new session.MemoryStore(config);
+    sessionStore.destroyByIdpSid = destroyByIdpSid;
+    return sessionStore;
+}

package/dist/middleware/sessions/sessions.d.mts

@@ -0,0 +1,2 @@
+export function sessions(config: any): any[];
+//# sourceMappingURL=sessions.d.mts.map

package/dist/middleware/sessions/sessions.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.d.mts","sourceRoot":"","sources":["../../../src/middleware/sessions/sessions.mjs"],"names":[],"mappings":"AAIA,6CAiCC"}

package/dist/middleware/sessions/sessions.mjs

@@ -0,0 +1,40 @@
+import session from "express-session";
+import { dynamoDbSessionStore } from "./dynamoDbSessionStore.mjs";
+import { memorySessionStore } from "./memorySessionStore.mjs";
+export function sessions(config) {
+    var _a, _b;
+    let sessionStore;
+    if (config.sessionStoreType === 'memory') {
+        const sessionStoreOptions = (_a = config.sessionStoreOptions) !== null && _a !== void 0 ? _a : {};
+        sessionStore = memorySessionStore(sessionStoreOptions);
+    }
+    else if (config.sessionStoreType === 'dynamodb') {
+        const sessionStoreOptions = (_b = config.sessionStoreOptions) !== null && _b !== void 0 ? _b : {};
+        sessionStore = dynamoDbSessionStore(sessionStoreOptions);
+    }
+    else if (config.sessionStoreType) {
+        throw Error(`unknown sessionStoreType ${config.sessionStoreType}`);
+    }
+    else {
+        throw Error('missing sessionStoreType');
+    }
+    return [
+        session({
+            secret: config.sessionSecret,
+            store: sessionStore,
+            resave: false,
+            saveUninitialized: false,
+            cookie: config.cookie || {
+                httpOnly: true,
+                path: config.cookiePath,
+                secure: config.cookieSecure,
+                sameSite: config.cookieSameSite
+            },
+        }),
+        (req, _, next) => {
+            // make this function available to request handlers
+            req.destroySessionByIdpSid = sessionStore === null || sessionStore === void 0 ? void 0 : sessionStore.destroyByIdpSid;
+            next();
+        }
+    ];
+}

package/dist/server.mjs

@@ -5,10 +5,11 @@ import { loadConfig } from './config.mjs';
 import { proxyRoutes } from "./middleware/proxy-routes.mjs";
 import { staticRoutes } from "./middleware/static-routes.mjs";
 import { securityHeaders } from "./middleware/security-headers.mjs";
-import { sessions } from "./middleware/sessions.mjs";
+import { sessions } from "./middleware/sessions/sessions.mjs";
 import { oidcRoutes } from "./middleware/oidc-routes.mjs";
 import { OidcMiddleware } from "./middleware/oidc.mjs";
 import commandLineArgs from "command-line-args";
+import packageJson from "../package.json" with { type: 'json' };
 const options = commandLineArgs({ name: 'configFile' });
 const config = await loadConfig(options.configFile);
 const port = process.env.port || config.port || 8080;
@@ -32,7 +33,7 @@ app.use(requestLogger); //NB, må stå her for å ikke logge auth-requestene ove
 app.use(basePath, proxyRoutes(config, oidcMiddleware));
 app.use(basePath, staticRoutes(config));
 const server = app.listen(port, () => {
-    console.log(`Server started on port ${port}`);
+    console.log(`auth-bff ${packageJson.version} started on port ${port}`);
 });
 process.on('SIGTERM', () => {
     console.log('SIGTERM received. Closing...');

package/dist/vite-plugin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.mts","sourceRoot":"","sources":["../src/vite-plugin.mjs"],"names":[],"mappings":"AAyBA;;;;;;;;GAQG;AACH,kDAPa;IACT,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,CAAC,CAAC,CAAS,IAAgB,EAAhB;QAAC,WAAW,EAAE,GAAC,CAAA;KAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAC,GAAC,CAAC,CAAC;IACjE,sBAAsB,EAAE,CAAC,CAAC,CAAS,IAAgB,EAAhB;QAAC,WAAW,EAAE,GAAC,CAAA;KAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAC,GAAC,CAAC,CAAA;CACvE,CASH"}
+{"version":3,"file":"vite-plugin.d.mts","sourceRoot":"","sources":["../src/vite-plugin.mjs"],"names":[],"mappings":"AAwBA;;;;;;;;GAQG;AACH,kDAPa;IACT,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,CAAC,CAAC,CAAS,IAAgB,EAAhB;QAAC,WAAW,EAAE,GAAC,CAAA;KAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAC,GAAC,CAAC,CAAC;IACjE,sBAAsB,EAAE,CAAC,CAAC,CAAS,IAAgB,EAAhB;QAAC,WAAW,EAAE,GAAC,CAAA;KAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAC,GAAC,CAAC,CAAA;CACvE,CASH"}

package/dist/vite-plugin.mjs

@@ -14,7 +14,7 @@ function configureServer(configFile) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ middlewares }) {
         const { oidcRoutes } = yield import("./middleware/oidc-routes.mjs");
         const { proxyRoutes } = yield import("./middleware/proxy-routes.mjs");
-        const { sessions } = yield import("./middleware/sessions.mjs");
+        const { sessions } = yield import("./middleware/sessions/sessions.mjs");
         const config = yield loadConfig(configFile);
         const oidcMiddleware = yield OidcMiddleware.create(config);
         const basePath = config.basePath || "/";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslokommune/auth-bff",
-  "version": "1.6.0-beta1",
+  "version": "1.6.0-beta3",
   "repository": "https://github.com/oslokommune/auth-bff.git",
   "publishConfig": {
     "access": "public"
@@ -37,8 +37,8 @@
     "command-line-args": "^6.0.1",
     "compression": "^1.8.0",
     "connect-dynamodb": "^3.0.5",
-    "express": "^4.21.2",
-    "express-session": "^1.18.1",
+    "express": "4.21.2",
+    "express-session": "1.18.2",
     "find-up": "^7.0.0",
     "helmet": "^8.1.0",
     "http-proxy-middleware": "^3.0.5",