X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=8a3210e5229c14cd750d5bbd4408c2536eab6c59;hb=c60da21a61ee8b98550618aa197aefb3cf69a725;hp=86306516878b1f68fd6d980ad9ea4e912692d053;hpb=808f638d7b86b8befcd9a5d3cd75b7e620d98206;p=empires-server

diff --git a/lmno.js b/lmno.js
index 8630651..8a3210e 100644
--- 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) {
@@ -136,14 +137,21 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
 });
 
 /* LMNO middleware to lookup the game. */
-app.use('/empires/:game_id([a-zA-Z0-9]{4})', (request, response, next) => {
+app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) => {
+  const engine = request.params.engine;
   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("/empires/" + game_id,
-                                                "/empires/" + 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;
   }
@@ -180,6 +188,7 @@ function auth_admin(request, response, next) {
 
 app.get('/logout', (request, response) => {
   request.session.user = undefined;
+  request.session.destroy();
 
   response.send("You are now logged out.");
 });
@@ -211,6 +220,16 @@ app.post('/login', async (request, response) => {
   return;
 });
 
+/* API to set uer profile information */
+app.put('/profile', (request, response) => {
+  const nickname = request.body.nickname;
+  if (nickname) {
+    request.session.nickname = nickname;
+    request.session.save();
+  }
+  response.send();
+});
+
 /* An admin page (only available to admin users, of course) */
 app.get('/admin/', auth_admin, (request, response) => {
   let active = [];
@@ -228,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');