fix post window close auth bug

diff --git a/.eslintrc.js b/.eslintrc.js
index 66a98d10efd6ce1ac7446900bc7392c9808dd8b0..eaf98f78d1d591b273c2f88d591089f489d8caea 100644 (file)
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -13,7 +13,12 @@ module.exports = {
   },
   rules: {
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off"
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+     "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        { "argsIgnorePattern": "^_" }
+      ]
   },
   overrides: [
     {
@@ -23,7 +28,7 @@ module.exports = {
         "*.js"
       ],
       rules: {
-        "@typescript-eslint/no-var-requires": "off"
+        "@typescript-eslint/no-var-requires": "off",
       },
       env: {
         jest: true

diff --git a/src/background/createWindow.ts b/src/background/createWindow.ts
index 8b280c322fecca077f1596d28b4633aa17f2d6b5..9ff1773cd077e6de8b191c1728a3bf4db9a5e4ec 100644 (file)
--- a/src/background/createWindow.ts
+++ b/src/background/createWindow.ts
@@ -1,7 +1,9 @@
 "use strict";
 
-import { BrowserWindow } from "electron";
+import { BrowserWindow, ipcMain } from "electron";
 import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
+import { windowEmitter } from './windowEmitter';
+import { sendMessage } from './session';
 import * as path from "path";
 
 interface WindowSettings {
@@ -10,8 +12,17 @@ interface WindowSettings {
     resizable: boolean;
 }
 
+const handleMessage = (event: any, arg: any) => {
+    sendMessage(arg);
+}
+
+const windowMount = (): void => {
+    windowEmitter.emit('window-active', true);
+    ipcMain.on('send-message', handleMessage);
+}
+
 export const createWindow = async (options: WindowSettings): Promise<BrowserWindow> => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, _reject) => {
       const win: BrowserWindow = new BrowserWindow({
         width: options.width,
         height: options.height,
@@ -35,8 +46,10 @@ export const createWindow = async (options: WindowSettings): Promise<BrowserWind
       }
 
       win.webContents.on('did-finish-load', () => {
+          windowMount();
           resolve(win);
       });
-    })
-}
+
+    });
+};
 

diff --git a/src/background/run.ts b/src/background/run.ts
index e2315752ad140db32b5797bb8d974f6b04c3eaba..42f806961b8a175a693703bfb0ab786cccbbd427 100644 (file)
--- a/src/background/run.ts
+++ b/src/background/run.ts
@@ -1,58 +1,50 @@
+"use strict";
+
 import { createWindow } from './createWindow';
 import { ipcMain, BrowserWindow  } from "electron";
-import { initSession, sendMessage } from './session';
+import { initSession } from './session';
 import { windowEmitter } from './windowEmitter';
-const portAudio = require('naudiodon');
+// const portAudio = require('naudiodon');
 
