mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-07-19 02:04:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update:Trim trailing slash from server address input

Browse source
This commit is contained in:
advplyr 2023-11-13 15:22:15 -06:00
parent a7cbdbfbbb
commit a88e404ccf
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/connection/ServerConnectForm.vue
View file

@ -334,7 +334,7 @@ export default {
*/ */
async oauthExchangeCodeForToken(code, state) { async oauthExchangeCodeForToken(code, state) {
// We need to read the url directly from this.serverConfig.address as the callback which is called via the external browser does not pass us that info // We need to read the url directly from this.serverConfig.address as the callback which is called via the external browser does not pass us that info
const backendEndpoint = `${this.serverConfig.address}auth/openid/callback?state=${encodeURIComponent(state)}&code=${encodeURIComponent(code)}&code_verifier=${encodeURIComponent(this.oauth.verifier)}` const backendEndpoint = `${this.serverConfig.address}/auth/openid/callback?state=${encodeURIComponent(state)}&code=${encodeURIComponent(code)}&code_verifier=${encodeURIComponent(this.oauth.verifier)}`
try { try {
// We can close the browser at this point (does not work on Android) // We can close the browser at this point (does not work on Android)
@ -674,7 +674,8 @@ export default {
// So set the correct protocol for the config // So set the correct protocol for the config
const configUrl = new URL(this.serverConfig.address) const configUrl = new URL(this.serverConfig.address)
configUrl.protocol = currentAddressUrl.protocol configUrl.protocol = currentAddressUrl.protocol
this.serverConfig.address = configUrl.toString() // Remove trailing slash
this.serverConfig.address = configUrl.toString().replace(/\/$/, '')
return true return true
}, },
@ -819,7 +820,7 @@ export default {
this.error = null this.error = null
this.processing = true this.processing = true
const authRes = await this.postRequest(`${this.serverConfig.address}api/authorize`, null, { Authorization: `Bearer ${this.serverConfig.token}` }).catch((error) => { const authRes = await this.postRequest(`${this.serverConfig.address}/api/authorize`, null, { Authorization: `Bearer ${this.serverConfig.token}` }).catch((error) => {
console.error('[ServerConnectForm] Server auth failed', error) console.error('[ServerConnectForm] Server auth failed', error)
const errorMsg = error.message || error const errorMsg = error.message || error
this.error = 'Failed to authorize' this.error = 'Failed to authorize'