fix: try autologin after 401 error

Author: therockerline

src/main/classes/windows/BaseWindow.ts

@@ -110,9 +110,9 @@ export class BaseWindow {
     function onOpenDevTools(e, page) {
       instance.openDevTool(page)
     }
-
     window.once('ready-to-show', onReady)
     isDev() && window.webContents.ipc.on(IPC_EVENTS.OPEN_DEV_TOOLS, onOpenDevTools)
+    !isDev() && window.removeMenu()
 
     this._window = window
   }

src/main/main.ts

@@ -1,4 +1,4 @@
-import { app, ipcMain, nativeTheme, powerMonitor, protocol, systemPreferences } from 'electron'
+import { app, globalShortcut, ipcMain, nativeTheme, powerMonitor, protocol, systemPreferences } from 'electron'
 import { registerIpcEvents } from '@/lib/ipcEvents'
 import { AccountController } from './classes/controllers'
 import { PhoneIslandController } from './classes/controllers/PhoneIslandController'
@@ -230,6 +230,11 @@ function attachOnReadyProcess() {
       }
     })
 
+    //Override globalShortcut to prevent the user from opening developer tools
+    globalShortcut.register('alt', () => {
+      return false
+    })
+
     if (isDev()) {
       const events: string[] = [
         'accessibility-support-changed',

src/renderer/src/components/pageComponents/login/DisplayedAccountLogin.tsx

@@ -37,7 +37,12 @@ export function DisplayedAccountLogin({
       <div className='flex flex-row justify-between  items-center w-[325px]'>
         <p className="w-[300px] truncate">
           {account
-            ? `${account.data?.name} (${account.data?.endpoints.mainextension[0].id})`
+            ? <span>
+              <span>
+                {account.data?.name}
+              </span>
+              {isDev() && <div className='text-xs'>[{account.data?.endpoints.mainextension[0].id} - {account.host}]</div>}
+            </span>
             : t('Login.Use Another Account')}
         </p>
         {

src/renderer/src/hooks/useAccount.ts

@@ -47,21 +47,25 @@ export const useAccount = () => {
   }
 
   const updateAccountData = async () => {
-    const me = await NethVoiceAPI.User.me()
-    Log.debug('phone-island-default-device-updated', me.default_device)
-    const device = {
-      type: me.default_device.type as AvailableDevices,
-      id: me.default_device.id
-    }
-    setDevice(() => device)
-    setAccount((p) => ({
-      ...p!,
-      data: {
-        ...p?.data,
-        ...me
+    try {
+      const me = await NethVoiceAPI.User.me()
+      Log.debug('phone-island-default-device-updated', me.default_device)
+      const device = {
+        type: me.default_device.type as AvailableDevices,
+        id: me.default_device.id
       }
-    }))
-
+      setDevice(() => device)
+      setAccount((p) => ({
+        ...p!,
+        data: {
+          ...p?.data,
+          ...me
+        }
+      }))
+    } catch (e) {
+      Log.error(e)
+      throw e
+    }
   }
 
   return {

src/renderer/src/pages/NethLinkPage.tsx

@@ -12,9 +12,7 @@ import { ConnectionErrorDialog } from '@renderer/components'
 import { debouncer } from '@shared/utils/utils'
 import { useAccount } from '@renderer/hooks/useAccount'
 import { Sidebar } from '@renderer/components/Modules/NethVoice/BaseModule/Sidebar'
-import { AvailableDevices } from '@shared/types'
 import { sendNotification } from '@renderer/utils'
-import { AxiosError } from 'axios'
 
 
 export interface NethLinkPageProps {
@@ -107,33 +105,38 @@ export function NethLinkPage({ handleRefreshConnection }: NethLinkPageProps) {
   }
 
   async function loadData() {
-    Log.debug('update account')
-    NethVoiceAPI.fetchOperators().then((op) => {
-      saveOperators(op)
-      updateAccountData()
-    })
-    NethVoiceAPI.HistoryCall.interval().then(saveLastCalls)
-
-    NethVoiceAPI.AstProxy.getQueues().then(onQueueUpdate)
-    if (hasPermission(PERMISSION.PARKINGS))
-      NethVoiceAPI.AstProxy.getParkings().then(onParkingsUpdate)
-    reloadData()
+    Log.info('update account')
+    try {
+      await updateAccountData()
+      NethVoiceAPI.fetchOperators().then(saveOperators)
+      NethVoiceAPI.HistoryCall.interval().then(saveLastCalls)
+      NethVoiceAPI.AstProxy.getQueues().then(onQueueUpdate)
+      if (hasPermission(PERMISSION.PARKINGS))
+        NethVoiceAPI.AstProxy.getParkings().then(onParkingsUpdate)
+      reloadData()
+    } catch (e) {
+      Log.warning(e)
+      if (e['status'] === 401) {
+        Log.error(e)
+        window.electron.send(IPC_EVENTS.RESUME)
+      }
+    }
   }
 
   async function reloadData() {
     Log.debug('RELOAD DATA', isFetching.current)
     if (!isFetching.current) {
       isFetching.current = true
-      NethVoiceAPI.Phonebook.getSpeeddials().then((s) => {
-        saveSpeeddials(s)
-        updateAccountData()
-      }).catch((e: AxiosError) => {
+      try {
+        await updateAccountData()
+      } catch (e) {
         Log.warning(e)
-        if (e.status === 401) {
+        if (e['status'] === 401) {
           Log.error(e)
           window.electron.send(IPC_EVENTS.RESUME)
         }
-      })
+      }
+      NethVoiceAPI.Phonebook.getSpeeddials().then(saveSpeeddials)
     }
     debouncer('speeddial-fetch', () => {
       isFetching.current = false