mirror of
https://github.com/advplyr/audiobookshelf-app.git
synced 2026-11-21 16:01:33 +01:00
Update auth to handle refresh tokens
This commit is contained in:
1 parent
67bab72783
commit
d8cdb7073e
13 files changed
+828
-141
No files matched your search
+3
-3
@@ -1,5 +1,5 @@
|
||||
export default function ({ $axios, store }) {
|
||||
$axios.onRequest(config => {
|
||||
$axios.onRequest((config) => {
|
||||
console.log('[Axios] Making request to ' + config.url)
|
||||
if (config.url.startsWith('http:') || config.url.startsWith('https:') || config.url.startsWith('capacitor:')) {
|
||||
return
|
||||
@@ -26,7 +26,7 @@ export default function ({ $axios, store }) {
|
||||
console.log('[Axios] Request out', config.url)
|
||||
})
|
||||
|
||||
$axios.onError(error => {
|
||||
$axios.onError((error) => {
|
||||
console.error('Axios error code', error)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -245,7 +245,7 @@ class AbsAudioPlayerWeb extends WebPlugin {
|
||||
this.trackStartTime = Math.max(0, this.startTime - (this.currentTrack.startOffset || 0))
|
||||
const serverAddressUrl = new URL(vuexStore.getters['user/getServerAddress'])
|
||||
const serverHost = `${serverAddressUrl.protocol}//${serverAddressUrl.host}`
|
||||
this.player.src = `${serverHost}${this.currentTrack.contentUrl}?token=${vuexStore.getters['user/getToken']}`
|
||||
this.player.src = `${serverHost}${this.currentTrack.contentUrl}`
|
||||
console.log(`[AbsAudioPlayer] Loading track src ${this.player.src}`)
|
||||
this.player.load()
|
||||
this.player.playbackRate = this.playbackRate
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { registerPlugin, Capacitor, WebPlugin } from '@capacitor/core';
|
||||
import { registerPlugin, Capacitor, WebPlugin } from '@capacitor/core'
|
||||
|
||||
class AbsDatabaseWeb extends WebPlugin {
|
||||
constructor() {
|
||||
@@ -22,7 +22,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
async setCurrentServerConnectionConfig(serverConnectionConfig) {
|
||||
var deviceData = await this.getDeviceData()
|
||||
|
||||
var ssc = deviceData.serverConnectionConfigs.find(_ssc => _ssc.id == serverConnectionConfig.id)
|
||||
var ssc = deviceData.serverConnectionConfigs.find((_ssc) => _ssc.id == serverConnectionConfig.id)
|
||||
if (ssc) {
|
||||
deviceData.lastServerConnectionConfigId = ssc.id
|
||||
ssc.name = `${ssc.address} (${serverConnectionConfig.username})`
|
||||
@@ -30,6 +30,13 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
ssc.userId = serverConnectionConfig.userId
|
||||
ssc.username = serverConnectionConfig.username
|
||||
ssc.customHeaders = serverConnectionConfig.customHeaders || {}
|
||||
|
||||
if (serverConnectionConfig.refreshToken) {
|
||||
console.log('[AbsDatabase] Updating refresh token...', serverConnectionConfig.refreshToken)
|
||||
// Only using local storage for web version that is only used for testing
|
||||
localStorage.setItem(`refresh_token_${ssc.id}`, serverConnectionConfig.refreshToken)
|
||||
}
|
||||
|
||||
localStorage.setItem('device', JSON.stringify(deviceData))
|
||||
} else {
|
||||
ssc = {
|
||||
@@ -42,6 +49,13 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
token: serverConnectionConfig.token,
|
||||
customHeaders: serverConnectionConfig.customHeaders || {}
|
||||
}
|
||||
|
||||
if (serverConnectionConfig.refreshToken) {
|
||||
console.log('[AbsDatabase] Setting refresh token...', serverConnectionConfig.refreshToken)
|
||||
// Only using local storage for web version that is only used for testing
|
||||
localStorage.setItem(`refresh_token_${ssc.id}`, serverConnectionConfig.refreshToken)
|
||||
}
|
||||
|
||||
deviceData.serverConnectionConfigs.push(ssc)
|
||||
deviceData.lastServerConnectionConfigId = ssc.id
|
||||
localStorage.setItem('device', JSON.stringify(deviceData))
|
||||
@@ -49,10 +63,16 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
return ssc
|
||||
}
|
||||
|
||||
async getRefreshToken({ serverConnectionConfigId }) {
|
||||
console.log('[AbsDatabase] Getting refresh token...', serverConnectionConfigId)
|
||||
const refreshToken = localStorage.getItem(`refresh_token_${serverConnectionConfigId}`)
|
||||
return refreshToken ? { refreshToken } : null
|
||||
}
|
||||
|
||||
async removeServerConnectionConfig(serverConnectionConfigCallObject) {
|
||||
var serverConnectionConfigId = serverConnectionConfigCallObject.serverConnectionConfigId
|
||||
var deviceData = await this.getDeviceData()
|
||||
deviceData.serverConnectionConfigs = deviceData.serverConnectionConfigs.filter(ssc => ssc.id != serverConnectionConfigId)
|
||||
deviceData.serverConnectionConfigs = deviceData.serverConnectionConfigs.filter((ssc) => ssc.id != serverConnectionConfigId)
|
||||
localStorage.setItem('device', JSON.stringify(deviceData))
|
||||
}
|
||||
|
||||
@@ -85,79 +105,81 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
}
|
||||
async getLocalLibraryItems(payload) {
|
||||
return {
|
||||
value: [{
|
||||
id: 'local_test',
|
||||
libraryItemId: 'test34',
|
||||
serverAddress: 'https://abs.test.com',
|
||||
serverUserId: 'test56',
|
||||
folderId: 'test1',
|
||||
absolutePath: 'a',
|
||||
contentUrl: 'c',
|
||||
isInvalid: false,
|
||||
mediaType: 'book',
|
||||
media: {
|
||||
metadata: {
|
||||
title: 'Test Book',
|
||||
authorName: 'Test Author Name'
|
||||
value: [
|
||||
{
|
||||
id: 'local_test',
|
||||
libraryItemId: 'test34',
|
||||
serverAddress: 'https://abs.test.com',
|
||||
serverUserId: 'test56',
|
||||
folderId: 'test1',
|
||||
absolutePath: 'a',
|
||||
contentUrl: 'c',
|
||||
isInvalid: false,
|
||||
mediaType: 'book',
|
||||
media: {
|
||||
metadata: {
|
||||
title: 'Test Book',
|
||||
authorName: 'Test Author Name'
|
||||
},
|
||||
coverPath: null,
|
||||
tags: [],
|
||||
audioFiles: [],
|
||||
chapters: [],
|
||||
tracks: [
|
||||
{
|
||||
index: 1,
|
||||
startOffset: 0,
|
||||
duration: 10000,
|
||||
title: 'Track Title 1',
|
||||
contentUrl: 'test',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf1',
|
||||
audioProbeResult: {}
|
||||
},
|
||||
{
|
||||
index: 2,
|
||||
startOffset: 0,
|
||||
duration: 15000,
|
||||
title: 'Track Title 2',
|
||||
contentUrl: 'test2',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf2',
|
||||
audioProbeResult: {}
|
||||
},
|
||||
{
|
||||
index: 3,
|
||||
startOffset: 0,
|
||||
duration: 20000,
|
||||
title: 'Track Title 3',
|
||||
contentUrl: 'test3',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf3',
|
||||
audioProbeResult: {}
|
||||
}
|
||||
]
|
||||
},
|
||||
coverPath: null,
|
||||
tags: [],
|
||||
audioFiles: [],
|
||||
chapters: [],
|
||||
tracks: [
|
||||
localFiles: [
|
||||
{
|
||||
index: 1,
|
||||
startOffset: 0,
|
||||
duration: 10000,
|
||||
title: 'Track Title 1',
|
||||
id: 'lf1',
|
||||
filename: 'lf1.mp3',
|
||||
contentUrl: 'test',
|
||||
absolutePath: 'test',
|
||||
simplePath: 'test',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf1',
|
||||
audioProbeResult: {}
|
||||
},
|
||||
{
|
||||
index: 2,
|
||||
startOffset: 0,
|
||||
duration: 15000,
|
||||
title: 'Track Title 2',
|
||||
contentUrl: 'test2',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf2',
|
||||
audioProbeResult: {}
|
||||
},
|
||||
{
|
||||
index: 3,
|
||||
startOffset: 0,
|
||||
duration: 20000,
|
||||
title: 'Track Title 3',
|
||||
contentUrl: 'test3',
|
||||
mimeType: 'audio/mpeg',
|
||||
metadata: null,
|
||||
isLocal: true,
|
||||
localFileId: 'lf3',
|
||||
audioProbeResult: {}
|
||||
size: 39048290
|
||||
}
|
||||
]
|
||||
},
|
||||
localFiles: [
|
||||
{
|
||||
id: 'lf1',
|
||||
filename: 'lf1.mp3',
|
||||
contentUrl: 'test',
|
||||
absolutePath: 'test',
|
||||
simplePath: 'test',
|
||||
mimeType: 'audio/mpeg',
|
||||
size: 39048290
|
||||
}
|
||||
],
|
||||
coverContentUrl: null,
|
||||
coverAbsolutePath: null,
|
||||
isLocal: true
|
||||
}]
|
||||
],
|
||||
coverContentUrl: null,
|
||||
coverAbsolutePath: null,
|
||||
isLocal: true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
async getLocalLibraryItemsInFolder({ folderId }) {
|
||||
@@ -167,7 +189,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
return this.getLocalLibraryItems().then((data) => data.value[0])
|
||||
}
|
||||
async getLocalLibraryItemByLId({ libraryItemId }) {
|
||||
return this.getLocalLibraryItems().then((data) => data.value.find(lli => lli.libraryItemId == libraryItemId))
|
||||
return this.getLocalLibraryItems().then((data) => data.value.find((lli) => lli.libraryItemId == libraryItemId))
|
||||
}
|
||||
async getAllLocalMediaProgress() {
|
||||
return {
|
||||
@@ -182,7 +204,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
isFinished: false,
|
||||
lastUpdate: 394089090,
|
||||
startedAt: 239048209,
|
||||
finishedAt: null,
|
||||
finishedAt: null
|
||||
// For local lib items from server to support server sync
|
||||
// var serverConnectionConfigId:String?,
|
||||
// var serverAddress:String?,
|
||||
@@ -240,7 +262,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 22) + 13000 // 22 mins ago + 13s
|
||||
timestamp: Date.now() - 1000 * 60 * 22 + 13000 // 22 mins ago + 13s
|
||||
},
|
||||
{
|
||||
name: 'Play',
|
||||
@@ -250,7 +272,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: false,
|
||||
serverSyncSuccess: null,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 22) // 22 mins ago
|
||||
timestamp: Date.now() - 1000 * 60 * 22 // 22 mins ago
|
||||
},
|
||||
{
|
||||
name: 'Pause',
|
||||
@@ -260,7 +282,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: false,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60) + (58000) // 1 hour ago + 58s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 + 58000 // 1 hour ago + 58s
|
||||
},
|
||||
{
|
||||
name: 'Save',
|
||||
@@ -270,7 +292,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60) + (45000) // 1 hour ago + 45s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 + 45000 // 1 hour ago + 45s
|
||||
},
|
||||
{
|
||||
name: 'Save',
|
||||
@@ -280,7 +302,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60) + (30000) // 1 hour ago + 30s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 + 30000 // 1 hour ago + 30s
|
||||
},
|
||||
{
|
||||
name: 'Save',
|
||||
@@ -290,7 +312,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60) + (15000) // 1 hour ago + 15s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 + 15000 // 1 hour ago + 15s
|
||||
},
|
||||
{
|
||||
name: 'Play',
|
||||
@@ -300,7 +322,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: false,
|
||||
serverSyncSuccess: null,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60) // 1 hour ago
|
||||
timestamp: Date.now() - 1000 * 60 * 60 // 1 hour ago
|
||||
},
|
||||
{
|
||||
name: 'Stop',
|
||||
@@ -310,7 +332,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60 * 25) + 10000 // 25 hours ago + 10s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 * 25 + 10000 // 25 hours ago + 10s
|
||||
},
|
||||
{
|
||||
name: 'Seek',
|
||||
@@ -320,7 +342,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: true,
|
||||
serverSyncSuccess: true,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60 * 25) + 2000 // 25 hours ago + 2s
|
||||
timestamp: Date.now() - 1000 * 60 * 60 * 25 + 2000 // 25 hours ago + 2s
|
||||
},
|
||||
{
|
||||
name: 'Play',
|
||||
@@ -330,7 +352,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: false,
|
||||
serverSyncSuccess: null,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60 * 25) // 25 hours ago
|
||||
timestamp: Date.now() - 1000 * 60 * 60 * 25 // 25 hours ago
|
||||
},
|
||||
{
|
||||
name: 'Play',
|
||||
@@ -340,7 +362,7 @@ class AbsDatabaseWeb extends WebPlugin {
|
||||
serverSyncAttempted: false,
|
||||
serverSyncSuccess: null,
|
||||
serverSyncMessage: null,
|
||||
timestamp: Date.now() - (1000 * 60 * 60 * 50) // 50 hours ago
|
||||
timestamp: Date.now() - 1000 * 60 * 60 * 50 // 50 hours ago
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -351,4 +373,4 @@ const AbsDatabase = registerPlugin('AbsDatabase', {
|
||||
web: () => new AbsDatabaseWeb()
|
||||
})
|
||||
|
||||
export { AbsDatabase }
|
||||
export { AbsDatabase }
|
||||
@@ -2,9 +2,10 @@ import Vue from 'vue'
|
||||
import { AbsAudioPlayer } from './AbsAudioPlayer'
|
||||
import { AbsDownloader } from './AbsDownloader'
|
||||
import { AbsFileSystem } from './AbsFileSystem'
|
||||
import { AbsDatabase } from './AbsDatabase'
|
||||
import { AbsLogger } from './AbsLogger'
|
||||
import { Capacitor } from '@capacitor/core'
|
||||
|
||||
Vue.prototype.$platform = Capacitor.getPlatform()
|
||||
|
||||
export { AbsAudioPlayer, AbsDownloader, AbsFileSystem, AbsLogger }
|
||||
export { AbsAudioPlayer, AbsDownloader, AbsFileSystem, AbsLogger, AbsDatabase }
|
||||
+14
-6
@@ -1,7 +1,7 @@
|
||||
import { AbsDatabase } from './capacitor/AbsDatabase'
|
||||
|
||||
class DbService {
|
||||
constructor() { }
|
||||
constructor() {}
|
||||
|
||||
getDeviceData() {
|
||||
return AbsDatabase.getDeviceData().then((data) => {
|
||||
@@ -29,10 +29,12 @@ class DbService {
|
||||
}
|
||||
|
||||
getLocalFolders() {
|
||||
return AbsDatabase.getLocalFolders().then((data) => data.value).catch((error) => {
|
||||
console.error('Failed to load', error)
|
||||
return null
|
||||
})
|
||||
return AbsDatabase.getLocalFolders()
|
||||
.then((data) => data.value)
|
||||
.catch((error) => {
|
||||
console.error('Failed to load', error)
|
||||
return null
|
||||
})
|
||||
}
|
||||
|
||||
getLocalFolder(folderId) {
|
||||
@@ -103,4 +105,10 @@ class DbService {
|
||||
|
||||
export default ({ app, store }, inject) => {
|
||||
inject('db', new DbService())
|
||||
}
|
||||
|
||||
// Listen for token refresh events from native app
|
||||
AbsDatabase.addListener('onTokenRefresh', (data) => {
|
||||
console.log('[db] onTokenRefresh', data)
|
||||
store.commit('user/setAccessToken', data.accessToken)
|
||||
})
|
||||
}
|
||||
+215
-6
@@ -1,8 +1,13 @@
|
||||
import { CapacitorHttp } from '@capacitor/core'
|
||||
import { AbsDatabase } from '@/plugins/capacitor'
|
||||
|
||||
export default function ({ store }, inject) {
|
||||
const nativeHttp = {
|
||||
request(method, _url, data, options = {}) {
|
||||
async request(method, _url, data, options = {}) {
|
||||
// When authorizing before a config is set, server config gets passed in as an option
|
||||
let serverConnectionConfig = options.serverConnectionConfig || store.state.user.serverConnectionConfig
|
||||
delete options.serverConnectionConfig
|
||||
|
||||
let url = _url
|
||||
const headers = {}
|
||||
if (!url.startsWith('http') && !url.startsWith('capacitor')) {
|
||||
@@ -12,9 +17,8 @@ export default function ({ store }, inject) {
|
||||
} else {
|
||||
console.warn('[nativeHttp] No Bearer Token for request')
|
||||
}
|
||||
const serverUrl = store.getters['user/getServerAddress']
|
||||
if (serverUrl) {
|
||||
url = `${serverUrl}${url}`
|
||||
if (serverConnectionConfig?.address) {
|
||||
url = `${serverConnectionConfig.address}${url}`
|
||||
}
|
||||
}
|
||||
if (data) {
|
||||
@@ -27,7 +31,12 @@ export default function ({ store }, inject) {
|
||||
data,
|
||||
headers,
|
||||
...options
|
||||
}).then(res => {
|
||||
}).then((res) => {
|
||||
if (res.status === 401) {
|
||||
console.error(`[nativeHttp] 401 status for url "${url}"`)
|
||||
// Handle refresh token automatically
|
||||
return this.handleTokenRefresh(method, url, data, headers, options, serverConnectionConfig)
|
||||
}
|
||||
if (res.status >= 400) {
|
||||
console.error(`[nativeHttp] ${res.status} status for url "${url}"`)
|
||||
throw new Error(res.data)
|
||||
@@ -35,6 +44,206 @@ export default function ({ store }, inject) {
|
||||
return res.data
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* Handles token refresh when a 401 Unauthorized response is received
|
||||
* @param {string} method - HTTP method
|
||||
* @param {string} url - Full URL
|
||||
* @param {*} data - Request data
|
||||
* @param {Object} headers - Request headers
|
||||
* @param {Object} options - Additional options
|
||||
* @param {{ id: string, address: string }} serverConnectionConfig
|
||||
* @returns {Promise} - Promise that resolves with the response data
|
||||
*/
|
||||
async handleTokenRefresh(method, url, data, headers, options, serverConnectionConfig) {
|
||||
try {
|
||||
console.log('[nativeHttp] Attempting to refresh token...')
|
||||
|
||||
if (!serverConnectionConfig?.id) {
|
||||
console.error('[nativeHttp] No server connection config ID available for token refresh')
|
||||
throw new Error('No server connection available')
|
||||
}
|
||||
|
||||
// Get refresh token from secure storage
|
||||
const refreshTokenData = await this.getRefreshToken(serverConnectionConfig.id)
|
||||
if (!refreshTokenData || !refreshTokenData.refreshToken) {
|
||||
console.error('[nativeHttp] No refresh token available')
|
||||
throw new Error('No refresh token available')
|
||||
}
|
||||
|
||||
// Attempt to refresh the token
|
||||
const newTokens = await this.refreshAccessToken(refreshTokenData.refreshToken, serverConnectionConfig.address)
|
||||
if (!newTokens || !newTokens.accessToken) {
|
||||
console.error('[nativeHttp] Failed to refresh access token')
|
||||
throw new Error('Failed to refresh access token')
|
||||
}
|
||||
|
||||
// Update the store with new tokens
|
||||
await this.updateTokens(newTokens, serverConnectionConfig)
|
||||
|
||||
// Retry the original request with the new token
|
||||
console.log('[nativeHttp] Retrying original request with new token...')
|
||||
const newHeaders = options?.headers ? { ...options.headers } : { ...headers }
|
||||
newHeaders['Authorization'] = `Bearer ${newTokens.accessToken}`
|
||||
|
||||
const retryResponse = await CapacitorHttp.request({
|
||||
method,
|
||||
url,
|
||||
data,
|
||||
...options,
|
||||
headers: newHeaders
|
||||
})
|
||||
|
||||
if (retryResponse.status >= 400) {
|
||||
console.error(`[nativeHttp] Retry request failed with status ${retryResponse.status}`)
|
||||
throw new Error(retryResponse.data)
|
||||
}
|
||||
|
||||
return retryResponse.data
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Token refresh failed:', error)
|
||||
|
||||
// If refresh fails, redirect to login
|
||||
await this.handleRefreshFailure()
|
||||
throw error
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Retrieves refresh token from secure storage
|
||||
* @param {string} serverConnectionConfigId - Server connection config ID
|
||||
* @returns {Promise<Object|null>} - Promise that resolves with refresh token data or null
|
||||
*/
|
||||
async getRefreshToken(serverConnectionConfigId) {
|
||||
try {
|
||||
console.log('[nativeHttp] Getting refresh token...')
|
||||
return await AbsDatabase.getRefreshToken({ serverConnectionConfigId })
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Failed to get refresh token:', error)
|
||||
return null
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Refreshes the access token using the refresh token
|
||||
* @param {string} refreshToken - The refresh token
|
||||
* @param {string} serverAddress - The server address
|
||||
* @returns {Promise<Object|null>} - Promise that resolves with new tokens or null
|
||||
*/
|
||||
async refreshAccessToken(refreshToken, serverAddress) {
|
||||
try {
|
||||
if (!serverAddress) {
|
||||
throw new Error('No server address available')
|
||||
}
|
||||
|
||||
console.log('[nativeHttp] Refreshing access token...')
|
||||
|
||||
const response = await CapacitorHttp.post({
|
||||
url: `${serverAddress}/auth/refresh`,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${refreshToken}`,
|
||||
'X-Return-Tokens': 'true'
|
||||
},
|
||||
data: {}
|
||||
})
|
||||
|
||||
if (response.status !== 200) {
|
||||
console.error('[nativeHttp] Token refresh request failed:', response.status)
|
||||
return null
|
||||
}
|
||||
|
||||
const userResponseData = response.data
|
||||
if (!userResponseData.user?.accessToken) {
|
||||
console.error('[nativeHttp] No access token in refresh response')
|
||||
return null
|
||||
}
|
||||
|
||||
console.log('[nativeHttp] Successfully refreshed access token')
|
||||
return {
|
||||
accessToken: userResponseData.user.accessToken,
|
||||
refreshToken: userResponseData.user.refreshToken || refreshToken // Use new refresh token if provided, otherwise keep the old one
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Failed to refresh access token:', error)
|
||||
return null
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Updates the store and secure storage with new tokens
|
||||
* @param {Object} tokens - Object containing accessToken and refreshToken
|
||||
* @param {{ id: string, address: string }} serverConnectionConfig
|
||||
* @returns {Promise} - Promise that resolves when tokens are updated
|
||||
*/
|
||||
async updateTokens(tokens, serverConnectionConfig) {
|
||||
try {
|
||||
if (!serverConnectionConfig?.id) {
|
||||
throw new Error('No server connection config ID available')
|
||||
}
|
||||
|
||||
// Update the config with new tokens
|
||||
const updatedConfig = {
|
||||
...serverConnectionConfig,
|
||||
token: tokens.accessToken,
|
||||
refreshToken: tokens.refreshToken
|
||||
}
|
||||
|
||||
// Save updated config to secure storage
|
||||
const savedConfig = await AbsDatabase.setCurrentServerConnectionConfig(updatedConfig)
|
||||
|
||||
// Update the store
|
||||
store.commit('user/setAccessToken', tokens.accessToken)
|
||||
|
||||
if (savedConfig) {
|
||||
store.commit('user/setServerConnectionConfig', savedConfig)
|
||||
}
|
||||
|
||||
console.log('[nativeHttp] Successfully updated tokens in store and secure storage')
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Failed to update tokens:', error)
|
||||
throw error
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Handles the case when token refresh fails
|
||||
* @returns {Promise} - Promise that resolves when logout is complete
|
||||
*/
|
||||
async handleRefreshFailure() {
|
||||
try {
|
||||
console.log('[nativeHttp] Handling refresh failure - logging out user')
|
||||
|
||||
// Clear the store
|
||||
store.commit('user/setUser', null)
|
||||
store.commit('user/setAccessToken', null)
|
||||
store.commit('user/setServerConnectionConfig', null)
|
||||
|
||||
// Logout from database
|
||||
await AbsDatabase.logout()
|
||||
|
||||
// Redirect to login page
|
||||
if (window.location.pathname !== '/connect') {
|
||||
window.location.href = '/connect'
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Failed to handle refresh failure:', error)
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets device data from the database
|
||||
* @returns {Promise<Object>} - Promise that resolves with device data
|
||||
*/
|
||||
async getDeviceData() {
|
||||
try {
|
||||
return await AbsDatabase.getDeviceData()
|
||||
} catch (error) {
|
||||
console.error('[nativeHttp] Failed to get device data:', error)
|
||||
return { serverConnectionConfigs: [] }
|
||||
}
|
||||
},
|
||||
|
||||
get(url, options = {}) {
|
||||
return this.request('GET', url, undefined, options)
|
||||
},
|
||||
@@ -49,4 +258,4 @@ export default function ({ store }, inject) {
|
||||
}
|
||||
}
|
||||
inject('nativeHttp', nativeHttp)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user