From 708f3999169d4cde6fe2f449db6749b67d3d6c74 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 21 Nov 2021 06:54:10 -0600
Subject: [PATCH] Add: Login/connection error messages

---
 Server.js                | 69 ++++++++++++++++++++++++++++++++--------
 android/app/build.gradle |  4 +--
 layouts/default.vue      | 13 +-------
 package.json             |  2 +-
 pages/connect.vue        | 26 ++++++++-------
 store/index.js           | 22 +++++++++++--
 6 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/Server.js b/Server.js
index dfae3a51..760db0c5 100644
--- a/Server.js
+++ b/Server.js
@@ -64,23 +64,28 @@ class Server extends EventEmitter {
   async connect(url, token) {
     if (this.connected) {
       console.warn('[SOCKET] Connection already established for ' + this.url)
-      return true
+      return { success: true }
     }
     if (!url) {
       console.error('Invalid url to connect')
-      return false
+      return {
+        error: 'Invalid URL'
+      }
     }
 
     var serverUrl = this.getServerUrl(url)
     var res = await this.ping(serverUrl)
 
     if (!res || !res.success) {
-      //this.setServerUrl(null)
-      return false
+      return {
+        error: res ? res.error : 'Unknown Error'
+      }
     }
     var authRes = await this.authorize(serverUrl, token)
-    if (!authRes || !authRes.user) {
-      return false
+    if (!authRes || authRes.error) {
+      return {
+        error: authRes ? authRes.error : 'Authorization Error'
+      }
     }
 
     this.setServerUrl(serverUrl)
@@ -88,19 +93,26 @@ class Server extends EventEmitter {
     this.setUser(authRes.user)
     this.connectSocket()
 
-    return true
+    return { success: true }
   }
 
   async check(url) {
     var serverUrl = this.getServerUrl(url)
     if (!serverUrl) {
-      return false
+      return {
+        error: 'Invalid server url'
+      }
     }
     var res = await this.ping(serverUrl)
-    if (!res || !res.success) {
-      return false
+    if (!res || res.error) {
+      return {
+        error: res ? res.error : 'Ping Failed'
+      }
+    }
+    return {
+      success: true,
+      serverUrl
     }
-    return serverUrl
   }
 
   async login(url, username, password) {
@@ -122,8 +134,16 @@ class Server extends EventEmitter {
       }
     }).catch(error => {
       console.error('[Server] Server auth failed', error)
+      var errorMsg = null
+      if (error.response) {
+        errorMsg = error.response.data || 'Unknown Error'
+      } else if (error.request) {
+        errorMsg = 'Server did not respond'
+      } else {
+        errorMsg = 'Failed to send request'
+      }
       return {
-        error: 'Request Failed'
+        error: errorMsg
       }
     })
   }
@@ -142,7 +162,17 @@ class Server extends EventEmitter {
       return res.data
     }).catch(error => {
       console.error('[Server] Server auth failed', error)
-      return false
+      var errorMsg = null
+      if (error.response) {
+        errorMsg = error.response.data || 'Unknown Error'
+      } else if (error.request) {
+        errorMsg = 'Server did not respond'
+      } else {
+        errorMsg = 'Failed to send request'
+      }
+      return {
+        error: errorMsg
+      }
     })
   }
 
@@ -153,7 +183,18 @@ class Server extends EventEmitter {
       return res.data
     }).catch(error => {
       console.error('Server check failed', error)
-      return false
+      var errorMsg = null
+      if (error.response) {
+        errorMsg = error.response.data || 'Unknown Error'
+      } else if (error.request) {
+        errorMsg = 'Server did not respond'
+      } else {
+        errorMsg = 'Failed to send request'
+      }
+      return {
+        success: false,
+        error: errorMsg
+      }
     })
   }
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9d36768b..9a5a928e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.audiobookshelf.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 44
-        versionName "0.9.25-beta"
+        versionCode 45
+        versionName "0.9.26-beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/layouts/default.vue b/layouts/default.vue
index e3dce915..cabe838d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -5,7 +5,6 @@
       <Nuxt />
     </div>
     <app-audio-player-container ref="streamContainer" />
-    <!-- <modals-downloads-modal ref="downloadsModal" @deleteDownload="deleteDownload" /> -->
     <modals-libraries-modal />
     <app-side-drawer />
     <readers-reader />
@@ -14,7 +13,6 @@
 
 <script>
 import { Capacitor } from '@capacitor/core'
