Merge pull request #378 from Tampere/fix/caching-and-map

Fix/caching and map

Author: mmoila

package.json

@@ -9,12 +9,10 @@
   },
   "lint-staged": {
     "client/**/*.{ts,tsx}": [
-      "npm run lint --prefix client",
-      "npm run tscw --prefix client -- --strict"
+      "npm run lint --prefix client"
     ],
     "server/**/*.ts": [
-      "npm run lint --prefix server",
-      "npm run tscw --prefix server -- --strict"
+      "npm run lint --prefix server"
     ],
     "*.{js,jsx,ts,tsx,json}": "prettier --write --ignore-unknown"
   }

server/package-lock.json

@@ -74,6 +74,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
+    "@types/compression": "^1.8.1",
     "@types/connect-pg-simple": "^7.0.3",
     "@types/email-templates": "^10.0.4",
     "@types/express": "^5.0.3",

server/package.json

@@ -1,18 +1,28 @@
 import compression from 'compression';
 import express from 'express';
+import { readFile } from 'fs/promises';
+import helmet from 'helmet';
 import morgan from 'morgan';
 import * as path from 'path';
+import { createServer } from 'vite';
 import { initializePuppeteerCluster } from './application/screenshot';
+import { getSurveyTitle } from './application/survey';
 import { configureAuth, configureMockAuth, ensureAuthenticated } from './auth';
 import { getDb, initializeDatabase, migrateUp } from './database';
+import { startUpdatingRefreshToken } from './email/refresh-token';
 import { HttpResponseError } from './error';
 import logger from './logger';
 import rootRouter from './routes';
-import helmet from 'helmet';
-import { readFile } from 'fs/promises';
-import { createServer } from 'vite';
-import { getSurveyTitle } from './application/survey';
-import { startUpdatingRefreshToken } from './email/refresh-token';
+
+function setNoCacheForIndex(res: express.Response, filePath: string) {
+  if (filePath.endsWith('index.html')) {
+    res.setHeader('Cache-Control', 'no-cache, no-store');
+  }
+}
+
+const noCacheConfig = {
+  'Cache-Control': 'no-cache, no-store',
+};
 
 const isDev = process.env.NODE_ENV === 'development';
 
@@ -128,9 +138,9 @@ async function start() {
     ensureAuthenticated({
       redirectToLogin: true,
     }),
-    express.static('static/admin'),
+    express.static('static/admin', { setHeaders: setNoCacheForIndex }),
   );
-  app.use('/', express.static('static'));
+  app.use('/', express.static('static', { setHeaders: setNoCacheForIndex }));
 
   // Root router for the API
   app.use('/api', rootRouter);
@@ -142,7 +152,9 @@ async function start() {
       redirectToLogin: true,
     }),
     (_req, res) => {
-      res.sendFile(path.join(__dirname, '../static/admin/index.html'));
+      res
+        .set(noCacheConfig)
+        .sendFile(path.join(__dirname, '../static/admin/index.html'));
     },
   );
 
@@ -183,7 +195,10 @@ async function start() {
         .replaceAll(`<!--app-title -->`, title)
         .replace('@clientSrc', 'src');
 
-      res.status(200).set({ 'Content-Type': 'text/html' }).end(renderedHtml);
+      res
+        .status(200)
+        .set({ 'Content-Type': 'text/html', ...noCacheConfig })
+        .end(renderedHtml);
     } catch (e: any) {
       isDev && vite.ssrFixStacktrace(e);
       logger.error(e.stack);

server/src/app.ts

@@ -1,4 +1,3 @@
-import { ensureAuthenticated } from '@src/auth';
 import { validateRequest } from '@src/utils';
 import { Router } from 'express';
 import asyncHandler from 'express-async-handler';
@@ -9,13 +8,12 @@ const router = Router();
 
 router.get(
   '/available-layers',
-  ensureAuthenticated(),
   validateRequest([query('url').isString()]),
   asyncHandler(async (req, res) => {
     const mapUrl = decodeURIComponent(req.query.url.toString());
     const layers = await getAvailableMapLayers(mapUrl);
     res.json(layers);
-  })
+  }),
 );
 
 export default router;