Refactor caching of obo tokens

apps/frackend/package.json

@@ -17,17 +17,16 @@
     "cookie-parser": "1.4.6",
     "express": "4.18.2",
     "express-jwt": "8.4.1",
-    "express-session": "1.17.3",
     "http-proxy-middleware": "3.0.0-beta.0",
     "jwks-rsa": "3.0.1",
     "morgan": "1.10.0",
+    "node-cache": "5.1.2",
     "node-jose": "2.2.0",
     "uuid": "9.0.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "1.4.3",
     "@types/express": "4.17.17",
-    "@types/express-session": "1.17.7",
     "@types/node": "20.5.9",
     "@types/node-jose": "1.1.10",
     "@types/uuid": "9.0.3",

apps/frackend/src/apiProxy.ts

@@ -3,6 +3,7 @@ import { createProxyMiddleware } from "http-proxy-middleware";
 
 import config from "./config.js";
 import { addOnBehalfOfToken } from "./onbehalfof.js";
+import { getOboTokenForRequest } from "./sessionCache";
 import { verifyJWTToken } from "./tokenValidation.js";
 
 function setupProxy(
@@ -22,9 +23,8 @@ function setupProxy(
       logger: console,
       on: {
         proxyReq: (proxyRequest, request) => {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          const accessToken = request?.session[scope]?.accessToken;
+          const accessToken = getOboTokenForRequest(request, scope)
+            ?.accessToken;
           if (accessToken) {
             proxyRequest.setHeader("Authorization", `Bearer ${accessToken}`);
           } else {

apps/frackend/src/onbehalfof.ts

@@ -4,6 +4,7 @@ import jose from "node-jose";
 import { v4 as uuidv4 } from "uuid";
 
 import config from "./config.js";
+import { getOboTokenForRequest, setOboTokenForRequest } from "./sessionCache";
 import { getTokenFromRequestHeader } from "./tokenValidation.js";
 
 const azureAdHeaderConfig = {
@@ -24,12 +25,12 @@ export async function addOnBehalfOfToken(
   next: NextFunction,
   scope: string,
 ) {
-  const currentSession = request.session[scope];
-  if (currentSession) {
-    if (currentSession.expiresAt > Date.now() / 1000 + 10) {
+  const currentOboToken = getOboTokenForRequest(request, scope);
+  if (currentOboToken) {
+    if (currentOboToken.expiresAt > Date.now() / 1000 + 10) {
       return next();
     }
-    const token = await getRefreshToken(currentSession.refreshToken, scope);
+    const token = await getRefreshToken(currentOboToken.refreshToken, scope);
     updateSession(request, scope, token);
     return next();
   }
@@ -53,11 +54,12 @@ const updateSession = (
   scope: string,
   result: OnBehalfOfResponse,
 ) => {
-  request.session[scope] = {
+  const oboToken = {
     expiresAt: Date.now() / 1000 + result.expires_in,
     accessToken: result.access_token,
     refreshToken: result.refresh_token,
   };
+  setOboTokenForRequest(request, oboToken, scope);
 };
 
 async function getOnBehalfOfToken(request: Request, scope: string) {

apps/frackend/src/server.ts

@@ -1,9 +1,9 @@
+import cookieParser from "cookie-parser";
 import express from "express";
 
 import { setupActuators } from "./actuators.js";
 import { setupNomApiProxy, setupTeamcatApiProxy } from "./apiProxy.js";
 import { setupStaticRoutes } from "./frontendRoute.js";
-import { setupSession } from "./session.js";
 
 // Create Express Server
 const app = express();
@@ -12,7 +12,9 @@ const app = express();
 app.use(express.urlencoded({ extended: true }));
 
 setupActuators(app);
-setupSession(app);
+
+app.set("trust proxy", 1);
+app.use(cookieParser());
 
 setupNomApiProxy(app);
 setupTeamcatApiProxy(app);