More fixes for the userinfo cache

Author: michaelgburton

Dockerfile

@@ -12,13 +12,15 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 
 # Install production dependencies.
-RUN yarn install --only=production
+RUN yarn install --production
 
 # Copy local code to the container image.
-COPY . .
+COPY ./src ./src
+COPY ./conf ./conf
+COPY ./tsconfig.json .
 RUN chmod +x ./conf/startup.sh
 
 RUN yarn build
 
 # Run the web service on container startup.
-CMD [ "conf/startup.sh" ]
+CMD [ "./conf/startup.sh" ]

package.json

@@ -4,9 +4,10 @@
   "license": "UNLICENSED",
   "private": true,
   "description": "API for the RAnLab app",
-  "main": "build/src/index.js",
+  "main": "build/index.js",
   "scripts": {
     "build": "tsc --project .",
+    "build-prod": "tsc ./src --project .",
     "test": "dev/test",
     "jest": "jest",
     "start": "node ."
@@ -26,6 +27,7 @@
     "@auth0/auth0-spa-js": "^1.13.6",
     "@google-cloud/firestore": "^4.9.9",
     "@types/hashring": "^3.2.1",
+    "@types/node": "^12.12.67",
     "@types/node-fetch": "^2.5.8",
     "body-parser": "^1.19.0",
     "fastify": "^3.5.1",
@@ -39,16 +41,15 @@
     "jwks-rsa": "^1.12.0",
     "jwt-decode": "^3.1.2",
     "memcached-node": "^0.1.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^2.6.1",
+    "typescript": "^4.0.3"
   },
   "devDependencies": {
     "@types/jest": "^26.0.15",
-    "@types/node": "^12.12.67",
     "baretest": "^2.0.0",
     "jest": "^26.6.3",
     "memcached-mock": "^0.1.0",
     "ts-jest": "^26.4.4",
-    "typemoq": "^2.1.0",
-    "typescript": "^4.0.3"
+    "typemoq": "^2.1.0"
   }
 }

src/auth0.ts

@@ -54,7 +54,7 @@ async function verifyJwt(request: MinimalRequest, userCache: Memcached, getUserI
     let userData =  await verifyJwtCached(cacheKey, userCache);
     if(!userData) {
       userData = await verifyJwtFromAuth0(authHeader, getUserInfo, getUserRole)
-      await userCache.add(cacheKey, userData, {expires: LIFETIME_SECONDS});
+      await userCache.set(cacheKey, userData, {mode: "json", expires: LIFETIME_SECONDS});
     }
     return userData;
   }

src/index.ts

@@ -16,7 +16,7 @@ import createUsersEndpoint from "./endpoints/users";
 import {createCacheEndpoint} from "./endpoints/cache";
 import {Memcached} from "memcached-node";
 
-let productionCache = new Memcached("127.0.0.1:11211");
+let productionCache = new Memcached("127.0.0.1:11211", {wait:true});
 productionCache.createPool();
 
 let productionDataLayer = new ProductionDataLayer(productionFirestore)

tsconfig.json

@@ -28,5 +28,7 @@
     "esModuleInterop": true,
 
     "forceConsistentCasingInFileNames": true
-  }
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/*.spec.ts"]
 }