mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-07-23 20:25:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Don't check version for now

Browse source 
- Be more explicit on error 404, to not confuse users
- Error for when there is no authCode
This commit is contained in:
Denis Arnst 2023-11-11 21:30:10 +01:00
parent 6a938b8da1
commit a42dfa5649
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/connection/ServerConnectForm.vue
View file

@ -82,7 +82,8 @@ import { Browser } from '@capacitor/browser'
import { CapacitorHttp } from '@capacitor/core'
import { Dialog } from '@capacitor/dialog'
const requiredServerVersion = '2.5.0'
// TODO: when backend ready. See validateLoginFormResponse()
//const requiredServerVersion = '2.5.0'
export default {
data() {
@ -315,6 +316,9 @@ export default {
if (authCode) {
await this.oauthExchangeCodeForToken(authCode, state)
} else {
console.warn(`[SSO] No code received`)
this.$toast.error(`SSO: The response from the SSO Provider did not include a code (authentication error?)`)
}
} else {
console.warn(`[ServerConnectForm] appUrlOpen: Unknown url: ${url} - host: ${urlObj.hostname} - path: ${urlObj.pathname}`)
@ -649,14 +653,19 @@ export default {
this.error = 'Response from server was empty' // Usually some kind of config error on server side
console.error('[ServerConnectForm] Received empty response')
return false
} else if (!('app' in statusData.data) || statusData.data.app.toLowerCase() !== 'audiobookshelf') {
} else if (!('isInit' in statusData.data) || !('language' in statusData.data)) {
this.error = 'This does not seem to be a Audiobookshelf server'
console.error('[ServerConnectForm] Received as response from Server:\n', statusData)
return false
} else if (!this.isValidVersion(statusData.data.serverVersion, requiredServerVersion)) {
this.error = `Server version is below minimum required version of ${requiredServerVersion} (${statusData.data.serverVersion})`
console.error('[ServerConnectForm] Server version is too low: ', statusData.data.serverVersion)
return false
// TODO: delete the if above and comment the ones below out, as soon as the backend is ready to introduce a version check
// } else if (!('app' in statusData.data) || statusData.data.app.toLowerCase() !== 'audiobookshelf') {
// this.error = 'This does not seem to be a Audiobookshelf server'
// console.error('[ServerConnectForm] Received as response from Server:\n', statusData)
// return false
// } else if (!this.isValidVersion(statusData.data.serverVersion, requiredServerVersion)) {
// this.error = `Server version is below minimum required version of ${requiredServerVersion} (${statusData.data.serverVersion})`
// console.error('[ServerConnectForm] Server version is too low: ', statusData.data.serverVersion)
// return false
} else if (!statusData.data.isInit) {
this.error = 'Server is not initialized'
return false
@ -680,7 +689,7 @@ export default {
console.error('[ServerConnectForm] Received invalid status', error)
if (error.code === 404) {
this.error = `This does not seem to be an Audiobookshelf server. (Error: 404)`
this.error = `This does not seem to be an Audiobookshelf server. (Error: 404 querying /status)`
} else if (typeof error.code === 'number') {
// Error with HTTP Code
this.error = `Failed to retrieve status of server: ${error.code}`