split/ava
1
0
Fork 0
Code Issues 4 Pull requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'main' into node-port

Browse source
This commit is contained in:
May 2024-07-11 05:41:28 -07:00
parent 469b033e2f 8b36151060
commit 2d853b4739
Signed by: split
GPG key ID: C325C61F0BF517C0
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/oidc.ts
View file

@ -97,18 +97,14 @@ export async function getUserInfo(id: string) {
userInfo = userInfoCache.get(tokenInfo.owner) userInfo = userInfoCache.get(tokenInfo.owner)
else { else {
let userInfoRequest = await fetchUserInfo(tokenInfo.token) let userInfoRequest = await fetchUserInfo(tokenInfo.token)
console.log(`userinforequest with ${userInfoRequest.status}`)
if (!userInfoRequest.ok) { if (!userInfoRequest.ok) {
// assume that token has expired. // assume that token has expired.
// try fetching a new one // try fetching a new one
console.log("refresh token", tokenInfo.refreshToken)
if (!tokenInfo.refreshToken) return // no refresh token. back out if (!tokenInfo.refreshToken) return // no refresh token. back out
let token = await getNewToken({ let token = await getNewToken({
grant_type: "refresh_token", grant_type: "refresh_token",
refresh_token: tokenInfo.refreshToken refresh_token: tokenInfo.refreshToken
}) })
console.log("new token", token)
console.log("new reftoken", token?.refresh_token)
if (!token) return // refresh failed. back out if (!token) return // refresh failed. back out
await prisma.token.update({ await prisma.token.update({
where: { id }, where: { id },
@ -125,7 +121,6 @@ export async function getUserInfo(id: string) {
userInfo = await userInfoRequest.json() userInfo = await userInfoRequest.json()
// update user // update user
console.log('aaa')
await prisma.user.upsert({ await prisma.user.upsert({
where: { where: {
userId: userInfo.sub, userId: userInfo.sub,
@ -181,7 +176,6 @@ export async function getRequestUser(request: Request, cookies: Cookies) {
// could cache this, but lazy // could cache this, but lazy
let userInfo = await (await fetchUserInfo(tokens.access_token)).json() as User let userInfo = await (await fetchUserInfo(tokens.access_token)).json() as User
console.log(tokens.refresh_token)
// create a new token // create a new token
let newToken = await prisma.token.create({ let newToken = await prisma.token.create({
data: { data: {