Merge pull request #146 from ohcnetwork/develop

v24.40.0

.nvmrc

@@ -1 +1 @@
-v20
+v20.17.0

Dockerfile

@@ -1,22 +1,22 @@
-FROM node:20-alpine AS build
+FROM node:20.17.0-alpine AS build
 
 WORKDIR /app
 
 COPY package.*json ./
-RUN npm install
+RUN npm --mount=type=cache,target=/root/.npm install
 
 COPY . .
 RUN npm run build
 
 
-FROM node:20-alpine AS production
+FROM node:20.17.0-alpine AS production
 
 WORKDIR /app
 
 RUN mkdir /app/images
 
 COPY package.*json ./
-RUN npm install --omit=dev
+RUN npm --mount=type=cache,target=/root/.npm install --omit=dev
 
 COPY --from=build /app/prisma ./prisma
 COPY --from=build /app/dist ./dist

package.json

@@ -61,9 +61,12 @@
   "homepage": "https://github.com/coronasafe/teleicu_middleware#readme",
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/connect-flash": "^0.0.39",
+    "@types/connect-flash": "^0.0.40",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.15",
+    "@types/dotenv": "^6.1.1",
+    "@types/express": "^4.17.21",
+    "@types/express-serve-static-core": "^4.19.2",
     "@types/express-session": "^1.17.9",
     "@types/express-ws": "^3.0.1",
     "@types/lodash.groupby": "^4.6.8",
@@ -83,6 +86,6 @@
     "typescript": "^5.2.2"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": "v20.17.0"
   }
-}
+}

src/lib/jose.ts

@@ -95,7 +95,7 @@ export async function getCareJWKs() {
   if (!careJWKs) {
     const controller = new AbortController();
     setTimeout(() => controller.abort(), 5000);
-    const res = await fetch(`${careApi}/.well-known/openid-configuration`, {
+    const res = await fetch(`${careApi}/.well-known/jwks.json`, {
       signal: controller.signal,
     }).then((res) => {
       if (!res.ok) {