ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clenaup cookie bullshit after api-deux pr merged (#2151)

Browse Source 
* clenaup cookie bullshit after api-deux pr merged

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* check empty

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
Jess Frazelle
2024-04-18 17:18:03 -07:00
committed by GitHub
parent f909ea7af5
commit 69d34c5318
3 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/machines/authMachine.ts
View File

@ -4,7 +4,6 @@ import withBaseURL from '../lib/withBaseURL'
import { isTauri } from 'lib/isTauri'
import { invoke } from '@tauri-apps/api/core'
import { VITE_KC_API_BASE_URL } from 'env'
import Cookies from 'js-cookie'
const SKIP_AUTH =
import.meta.env.VITE_KC_SKIP_AUTH === 'true' && import.meta.env.DEV
@ -135,35 +134,18 @@ async function getUser(context: UserContext) {
hostname: VITE_KC_API_BASE_URL,
}).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 token = await tokenPromise
if ('error_code' in user) throw new Error(user.message)
console.log('context.token "', context.token, '"')
console.log('cookie "', getCookie(COOKIE_NAME), '"')
console.log(
'localStorage.getItem(TOKEN_PERSIST_KEY) "',
localStorage?.getItem(TOKEN_PERSIST_KEY),
'"'
)
return {
user,
token,
token:
context.token && context.token !== ''
? context.token
: getCookie(COOKIE_NAME) ||
localStorage?.getItem(TOKEN_PERSIST_KEY) ||
'',
}
}
@ -172,8 +154,6 @@ function getCookie(cname: string): string | null {
return null
}
console.log('cookies', Cookies.get())
let name = cname + '='
let decodedCookie = decodeURIComponent(document.cookie)
let ca = decodedCookie.split(';')