-interface ipcRendererPayload {
+interface IpcRendererPayload {
     endpoint: string;
     message: any;
 }
 
-let activeSession = false;
 let win: BrowserWindow | null;
+let activeSession = false;
 
-windowEmitter.on('ipc-renderer', (payload: ipcRendererPayload) => {
+windowEmitter.on('ipc-renderer', (payload: IpcRendererPayload) => {
     if (win)
     win.webContents.send(payload.endpoint, {
       message: payload.message
     });
 });
 
+const windowDismount = (): void => {
+    win = null;
+    windowEmitter.emit('window-active', false);
+    ipcMain.removeAllListeners('send-message');
+}
+
 /*
  * The main function will be run after electron app is ready.
  */
 export async function main() {
 
     // create main window.
-    if (!win) {
-        win = await createWindow({ width: 350, height: 525, resizable: false });
-    }
-
+    if (!win) win = await createWindow({
+        width: 350,
+        height: 525,
+        resizable: false
+    });
 
     // Instantiate socket session with crimata-platorm.
-    if (!activeSession) {
-        initSession();
-    }
-    activeSession = true;
-
-    const handleMessage = (event: any, arg: any) => {
-        sendMessage(arg);
-    }
+    if (!activeSession) initSession();
 
-    const windowMount = (): void => {
-        windowEmitter.emit('window-active', true);
-        ipcMain.on('send-message', handleMessage);
-    }
-
-    const windowDismount = (): void => {
-        win = null;
-        windowEmitter.emit('window-active', false);
-        ipcMain.removeAllListeners('send-message');
-    }
+    activeSession = true;
 
-    // Handle window mount and dismount.
-    win.webContents.on('did-finish-load', windowMount);
+    // Handle window close.
     win.on("closed", windowDismount);
 
     // TODO: FIX recorder restart bug

diff --git a/src/background/session.ts b/src/background/session.ts
index d2d188360b684f6b4023cd0d1486b78d08ee9b48..bee5f4389571d91927c0c74b4e2dc8fd567750ed 100644 (file)
--- a/src/background/session.ts
+++ b/src/background/session.ts
@@ -1,15 +1,10 @@
+"use strict";
+
 import WebSocket from 'ws';
 import { windowEmitter } from './windowEmitter';
 import { ipcMain  } from "electron";
 
-const EventEmitter = require('events');
-
-class SocketEmitter extends EventEmitter {}
-
-export const socketEmitter = new SocketEmitter();
-
 interface RenderMessage  {
-  type: 'render';
   content: string;
   context: string;
   subContext: string;
@@ -33,24 +28,21 @@ let auth = false;
 const receiveMessage = (message: string): void => {
 
     while(!auth) {
-        console.log('window emitter @ session.ts recieve')
         windowEmitter.emit('auth-res', message);
         return;
     }
 
     const parsed: RenderMessage  = JSON.parse(message);
-      if (parsed.type === "render") {
-        windowEmitter.emit('ipc-renderer', {
-            endpoint: 'render-message',
-            message: parsed
-        });
-      }
-}
 
-const authUser = async (event: any, payload: string | UserCreds | null): Promise<string> => {
+    windowEmitter.emit('ipc-renderer', {
+        endpoint: 'render-message',
+        message: parsed
+    });
+};
+
+const authSession = async (_event, payload: string | UserCreds | null): Promise<string> => {
     return new Promise((resolve, reject) => {
         console.log('authenticating...');
-        console.log('window emitter @ session.ts auth')
         windowEmitter.on('auth-res', (res: string) => {
             if (res === 'locked') {
                 reject(res);
@@ -69,6 +61,14 @@ const authUser = async (event: any, payload: string | UserCreds | null): Promise
     });
 };
 
+export const sendMessage = (content: string | Buffer) => {
+    if (content instanceof Buffer) {
+        socket.send(content);
+    } else if (content){
+        socket.send(JSON.stringify(content));
+    }
+}
+
 export const initSession = () => {
     if (socket) {
         socket.removeAllListeners();
@@ -84,7 +84,7 @@ export const initSession = () => {
 
     // handle renderer auth-token event
     ipcMain.removeHandler('auth-user'); // avoid setting duplicate handlers
-    ipcMain.handle('auth-user', authUser);
+    ipcMain.handle('auth-user', authSession);
 
     socket.on('open', () => {
         console.log('Success! Connected to Crimata.');
@@ -98,7 +98,7 @@ export const initSession = () => {
 
     });
 
-    socket.on('error', (e) => {
+    socket.on('error', (_e) => {
         console.log('ERROR: Failed to connect.');
         socket.removeAllListeners();
         socket.close();
@@ -109,20 +109,13 @@ export const initSession = () => {
             }
         }, reconnectTimeout);
 
-    })
+    });
 
     socket.on('close', () => {
         console.log('Connection droped. Restarting.')
         initSession();
-    })
+    });
 
     socket.on("message", receiveMessage);
-}
+};
 
-export const sendMessage = (content: string | Buffer) => {
-    if (content instanceof Buffer) {
-        socket.send(content);
-    } else if (content){
-        socket.send(JSON.stringify(content));
-    }
-}

diff --git a/src/modules/auth.ts b/src/modules/auth.ts
index ae908f178ff4d7fee36627c0b75cb77162d19cf6..73edaf319fa2874d1492fa6bda8bde62ed7db536 100644 (file)
--- a/src/modules/auth.ts
+++ b/src/modules/auth.ts
@@ -1,13 +1,13 @@
-import { reactive, watch, toRefs } from 'vue';
+import { reactive, toRefs } from 'vue';
 import { useIpc } from './ipc';
 
 interface AuthState {
-    access_token?: string | null;
+    accessToken?: string | null;
     error?: Error;
 }
 
 const state = reactive<AuthState>({
-    access_token: undefined,
+    accessToken: undefined,
     error: undefined,
 });
 
@@ -15,20 +15,28 @@ const AUTH_KEY = 'crimata_token';
 
 const token = window.localStorage.getItem(AUTH_KEY);
 
-// authenticate on socket connect
-window.ipcRenderer.on("fetch-token", async (event, payload: null) => {
-    const { data, invoke  } = useIpc('auth-user');
+const authToken = async () => {
+   const { data, invoke  } = useIpc('auth-user');
     try {
         await invoke(token);
-        state.access_token = data.value;
+        state.accessToken = data.value;
     }
     catch(e) {
         state.error = e;
         console.log('ERROR: failed authentication');
         window.localStorage.removeItem(AUTH_KEY);
     }
+}
+
+// authenticate on socket connect
+window.ipcRenderer.on("fetch-token", async (_event, _arg) => {
+    authToken();
 });
 
+if (token) {
+    authToken();
+}
+
 export const useAuth = () => {
     const setToken = (token: string, remember: boolean) => {
         if (remember) {
@@ -36,18 +44,18 @@ export const useAuth = () => {
             window.localStorage.setItem(AUTH_KEY, token);
         }
 
-        state.access_token = token;
+        state.accessToken = token;
         state.error = undefined;
     }
 
     const logout = (): Promise<void> => {
         window.localStorage.removeItem(AUTH_KEY);
-        return Promise.resolve(state.access_token = undefined);
+        return Promise.resolve(state.accessToken = undefined);
     }
 
     return {
         setToken,
         logout,
-        ...toRefs(state), // access_token, error
+        ...toRefs(state), // accessToken, error
     }
 }

diff --git a/src/router.ts b/src/router.ts
index a0602abd491a9b521349e9c5089e212306e1489a..f8aa2bf886fb86a1deb3fb77ab22fe5af2a02eca 100644 (file)
--- a/src/router.ts
+++ b/src/router.ts
@@ -35,13 +35,13 @@ const router = createRouter({
 });
 
 router.beforeEach((to, from, next) => {
-  const { access_token } = useAuth();
+  const { accessToken } = useAuth();
 
   // Not logged into a guarded route?
-  if (to.meta.requiresAuth && !access_token?.value) next({ name: 'login' });
+  if (to.meta.requiresAuth && !accessToken?.value) next({ name: 'login' });
 
   // Logged in for an auth route
-  else if ((to.name == 'login' || to.name == 'register') && access_token!.value) next({ name: 'home' });
+  else if ((to.name == 'login' || to.name == 'register') && accessToken!.value) next({ name: 'home' });
 
   // Carry On...
   else next();

diff --git a/src/views/login.vue b/src/views/login.vue
index edc5096ece54c45dc0019393fc6f8282001b6f0f..803c516f612f2e7ebcd762c5dcd6dd7a1f0ac73a 100644 (file)
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, toRefs, reactive, watch, ref } from "vue";
+import { defineComponent, ref } from "vue";
 import { useAuth } from "@/modules/auth";
 import { useIpc } from "@/modules/ipc";
 import { useRouter } from "vue-router";
@@ -35,14 +35,14 @@ interface LoginPayload {
 export default defineComponent({
   name: "Login",
   setup() {
-    const { setToken, access_token } = useAuth();
+    const { setToken } = useAuth();
     const router = useRouter();
 
     const email = ref("");
     const password = ref("");
     const rememberMe = ref(false);
 
-    const { loading, error, data,  invoke, errorMessage  } = useIpc('auth-user');
+    const {  data,  invoke  } = useIpc('auth-user');
 
     const submit = async () => {
         const payload = {
@@ -60,9 +60,7 @@ export default defineComponent({
     };
 
     return {
-      loading,
       submit,
-      errorMessage,
       email,
       password,
       rememberMe