fix(auth): complete Keycloak logout flow
This commit is contained in:
@@ -7,7 +7,7 @@ import {
|
||||
} from "@refinedev/core";
|
||||
import { RefineKbar, RefineKbarProvider } from "@refinedev/kbar";
|
||||
import { RefineSnackbarProvider } from "@refinedev/mui";
|
||||
import { SessionProvider, signIn, signOut, useSession } from "next-auth/react";
|
||||
import { SessionProvider, signIn, useSession } from "next-auth/react";
|
||||
import { usePathname } from "next/navigation";
|
||||
import React, { useEffect } from "react";
|
||||
|
||||
@@ -150,7 +150,7 @@ const App = (props: React.PropsWithChildren<AppProps>) => {
|
||||
if (data?.user?.id) {
|
||||
sessionStorage.removeItem(`tjwater-login-audit:${data.user.id}`);
|
||||
}
|
||||
signOut({ redirect: true, callbackUrl: "/login" });
|
||||
window.location.assign("/api/auth/keycloak-logout");
|
||||
return { success: true };
|
||||
},
|
||||
onError: async (error) => {
|
||||
|
||||
@@ -94,6 +94,9 @@ const authOptions: NextAuthOptions = {
|
||||
if (account.refresh_token) {
|
||||
token.refreshToken = account.refresh_token;
|
||||
}
|
||||
if (account.id_token) {
|
||||
token.idToken = account.id_token;
|
||||
}
|
||||
if (typeof account.expires_at === "number") {
|
||||
token.accessTokenExpires = account.expires_at * 1000;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
/**
|
||||
* @jest-environment node
|
||||
*/
|
||||
|
||||
import { NextRequest } from "next/server";
|
||||
import { getToken } from "next-auth/jwt";
|
||||
|
||||
import { GET } from "./route";
|
||||
|
||||
jest.mock("next-auth/jwt", () => ({
|
||||
getToken: jest.fn(),
|
||||
}));
|
||||
|
||||
const getTokenMock = getToken as jest.MockedFunction<typeof getToken>;
|
||||
|
||||
describe("GET /api/auth/keycloak-logout", () => {
|
||||
const originalIssuer = process.env.KEYCLOAK_ISSUER;
|
||||
const originalClientId = process.env.KEYCLOAK_CLIENT_ID;
|
||||
const originalNextAuthUrl = process.env.NEXTAUTH_URL;
|
||||
const originalPostLogoutRedirectUri =
|
||||
process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI;
|
||||
|
||||
beforeEach(() => {
|
||||
process.env.KEYCLOAK_ISSUER = "https://keycloak.example.com/realms/tjwater";
|
||||
process.env.KEYCLOAK_CLIENT_ID = "tjwater";
|
||||
process.env.NEXTAUTH_URL = "https://frontend.example.com";
|
||||
delete process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI;
|
||||
getTokenMock.mockReset();
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
process.env.KEYCLOAK_ISSUER = originalIssuer;
|
||||
process.env.KEYCLOAK_CLIENT_ID = originalClientId;
|
||||
process.env.NEXTAUTH_URL = originalNextAuthUrl;
|
||||
if (originalPostLogoutRedirectUri) {
|
||||
process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI = originalPostLogoutRedirectUri;
|
||||
} else {
|
||||
delete process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI;
|
||||
}
|
||||
});
|
||||
|
||||
it("clears the local session and redirects the browser to Keycloak logout", async () => {
|
||||
getTokenMock.mockResolvedValue({
|
||||
idToken: "header.payload.signature",
|
||||
});
|
||||
const request = new NextRequest(
|
||||
"https://frontend.example.com/api/auth/keycloak-logout",
|
||||
{
|
||||
headers: {
|
||||
cookie:
|
||||
"__Secure-next-auth.session-token.0=first; __Secure-next-auth.session-token.1=second",
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
const response = await GET(request);
|
||||
const logoutUrl = new URL(response.headers.get("location") ?? "");
|
||||
|
||||
expect(logoutUrl.origin).toBe("https://keycloak.example.com");
|
||||
expect(logoutUrl.pathname).toBe(
|
||||
"/realms/tjwater/protocol/openid-connect/logout",
|
||||
);
|
||||
expect(logoutUrl.searchParams.get("id_token_hint")).toBe(
|
||||
"header.payload.signature",
|
||||
);
|
||||
expect(logoutUrl.searchParams.get("client_id")).toBe("tjwater");
|
||||
expect(logoutUrl.searchParams.get("post_logout_redirect_uri")).toBeNull();
|
||||
expect(response.cookies.get("__Secure-next-auth.session-token.0")?.value).toBe("");
|
||||
expect(response.cookies.get("__Secure-next-auth.session-token.1")?.value).toBe("");
|
||||
});
|
||||
|
||||
it("uses an explicitly configured post-logout redirect URI", async () => {
|
||||
process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI =
|
||||
"https://frontend.example.com/login";
|
||||
getTokenMock.mockResolvedValue({ idToken: "header.payload.signature" });
|
||||
|
||||
const response = await GET(
|
||||
new NextRequest(
|
||||
"https://frontend.example.com/api/auth/keycloak-logout",
|
||||
),
|
||||
);
|
||||
const logoutUrl = new URL(response.headers.get("location") ?? "");
|
||||
|
||||
expect(logoutUrl.searchParams.get("post_logout_redirect_uri")).toBe(
|
||||
"https://frontend.example.com/login",
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,50 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { getToken } from "next-auth/jwt";
|
||||
|
||||
type KeycloakToken = {
|
||||
idToken?: string;
|
||||
};
|
||||
|
||||
const sessionCookiePrefixes = [
|
||||
"next-auth.session-token",
|
||||
"__Secure-next-auth.session-token",
|
||||
];
|
||||
|
||||
const isSessionCookie = (name: string) =>
|
||||
sessionCookiePrefixes.some((prefix) => name.startsWith(prefix));
|
||||
|
||||
export const GET = async (request: NextRequest) => {
|
||||
const localLoginUrl = new URL(
|
||||
"/login",
|
||||
process.env.NEXTAUTH_URL ?? request.nextUrl.origin,
|
||||
);
|
||||
const issuer = process.env.KEYCLOAK_ISSUER?.replace(/\/$/, "");
|
||||
const clientId = process.env.KEYCLOAK_CLIENT_ID;
|
||||
const postLogoutRedirectUri =
|
||||
process.env.KEYCLOAK_POST_LOGOUT_REDIRECT_URI;
|
||||
const token = (await getToken({
|
||||
req: request,
|
||||
secret: process.env.NEXTAUTH_SECRET,
|
||||
})) as KeycloakToken | null;
|
||||
const logoutUrl = issuer
|
||||
? new URL(`${issuer}/protocol/openid-connect/logout`)
|
||||
: localLoginUrl;
|
||||
|
||||
if (issuer) {
|
||||
if (clientId) logoutUrl.searchParams.set("client_id", clientId);
|
||||
if (token?.idToken) logoutUrl.searchParams.set("id_token_hint", token.idToken);
|
||||
if (postLogoutRedirectUri) {
|
||||
logoutUrl.searchParams.set(
|
||||
"post_logout_redirect_uri",
|
||||
postLogoutRedirectUri,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const response = NextResponse.redirect(logoutUrl);
|
||||
for (const { name } of request.cookies.getAll()) {
|
||||
if (isSessionCookie(name)) response.cookies.delete(name);
|
||||
}
|
||||
|
||||
return response;
|
||||
};
|
||||
Reference in New Issue
Block a user