@mideind/netskrafl-react 1.0.1 → 1.0.2

package/dist/esm/index.js

@@ -1,6 +1,98 @@
 import { jsx } from 'react/jsx-runtime';
 import React, { useEffect } from 'react';
 
+// Key for storing auth settings in sessionStorage
+const AUTH_SETTINGS_KEY = "netskrafl_auth_settings";
+// Save authentication settings to sessionStorage
+const saveAuthSettings = (settings) => {
+    if (!settings) {
+        clearAuthSettings();
+        return;
+    }
+    try {
+        // Filter to only include properties defined in PersistedAuthSettings interface
+        const filteredSettings = {
+            userEmail: settings.userEmail, // Required field
+        };
+        // Only add optional fields if they are defined
+        if (settings.userId !== undefined)
+            filteredSettings.userId = settings.userId;
+        if (settings.userNick !== undefined)
+            filteredSettings.userNick = settings.userNick;
+        if (settings.firebaseAPIKey !== undefined)
+            filteredSettings.firebaseAPIKey = settings.firebaseAPIKey;
+        if (settings.beginner !== undefined)
+            filteredSettings.beginner = settings.beginner;
+        if (settings.fairPlay !== undefined)
+            filteredSettings.fairPlay = settings.fairPlay;
+        if (settings.ready !== undefined)
+            filteredSettings.ready = settings.ready;
+        if (settings.readyTimed !== undefined)
+            filteredSettings.readyTimed = settings.readyTimed;
+        // Only save if we have actual settings to persist
+        if (Object.keys(filteredSettings).length > 1) {
+            sessionStorage.setItem(AUTH_SETTINGS_KEY, JSON.stringify(filteredSettings));
+        }
+        else {
+            clearAuthSettings();
+        }
+    }
+    catch (error) {
+        // SessionStorage might be unavailable or full
+        console.warn("Could not save auth settings to sessionStorage:", error);
+    }
+};
+// Retrieve authentication settings from sessionStorage
+const loadAuthSettings = () => {
+    try {
+        const stored = sessionStorage.getItem(AUTH_SETTINGS_KEY);
+        if (stored) {
+            return JSON.parse(stored);
+        }
+    }
+    catch (error) {
+        // SessionStorage might be unavailable or data might be corrupted
+        console.warn("Could not load auth settings from sessionStorage:", error);
+    }
+    return null;
+};
+// Clear authentication settings from sessionStorage
+const clearAuthSettings = () => {
+    try {
+        sessionStorage.removeItem(AUTH_SETTINGS_KEY);
+    }
+    catch (error) {
+        console.warn("Could not clear auth settings from sessionStorage:", error);
+    }
+};
+// Apply persisted settings to a GlobalState object
+const applyPersistedSettings = (state) => {
+    var _a, _b, _c, _d;
+    const persisted = loadAuthSettings();
+    if (!persisted) {
+        return state;
+    }
+    // CRITICAL SECURITY CHECK: Only apply persisted settings if they belong to the current user
+    // This prevents data leakage between different users in the same browser session
+    if (persisted.userEmail !== state.userEmail) {
+        // Different user detected - clear the old user's settings
+        clearAuthSettings();
+        return state;
+    }
+    // Apply persisted settings, but don't override values explicitly passed in props
+    return {
+        ...state,
+        // Only apply persisted values if current values are defaults
+        userId: state.userId || persisted.userId || state.userId,
+        userNick: state.userNick || persisted.userNick || state.userNick,
+        firebaseAPIKey: state.firebaseAPIKey || persisted.firebaseAPIKey || state.firebaseAPIKey,
+        beginner: (_a = persisted.beginner) !== null && _a !== void 0 ? _a : state.beginner,
+        fairPlay: (_b = persisted.fairPlay) !== null && _b !== void 0 ? _b : state.fairPlay,
+        ready: (_c = persisted.ready) !== null && _c !== void 0 ? _c : state.ready,
+        readyTimed: (_d = persisted.readyTimed) !== null && _d !== void 0 ? _d : state.readyTimed,
+    };
+};
+
 const DEFAULT_STATE = {
     projectId: "netskrafl",
     firebaseAPIKey: "",
@@ -21,12 +113,12 @@ const DEFAULT_STATE = {
     loginUrl: "",
     loginMethod: "",
     newUser: false,
-    beginner: false,
-    fairPlay: true,
+    beginner: true,
+    fairPlay: false,
     plan: "", // Not a friend
     hasPaid: false,
-    ready: false,
-    readyTimed: false,
+    ready: true,
+    readyTimed: true,
     uiFullscreen: true,
     uiLandscape: false,
     runningLocal: false,
@@ -50,7 +142,9 @@ const makeGlobalState = (overrides) => {
         ...DEFAULT_STATE,
         ...overrides,
     };
-    return { ...state, ...makeServerUrls(state.serverUrl, state.movesUrl) };
+    const stateWithUrls = { ...state, ...makeServerUrls(state.serverUrl, state.movesUrl) };
+    // Apply any persisted authentication settings from sessionStorage
+    return applyPersistedSettings(stateWithUrls);
 };
 
 function getDefaultExportFromCjs (x) {
@@ -27403,6 +27497,7 @@ class AuthenticationError extends Error {
 }
 // Internal function to ensure authentication
 const ensureAuthenticated = async (state) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     // If login is already in progress, wait for it to complete
     if (authPromise) {
         await authPromise;
@@ -27415,11 +27510,37 @@ const ensureAuthenticated = async (state) => {
         if (result.status === "expired") {
             // Token has expired, notify the React component if callback is set
             state.tokenExpired && state.tokenExpired();
+            // Clear any persisted settings since they're no longer valid
+            clearAuthSettings();
             throw new Error("Token expired");
         }
         else if (result.status !== "success") {
+            // Clear any persisted settings on auth failure
+            clearAuthSettings();
             throw new Error(`Authentication failed: ${result.message || result.status}`);
         }
+        // Update the user's ID to the internal one used by the backend and Firebase
+        state.userId = result.user_id || state.userId;
+        // Update the user's nickname
+        state.userNick = result.nickname || state.userNick;
+        // Use the server's Firebase API key, if provided
+        state.firebaseAPIKey = result.firebase_api_key || state.firebaseAPIKey;
+        // Load state flags and preferences
+        state.beginner = (_b = (_a = result.prefs) === null || _a === void 0 ? void 0 : _a.beginner) !== null && _b !== void 0 ? _b : true;
+        state.fairPlay = (_d = (_c = result.prefs) === null || _c === void 0 ? void 0 : _c.fairplay) !== null && _d !== void 0 ? _d : false;
+        state.ready = (_f = (_e = result.prefs) === null || _e === void 0 ? void 0 : _e.ready) !== null && _f !== void 0 ? _f : true;
+        state.readyTimed = (_h = (_g = result.prefs) === null || _g === void 0 ? void 0 : _g.ready_timed) !== null && _h !== void 0 ? _h : true;
+        // Save the authentication settings to sessionStorage for persistence
+        saveAuthSettings({
+            userEmail: state.userEmail, // CRITICAL: Include email to validate ownership
+            userId: state.userId,
+            userNick: state.userNick,
+            firebaseAPIKey: state.firebaseAPIKey,
+            beginner: state.beginner,
+            fairPlay: state.fairPlay,
+            ready: state.ready,
+            readyTimed: state.readyTimed,
+        });
         // Success: Log in to Firebase with the token passed from the server
         await loginFirebase(state, result.firebase_token);
     }
@@ -35124,6 +35245,7 @@ class Model {
                     state.userNick = user.nickname;
                     state.beginner = user.beginner;
                     state.fairPlay = user.fairplay;
+                    saveAuthSettings(state);
                 }
                 // Note that state.plan is updated via a Firebase notification
                 // Give the game instance a chance to update its state
@@ -35158,41 +35280,22 @@ class Model {
         return false;
     }
     handleUserMessage(json, firstAttach) {
-        var _a;
         // Handle an incoming Firebase user message, i.e. a message
         // on the /user/[userid] path
-        if (firstAttach || !this.state)
+        if (firstAttach || !this.state || !json)
             return;
         let redraw = false;
-        if (json.friend !== undefined) {
-            // Potential change of user friendship status
-            const newFriend = json.friend ? true : false;
-            if (this.user && this.user.friend != newFriend) {
-                this.user.friend = newFriend;
-                redraw = true;
-            }
-        }
-        if (json.plan !== undefined) {
+        if (typeof json.plan === "string") {
             // Potential change of user subscription plan
-            if (this.state.plan != json.plan) {
+            if (this.state.plan !== json.plan) {
                 this.state.plan = json.plan;
                 redraw = true;
             }
-            if (this.user && !this.user.friend && this.state.plan == "friend") {
-                // plan == "friend" implies that user.friend should be true
-                this.user.friend = true;
-                redraw = true;
-            }
-            if (this.state.plan == "" && ((_a = this.user) === null || _a === void 0 ? void 0 : _a.friend)) {
-                // Conversely, an empty plan string means that the user is not a friend
-                this.user.friend = false;
-                redraw = true;
-            }
         }
         if (json.hasPaid !== undefined) {
             // Potential change of payment status
-            const newHasPaid = (this.state.plan != "" && json.hasPaid) ? true : false;
-            if (this.state.hasPaid != newHasPaid) {
+            const newHasPaid = (this.state.plan !== "" && json.hasPaid) ? true : false;
+            if (this.state.hasPaid !== newHasPaid) {
                 this.state.hasPaid = newHasPaid;
                 redraw = true;
             }
@@ -35696,6 +35799,8 @@ class Actions {
                 url: "/setuserpref",
                 body: pref
             }); // No result required or expected
+            // Update the persisted settings in sessionStorage
+            saveAuthSettings(this.model.state);
         }
         catch (e) {
             // A future TODO might be to signal an error in the UI
@@ -35992,6 +36097,10 @@ const RiddleScore = {
             else {
                 classes.push(".hot");
             }
+            // Add celebration class if the player achieved the best possible score
+            if (score >= riddle.bestPossibleScore) {
+                classes.push(".celebrate");
+            }
         }
         return m("div" + classes.join(""), m("span.gata-dagsins-legend", displayText));
     }
@@ -36333,6 +36442,84 @@ const GataDagsinsRightSide = {
     }
 };
 
+/*
+
+  gatadagsins-help.ts
+
+  Help dialog for Gáta Dagsins
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjálmur Þorsteinsson
+
+  The Creative Commons Attribution-NonCommercial 4.0
+  International Public License (CC-BY-NC 4.0) applies to this software.
+  For further information, see https://github.com/mideind/Netskrafl
+
+*/
+const GataDagsinsHelp = {
+    view: (vnode) => {
+        const closeHelp = vnode.attrs.onClose;
+        return m(".modal-dialog.gatadagsins-help", m(".modal-content", [
+            // Header with close button
+            m(".modal-header", [
+                m("h2", "Um Gátu dagsins"),
+                m("button.close", {
+                    onclick: closeHelp,
+                    "aria-label": "Loka"
+                }, m("span", { "aria-hidden": "true" }, "×"))
+            ]),
+            // Body with help content
+            m(".modal-body", [
+                m("p", "Gáta dagsins er dagleg krossgátuþraut, svipuð skrafli, þar sem þú reynir að finna " +
+                    "stigahæsta orðið sem hægt er að mynda með gefnum stöfum."),
+                m("h3", "Hvernig á að spila"),
+                m("ul", [
+                    m("li", "Þú færð borð með allmörgum stöfum sem þegar hafa verið lagðir."),
+                    m("li", "Neðst á skjánum eru stafaflísar sem þú getur notað til að mynda orð."),
+                    m("li", "Dragðu flísar á borðið til að mynda orð, annaðhvort lárétt eða lóðrétt."),
+                    m("li", "Orðin verða að tengjast við stafi sem fyrir eru á borðinu."),
+                    m("li", "Þú sérð jafnóðum hvort lögnin á borðinu er gild og hversu mörg stig hún gefur."),
+                    m("li", "Þú getur prófað eins mörg orð og þú vilt - besta skorið þitt er vistað."),
+                ]),
+                m("h3", "Stigagjöf"),
+                m("p", "Þú færð stig fyrir hvern staf í orðinu, auk bónusstiga fyrir lengri orð:"),
+                m("ul", [
+                    m("li", "Hver stafur gefur 1-10 stig eftir gildi hans"),
+                    m("li", "Orð sem nota allar 7 stafaflísarnar gefa 50 stiga bónus"),
+                    m("li", "Sumir reitir á borðinu tvöfalda eða þrefalda stafagildið"),
+                    m("li", "Sumir reitir tvöfalda eða þrefalda heildarorðagildið"),
+                ]),
+                m("h3", "Hitamælir"),
+                m("p", "Hitamælirinn hægra megin (eða efst á farsímum) sýnir:"),
+                m("ul", [
+                    m("li", m("strong", "Besta mögulega skor:"), " Hæstu stig sem hægt er að ná á þessu borði."),
+                    m("li", m("strong", "Besta skor dagsins:"), " Hæstu stig sem einhver leikmaður hefur náð í dag."),
+                    m("li", m("strong", "Þín bestu orð:"), " Orðin sem þú hefur lagt og stigin fyrir þau."),
+                    m("li", "Þú getur smellt á orð á hitamælinum til að fá þá lögn aftur á borðið."),
+                ]),
+                m("h3", "Ábendingar"),
+                m("ul", [
+                    m("li", "Reyndu að nota dýra stafi (eins og X, Ý, Þ) á tvöföldunar- eða þreföldunarreitum."),
+                    m("li", "Lengri orð gefa mun fleiri stig vegna bónussins."),
+                    m("li", "Þú getur dregið allar flísar til baka með bláa endurkalls-hnappnum."),
+                    m("li", "Ný gáta birtist á hverjum nýjum degi - klukkan 00:00!"),
+                ]),
+                m("h3", "Um leikinn"),
+                m("p", [
+                    "Gáta dagsins er systkini ",
+                    m("a", { href: "https://netskrafl.is", target: "_blank" }, "Netskrafls"),
+                    ", hins sívinsæla íslenska krossgátuleiks á netinu. ",
+                    "Leikurinn er þróaður af Miðeind ehf."
+                ]),
+            ]),
+            // Footer with close button
+            m(".modal-footer", m("button.btn.btn-primary", {
+                onclick: closeHelp
+            }, "Loka"))
+        ]));
+    }
+};
+
 /*
 
   GataDagsins.ts
@@ -36401,47 +36588,65 @@ const currentMoveState = (riddle) => {
     }
     return { selectedMoves, bestMove };
 };
-const GataDagsins$1 = {
+const GataDagsins$1 = () => {
     // A view of the Gáta Dagsins page
-    oninit: (vnode) => {
-        const { model, actions } = vnode.attrs.view;
-        const { riddle } = model;
-        if (!riddle) {
-            const { date, locale } = vnode.attrs;
-            // Initialize a fresh riddle object if it doesn't exist
-            actions.fetchRiddle(date, locale);
+    let showHelp = false;
+    return {
+        oninit: (vnode) => {
+            const { model, actions } = vnode.attrs.view;
+            const { riddle } = model;
+            if (!riddle) {
+                const { date, locale } = vnode.attrs;
+                // Initialize a fresh riddle object if it doesn't exist
+                actions.fetchRiddle(date, locale);
+            }
+            // Initialize help dialog state
+            showHelp = false;
+        },
+        view: (vnode) => {
+            var _a;
+            const { view } = vnode.attrs;
+            const { model } = view;
+            const { riddle } = model;
+            const { selectedMoves, bestMove } = (riddle
+                ? currentMoveState(riddle)
+                : { selectedMoves: [], bestMove: undefined });
+            const toggleHelp = () => {
+                showHelp = !showHelp;
+                m.redraw();
+            };
+            return m("div.drop-target", {
+                id: "gatadagsins-background",
+            }, [
+                // The main content area
+                riddle ? m(".gatadagsins-container", [
+                    // Main display area with flex layout
+                    m(".gatadagsins-main", [
+                        // Board and rack component (left side)
+                        m(GataDagsinsBoardAndRack, { view }),
+                        // Right-side component with scores and comparisons
+                        m(GataDagsinsRightSide, { view, selectedMoves, bestMove }),
+                        // Blank dialog
+                        riddle.askingForBlank
+                            ? m(BlankDialog, { game: riddle })
+                            : "",
+                    ])
+                ]) : "",
+                // The left margin elements: back button and info/help button
+                // These elements appear after the main container for proper z-order
+                // m(LeftLogo), // Currently no need for the logo for Gáta Dagsins
+                // Show the Beginner component if the user is a beginner
+                ((_a = model.state) === null || _a === void 0 ? void 0 : _a.beginner) ? m(Beginner, { view }) : "",
+                // Custom Info button for GataDagsins that shows help dialog
+                m(".info", { title: ts("Upplýsingar og hjálp") }, m("a.iconlink", { href: "#", onclick: (e) => { e.preventDefault(); toggleHelp(); } }, glyph("info-sign"))),
+                // Help dialog and backdrop
+                showHelp ? [
+                    m(".modal-backdrop", { onclick: (e) => { e.preventDefault(); } }),
+                    m(GataDagsinsHelp, { onClose: toggleHelp })
+                ] : "",
+            ]);
         }
-    },
-    view: (vnode) => {
-        const { view } = vnode.attrs;
-        const { model } = view;
-        const { riddle } = model;
-        const { selectedMoves, bestMove } = (riddle
-            ? currentMoveState(riddle)
-            : { selectedMoves: [], bestMove: undefined });
-        return m("div.drop-target", {
-            id: "gatadagsins-background",
-        }, [
-            // The main content area
-            riddle ? m(".gatadagsins-container", [
-                // Main display area with flex layout
-                m(".gatadagsins-main", [
-                    // Board and rack component (left side)
-                    m(GataDagsinsBoardAndRack, { view }),
-                    // Right-side component with scores and comparisons
-                    m(GataDagsinsRightSide, { view, selectedMoves, bestMove }),
-                    // Blank dialog
-                    riddle.askingForBlank
-                        ? m(BlankDialog, { game: riddle })
-                        : "",
-                ])
-            ]) : "",
-            // The left margin elements: back button and info/help button
-            // These elements appear after the main container for proper z-order
-            m(LeftLogo),
-            m(Info),
-        ]);
-    }
+    };
 };
 
 /*