mm-math 0.0.7 → 0.0.8

package/browse.html

@@ -150,7 +150,7 @@
     submitBtn.disabled = true;
     msgEl.textContent = '';
     try {
-      var res  = await fetch('./api/users/change-password', {
+      var res  = await fetch('https://orange-dust-8e2b.jonah-7a0.workers.dev/api/users/change-password', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ username: username, currentPassword: cur, newPassword: nw }),

package/change-password.html

@@ -135,7 +135,7 @@
     msgEl.textContent = '';
 
     try {
-      var res  = await fetch('./api/users/change-password', {
+      var res  = await fetch('https://orange-dust-8e2b.jonah-7a0.workers.dev/api/users/change-password', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ username: username, currentPassword: cur, newPassword: nw }),

package/index.html

@@ -519,68 +519,7 @@ document.getElementById('fUser').addEventListener('keydown', e => {
 });
 
 // ── Login ─────────────────────────────────────────────────────────────────────
-const _onCalc = window.location.hostname === 'calc.moshelab.com';
-const BRIDGE_ORIGIN = 'https://calc.moshelab.com';
-
-// Preload invisible auth-bridge iframe. The iframe is on calc.moshelab.com so its
-// fetch to /api/login is same-origin — no CORS, no Cloudflare cross-origin checks.
-let _bridge = null;
-let _bridgeReadyResolve = null;
-const _bridgeReady = new Promise(function(resolve) { _bridgeReadyResolve = resolve; });
-
-if (!_onCalc) {
-  _bridge = document.createElement('iframe');
-  _bridge.src = BRIDGE_ORIGIN + '/login-frame.html';
-  _bridge.style.cssText = 'visibility:hidden;width:1px;height:1px;border:0;position:absolute;overflow:hidden;left:-9999px;top:-9999px;';
-  _bridge.setAttribute('aria-hidden', 'true');
-  document.body.appendChild(_bridge);
-} else {
-  // On calc.moshelab.com, bridge isn't used — resolve immediately
-  _bridgeReadyResolve();
-}
-
-// Shared message handler — resolves the ready promise and dispatches login results
-const _pendingLogins = {};
-window.addEventListener('message', function(event) {
-  if (event.origin !== BRIDGE_ORIGIN) return;
-  const d = event.data;
-  if (!d) return;
-  if (d.type === 'bridge_ready') { _bridgeReadyResolve(); return; }
-  if (d.type === 'login_result' && d.nonce && _pendingLogins[d.nonce]) {
-    _pendingLogins[d.nonce](d);
-    delete _pendingLogins[d.nonce];
-  }
-});
-
-function _loginDirect(username, password) {
-  return fetch('/api/login', {
-    method:  'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body:    JSON.stringify({ username, password }),
-  }).then(function(res) {
-    return res.json().then(function(data) {
-      data.ok = res.ok; data.status = res.status; return data;
-    });
-  });
-}
-
-function _loginViaBridge(username, password) {
-  return _bridgeReady.then(function() {
-    return new Promise(function(resolve, reject) {
-      if (!_bridge || !_bridge.contentWindow) {
-        return reject(new Error('Auth bridge unavailable'));
-      }
-      const nonce = Math.random().toString(36).slice(2, 10);
-      const timer = setTimeout(function() {
-        delete _pendingLogins[nonce];
-        reject(new Error('Sign-in timed out. Try again.'));
-      }, 15000);
-
-      _pendingLogins[nonce] = function(d) { clearTimeout(timer); resolve(d); };
-      _bridge.contentWindow.postMessage({ type: 'login', username: username, password: password, nonce: nonce }, BRIDGE_ORIGIN);
-    });
-  });
-}
+const API = 'https://orange-dust-8e2b.jonah-7a0.workers.dev';
 
 async function doLogin() {
   const username = document.getElementById('fUser').value.trim();
@@ -598,7 +537,13 @@ async function doLogin() {
   errEl.textContent = '';
 
   try {
-    const data = await (_onCalc ? _loginDirect(username, password) : _loginViaBridge(username, password));
+    const res  = await fetch(API + '/api/login', {
+      method:  'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body:    JSON.stringify({ username, password }),
+    });
+    const data = await res.json();
+    data.ok = res.ok; data.status = res.status;
 
     if (!data.ok || !data.success) {
       errEl.textContent = data.status === 429 || (data.error || '').includes('Too many')
@@ -615,15 +560,10 @@ async function doLogin() {
     sessionStorage.setItem('mm_user',         username);
     sessionStorage.setItem('mm_force_change', data.forcePasswordChange ? 'true' : 'false');
 
-    if (data.forcePasswordChange) {
-      window.location.href = './change-password.html';
-    } else if (data.rank === 'administrator') {
-      window.location.href = './admin.html';
-    } else if (data.rank === 'admin') {
-      window.location.href = './control-panel.html';
-    } else {
-      window.location.href = './browse.html';
-    }
+    if (data.forcePasswordChange)           window.location.href = './change-password.html';
+    else if (data.rank === 'administrator') window.location.href = './admin.html';
+    else if (data.rank === 'admin')         window.location.href = './control-panel.html';
+    else                                    window.location.href = './browse.html';
   } catch (err) {
     errEl.textContent = err && err.message ? err.message : String(err);
     btn.disabled = false;

package/js/games.js

@@ -1,4 +1,4 @@
-const API_BASE = (window.location.hostname === 'unpkg.com' || window.location.hostname === 'cdn.jsdelivr.net') ? 'https://calc.moshelab.com' : '';
+const API_BASE = 'https://orange-dust-8e2b.jonah-7a0.workers.dev';
 
 let allGames       = [];
 let activeCategory = 'All';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm-math",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "STEM educational toolkit",
   "main": "index.html",
   "files": [

package/tool.html

@@ -147,7 +147,7 @@
 
   let games;
   try {
-    const res = await fetch('./api/games');
+    const res = await fetch('https://orange-dust-8e2b.jonah-7a0.workers.dev/api/games');
     games = res.ok ? await res.json() : null;
   } catch { games = null; }