-import { Network } from '@capacitor/network'
 import { AppUpdate } from '@robingenz/capacitor-app-update'
 import AudioDownloader from '@/plugins/audio-downloader'
 import StorageManager from '@/plugins/storage-manager'
@@ -276,15 +274,6 @@ export default {
         this.$store.commit('setHasStoragePermission', true)
       }
     },
-    async setupNetworkListener() {
-      var status = await Network.getStatus()
-      this.$store.commit('setNetworkStatus', status)
-
-      Network.addListener('networkStatusChange', (status) => {
-        console.log('Network status changed', status.connected, status.connectionType)
-        this.$store.commit('setNetworkStatus', status)
-      })
-    },
     showErrorToast(message) {
       this.$toast.error(message)
     },
@@ -333,7 +322,7 @@ export default {
 
     if (this.$store.state.isFirstLoad) {
       this.$store.commit('setIsFirstLoad', false)
-      await this.setupNetworkListener()
+      await this.$store.dispatch('setupNetworkListener')
       this.attemptConnection()
       this.checkForUpdate()
       this.initMediaStore()
diff --git a/package.json b/package.json
index 0857e5c3..11a33b68 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-app",
-  "version": "v0.9.25-beta",
+  "version": "v0.9.26-beta",
   "author": "advplyr",
   "scripts": {
     "dev": "nuxt --hostname localhost --port 1337",
diff --git a/pages/connect.vue b/pages/connect.vue
index 824e51c3..75ba6a8b 100644
--- a/pages/connect.vue
+++ b/pages/connect.vue
@@ -97,11 +97,11 @@ export default {
       }
       this.processing = true
       this.error = null
-      var success = await this.$server.check(this.serverUrl)
+      var response = await this.$server.check(this.serverUrl)
       this.processing = false
-      if (!success) {
+      if (!response || response.error) {
         console.error('Server invalid')
-        this.error = 'Invalid Server'
+        this.error = response ? response.error : 'Invalid Server'
       } else {
         this.showAuth = true
       }
@@ -143,6 +143,8 @@ export default {
       this.redirect()
     },
     async init() {
+      await this.$store.dispatch('setupNetworkListener')
+
       if (!this.$server) {
         console.error('Invalid server not initialized')
         return
@@ -162,16 +164,18 @@ export default {
         this.serverUrl = localServerUrl
         if (localUserToken) {
           this.processing = true
-          var success = await this.$server.connect(localServerUrl, localUserToken)
-
-          if (!success && !this.$server.url) {
-            this.processing = false
-            this.serverUrl = null
-            this.showAuth = false
-          } else if (!success) {
-            console.log('Server connect success')
+          var response = await this.$server.connect(localServerUrl, localUserToken)
+          if (!response || response.error) {
+            var errorMsg = response ? response.error : 'Unknown Error'
             this.processing = false
+            this.error = errorMsg
+            if (!this.$server.url) {
+              this.serverUrl = null
+              this.showAuth = false
+            }
+            return
           }
+          console.log('Server connect success')
           this.showAuth = true
         } else {
           this.submit()
diff --git a/store/index.js b/store/index.js
index dbee9a11..ab268cc7 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { Network } from '@capacitor/network'
 
 export const state = () => ({
   streamAudiobook: null,
@@ -17,7 +18,8 @@ export const state = () => ({
   downloadFolder: null,
 
   showSideDrawer: false,
-  bookshelfView: 'grid'
+  bookshelfView: 'grid',
+  isNetworkListenerInit: false
 })
 
 export const getters = {
@@ -35,7 +37,20 @@ export const getters = {
   }
 }
 
-export const actions = {}
+export const actions = {
+  async setupNetworkListener({ state, commit }) {
+    if (state.isNetworkListenerInit) return
+    commit('setNetworkListenerInit', true)
+
+    var status = await Network.getStatus()
+    commit('setNetworkStatus', status)
+
+    Network.addListener('networkStatusChange', (status) => {
+      console.log('Network status changed', status.connected, status.connectionType)
+      commit('setNetworkStatus', status)
+    })
+  }
+}
 
 export const mutations = {
   setHasStoragePermission(state, val) {
@@ -80,6 +95,9 @@ export const mutations = {
   setSocketConnected(state, val) {
     state.socketConnected = val
   },
+  setNetworkListenerInit(state, val) {
+    state.isNetworkListenerInit = val
+  },
   setNetworkStatus(state, val) {
     state.networkConnected = val.connected
     state.networkConnectionType = val.connectionType