a mighty battle against an evil opponent

client/src/components/login.jsx

@@ -3,16 +3,45 @@ const preact = require('preact');
 const { Component } = require('preact')
 const { connect } = require('preact-redux');
 
+const SERVER = process.env.NODE_ENV === 'production' ? '/' : 'http://localhost:40000';
+
+function postData(url = '/', data = {}) {
+  // Default options are marked with *
+    return fetch(url, {
+        method: "POST", // *GET, POST, PUT, DELETE, etc.
+        // mode: "no-cors", // no-cors, cors, *same-origin
+        cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
+        credentials: "include", // include, same-origin, *omit
+        headers: {
+            'Accept': 'application/json',
+            'content-type': 'application/json'
+        },
+        redirect: "error", // manual, *follow, error
+        // referrer: "", // no-referrer, *client
+        body: JSON.stringify(data), // body data type must match "Content-Type" header
+    })
+    .then(response => response.json()); // parses response to JSON
+}
+
 const addState = connect(
-    (state) => {
-        const { ws, account } = state;
+    null,
+    (dispatch) => {
         function submitLogin(name, password) {
-            return ws.sendAccountLogin(name, password);
+            postData(`${SERVER}/login`, { name, password })
+                .then(data => console.log(JSON.stringify(data)))
+                .catch(error => console.error(error));
         }
+
         function submitRegister(name, password, code) {
-            return ws.sendAccountCreate(name, password, code);
+            postData(`${SERVER}/register`, { name, password, code })
+                .then(data => console.log(JSON.stringify(data)))
+                .catch(error => console.error(error));
+        }
+
+        return {
+            submitLogin,
+            submitRegister,
         }
-        return { account, submitLogin, submitRegister };
     },
 );
 

client/src/socket.jsx

@@ -15,21 +15,20 @@ function errorToast(err) {
 function createSocket(events) {
     let ws;
 
-    // handle account auth within the socket itself
-    // https://www.christian-schneider.net/CrossSiteWebSocketHijacking.html
-    let account;
-    try {
-        account = JSON.parse(localStorage.getItem('account'));
-    } catch (e) {
-        localStorage.removeItem('account');
-    }
+    // // handle account auth within the socket itself
+    // // https://www.christian-schneider.net/CrossSiteWebSocketHijacking.html
+    // let account;
+    // try {
+    //     account = JSON.parse(localStorage.getItem('account'));
+    // } catch (e) {
+    //     localStorage.removeItem('account');
+    // }
 
     // -------------
     //   Outgoing
     // -------------
     function send(msg) {
         if (msg.method !== 'ping') console.log('outgoing msg', msg);
-        msg.token = account && account.token && account.token;
         ws.send(cbor.encode(msg));
     }
 
@@ -144,8 +143,6 @@ function createSocket(events) {
     //   Incoming
     // -------------
     function onAccount(login) {
-        account = login;
-        localStorage.setItem('account', JSON.stringify(login));
         events.setAccount(login);
         sendAccountConstructs();
         sendAccountInstances();
@@ -231,7 +228,6 @@ function createSocket(events) {
     function errHandler(error) {
         switch (error) {
             case 'invalid token': return logout();
-            case 'no active zone': return sendZoneCreate();
             case 'no constructs selected': return events.errorPrompt('select_constructs');
             case 'node requirements not met': return events.errorPrompt('complete_nodes');
             case 'construct at max skills (4)': return events.errorPrompt('max_skills');
@@ -249,7 +245,7 @@ function createSocket(events) {
         const res = cbor.decode(blob);
         const [msgType, params] = res;
 
-        if (msgType !== 'pong') console.log(res);
+        if (msgType !== 'Pong') console.log(res);
 
         // check for error and split into response type and data
         if (res.err) return errHandler(res.err);
@@ -271,13 +267,6 @@ function createSocket(events) {
             sendPing();
             sendItemInfo();
 
-            if (account) {
-                events.setAccount(account);
-                sendAccountInstances();
-                sendInstanceList();
-                sendAccountConstructs();
-            }
-
             return true;
         });