Ensure path ending with game ID always has a trailing slash

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 61c7f5cce5eed2f4cb84c1dd75d4e779ff9888b1..8a3210e5229c14cd750d5bbd4408c2536eab6c59 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -48,6 +48,7 @@ nunjucks.configure("templates", {
 
 /* Load each of our game mini-apps. */
 var empires = require("./empires");
+var tictactoe = require("./tictactoe");
 
 class LMNO {
   constructor() {
@@ -55,7 +56,7 @@ class LMNO {
   }
 
   generate_id() {
-    return [null,null,null,null].map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
+    return Array(4).fill(null).map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
   }
 
   create_game(engine) {
@@ -141,10 +142,16 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
   const game_id = request.params.game_id;
   const canon_id = lmno_canonize(game_id);
 
-  /* Redirect user to page with the canonical ID in it. */
-  if (game_id !== canon_id) {
-    const new_url = request.originalUrl.replace(`/${engine}/${game_id}`,
-                                                `/${engine}/${canon_id}`);
+  /* Redirect user to page with the canonical ID in it, also ensuring
+   * that the game ID is _always_ followed by a slash. */
+  const has_slash = new RegExp(`^/${engine}/${game_id}/`);
+  if (game_id !== canon_id ||
+      ! has_slash.test(request.originalUrl))
+  {
+    const old_path = new RegExp(`/${engine}/${game_id}/?`);
+    const new_path = `/${engine}/${canon_id}/`;
+    const new_url = request.originalUrl.replace(old_path, new_path);
+    console.log("Redirecting from " + request.originalUrl + " to " + new_url);
     response.redirect(301, new_url);
     return;
   }
@@ -240,6 +247,7 @@ app.get('/admin/', auth_admin, (request, response) => {
 
 /* Mount sub apps. only _after_ we have done all the middleware we need. */
 app.use('/empires/[a-zA-Z0-9]{4}/', empires.app);
+app.use('/tictactoe/[a-zA-Z0-9]{4}/', tictactoe.app);
 
 app.listen(4000, function () {
   console.log('LMNO server listening on localhost:4000');