suimeng
/
honojs-middleware
mirror of https://github.com/honojs/middleware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(oidc-auth): Fixed type error (#936)

pull/937/head
Yoshio HANAWA 2025-01-17 19:14:12 +09:00 committed by GitHub
parent 1e0f0a0175
commit be34f6908f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/eighty-trains-peel.md 100644
View File

@ -0,0 +1,5 @@
---
'@hono/oidc-auth': patch
---
Fix type error

12
packages/oidc-auth/src/index.ts
View File

@ -142,14 +142,14 @@ export const getClient = (c: Context): oauth2.Client => {
*/ */
export const getAuth = async (c: Context): Promise<OidcAuth | null> => { export const getAuth = async (c: Context): Promise<OidcAuth | null> => {
const env = getOidcAuthEnv(c) const env = getOidcAuthEnv(c)
let auth: Partial<OidcAuth> | null = c.get('oidcAuth') let auth = c.get('oidcAuth')
if (auth === undefined) { if (auth === undefined) {
const session_jwt = getCookie(c, env.OIDC_COOKIE_NAME) const session_jwt = getCookie(c, env.OIDC_COOKIE_NAME)
if (session_jwt === undefined) { if (session_jwt === undefined) {
return null return null
} }
try { try {
auth = await verify(session_jwt, env.OIDC_AUTH_SECRET) auth = await verify(session_jwt, env.OIDC_AUTH_SECRET) as OidcAuth
} catch (e) { } catch (e) {
deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH }) deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH })
return null return null
@ -178,11 +178,11 @@ export const getAuth = async (c: Context): Promise<OidcAuth | null> => {
deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH }) deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH })
return null return null
} }
auth = await updateAuth(c, auth as OidcAuth, result) auth = await updateAuth(c, auth, result)
} }
c.set('oidcAuth', auth as OidcAuth) c.set('oidcAuth', auth)
} }
return auth as OidcAuth return auth
} }
/** /**
@ -239,7 +239,7 @@ export const revokeSession = async (c: Context): Promise<void> => {
const session_jwt = getCookie(c, env.OIDC_COOKIE_NAME) const session_jwt = getCookie(c, env.OIDC_COOKIE_NAME)
if (session_jwt !== undefined) { if (session_jwt !== undefined) {
deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH }) deleteCookie(c, env.OIDC_COOKIE_NAME, { path: env.OIDC_COOKIE_PATH })
const auth = await verify(session_jwt, env.OIDC_AUTH_SECRET) const auth = await verify(session_jwt, env.OIDC_AUTH_SECRET) as OidcAuth
if (auth.rtk !== undefined && auth.rtk !== '') { if (auth.rtk !== undefined && auth.rtk !== '') {
// revoke refresh token // revoke refresh token
const as = await getAuthorizationServer(c) const as = await getAuthorizationServer(c)