mirror of
https://github.com/advplyr/audiobookshelf-app.git
synced 2025-08-28 13:58:23 +02:00
OIDC to support new access tokens
This commit is contained in:
parent
be08efeca3
commit
beb5e1a56c
1 changed files with 14 additions and 4 deletions
|
@ -393,15 +393,19 @@ export default {
|
||||||
} catch (error) {} // No Error handling needed
|
} catch (error) {} // No Error handling needed
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Returns the same user response payload as /login
|
||||||
const response = await CapacitorHttp.get({
|
const response = await CapacitorHttp.get({
|
||||||
url: backendEndpoint
|
url: backendEndpoint
|
||||||
})
|
})
|
||||||
|
// v2.26.0+ returns accessToken and refreshToken on user object
|
||||||
if (!response.data || !response.data.user || !response.data.user.token) {
|
if (!response.data?.user?.token && !response.data?.user?.accessToken) {
|
||||||
throw new Error('Token data is missing in the response.')
|
throw new Error('Token is missing in response.')
|
||||||
}
|
}
|
||||||
|
|
||||||
this.serverConfig.token = response.data.user.token
|
const user = response.data.user
|
||||||
|
this.serverConfig.token = user.accessToken || user.token
|
||||||
|
|
||||||
|
// TODO: Is it necessary to authenticate again?
|
||||||
const payload = await this.authenticateToken()
|
const payload = await this.authenticateToken()
|
||||||
|
|
||||||
if (!payload) {
|
if (!payload) {
|
||||||
|
@ -413,6 +417,12 @@ export default {
|
||||||
throw new Error('Config already exists for this address and username.')
|
throw new Error('Config already exists for this address and username.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For v2.26.0+ re-attach accessToken and refreshToken to user object because /authorize does not return them
|
||||||
|
if (user.accessToken) {
|
||||||
|
payload.user.accessToken = user.accessToken
|
||||||
|
payload.user.refreshToken = user.refreshToken
|
||||||
|
}
|
||||||
|
|
||||||
this.setUserAndConnection(payload)
|
this.setUserAndConnection(payload)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[SSO] Error in exchangeCodeForToken: ', error)
|
console.error('[SSO] Error in exchangeCodeForToken: ', error)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue