logs (#2146)
* logs
Signed-off-by: Jess Frazelle <github@jessfraz.com>
* Revert "logs"
This reverts commit 30b9966342
.
* fix token
Signed-off-by: Jess Frazelle <github@jessfraz.com>
---------
Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
@ -134,14 +134,27 @@ async function getUser(context: UserContext) {
|
|||||||
token: context.token,
|
token: context.token,
|
||||||
hostname: VITE_KC_API_BASE_URL,
|
hostname: VITE_KC_API_BASE_URL,
|
||||||
}).catch((err) => console.error('error from Tauri getUser', err))
|
}).catch((err) => console.error('error from Tauri getUser', err))
|
||||||
|
const tokenPromise = !isTauri()
|
||||||
|
? fetch(withBaseURL('/user/api-tokens?limit=1'), {
|
||||||
|
method: 'GET',
|
||||||
|
credentials: 'include',
|
||||||
|
headers,
|
||||||
|
})
|
||||||
|
.then(async (res) => {
|
||||||
|
const result: Models['ApiTokenResultsPage_type'] = await res.json()
|
||||||
|
return result.items[0].token
|
||||||
|
})
|
||||||
|
.catch((err) => console.error('error from Browser getUser', err))
|
||||||
|
: context.token
|
||||||
|
|
||||||
const user = await userPromise
|
const user = await userPromise
|
||||||
|
const token = await tokenPromise
|
||||||
|
|
||||||
if ('error_code' in user) throw new Error(user.message)
|
if ('error_code' in user) throw new Error(user.message)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
user,
|
user,
|
||||||
token: context.token,
|
token,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user