From e54c69f2161ad15078341419bf16bd6e478ce365 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Sun, 3 Sep 2023 11:24:08 +0200 Subject: [PATCH] fix(nextauth): eslint errors --- src/server/auth.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/server/auth.ts b/src/server/auth.ts index 9c2ce0c..b1d7f7a 100644 --- a/src/server/auth.ts +++ b/src/server/auth.ts @@ -6,9 +6,7 @@ import { type DefaultSession, } from "next-auth"; import KeycloakProvider from "next-auth/providers/keycloak"; -import { type KeycloakProfile } from "next-auth/providers/keycloak"; import { type JWT } from "next-auth/jwt"; -import { type OAuthConfig } from "next-auth/providers"; import { env } from "~/env.mjs"; import { prisma } from "~/server/db"; @@ -66,10 +64,10 @@ export const authOptions: NextAuthOptions = { * * @see https://stackoverflow.com/a/75526977 */ - async jwt({ token, account }) { + jwt({ token, account }) { if (account) { - token.id_token = account.id_token - token.provider = account.provider + token.id_token = account?.id_token + token.provider = account?.provider } return token }, @@ -104,10 +102,9 @@ export const authOptions: NextAuthOptions = { */ async signOut({ token }: { token: JWT }) { if (token.provider === "keycloak") { - const issuerUrl = (authOptions.providers.find(p => p.id === "keycloak") as OAuthConfig).options!.issuer! - const logOutUrl = new URL(`${issuerUrl}/protocol/openid-connect/logout`) - logOutUrl.searchParams.set("id_token_hint", token.id_token!) - await fetch(logOutUrl); + const logOutURL = new URL(`${env.KEYCLOAK_ISSUER}/protocol/openid-connect/logout`) + logOutURL.searchParams.set("id_token_hint", token.id_token ?? '') + await fetch(logOutURL); } }, }