@sourceregistry/sveltekit-oidc 1.6.11 → 1.6.13

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { error, redirect } from '@sveltejs/kit';
+import { error, redirect, } from '@sveltejs/kit';
 import { randomBytes } from 'node:crypto';
 import { decode, fromWeb, verify } from '@sourceregistry/node-jwt/promises';
 import { createOIDCCookieStore } from './cookies.js';
@@ -413,7 +413,7 @@ export function createOIDC(options) {
         };
         const finalSession = options.transformSession
             ? await options.transformSession(session, {
-                event,
+                event: event,
                 tokenResponse,
                 claims,
                 user,

package/dist/server/types.d.ts

@@ -1,4 +1,4 @@
-import type { Action, Cookies, Handle, RequestEvent, RequestHandler } from '@sveltejs/kit';
+import type { Action, Cookies, Handle, RequestEvent } from '@sveltejs/kit';
 import type { KeyObject } from 'node:crypto';
 export type MaybePromise<T> = Promise<T> | T;
 export type SupportedAlgorithm = 'HS256' | 'HS384' | 'HS512' | 'RS256' | 'RS384' | 'RS512' | 'ES256' | 'ES384' | 'ES512' | 'ES256K' | 'PS256' | 'PS384' | 'PS512' | 'EdDSA';
@@ -171,7 +171,7 @@ export type OIDCOptions<TClaims extends OIDCUserClaims = OIDCUserClaims, TSessio
         claims?: TClaims;
     }) => MaybePromise<TClaims | undefined>;
     transformSession?: (session: OIDCSession<TClaims>, context: {
-        event?: RequestEvent;
+        event?: MinimalRequestEvent;
         tokenResponse?: OIDCTokenResponse;
         claims?: TClaims;
         user?: TClaims;
@@ -217,9 +217,16 @@ export type OIDCStateCookie = {
     returnTo: string;
     createdAt: number;
 };
+export type MinimalRequestEvent = {
+    cookies: Cookies;
+    url: URL;
+    request: Request;
+    locals: App.Locals;
+};
+export type MinimalRequestHandler<T extends MinimalRequestEvent> = (event: T) => MaybePromise<Response>;
 export type OIDCCallbackHandlerOptions<TClaims extends OIDCUserClaims = OIDCUserClaims, TSession extends OIDCSession<TClaims> = OIDCSession<TClaims>> = {
-    onsuccess?: (event: RequestEvent, result: OIDCCallbackResult<TClaims, TSession>) => MaybePromise<Response | void>;
-    onfailure?: (event: RequestEvent, err: unknown) => MaybePromise<Response | void>;
+    onsuccess?: <T extends MinimalRequestEvent = RequestEvent>(event: T, result: OIDCCallbackResult<TClaims, TSession>) => MaybePromise<Response | void>;
+    onfailure?: <T extends MinimalRequestEvent = RequestEvent>(event: T, err: unknown) => MaybePromise<Response | void>;
     redirectTo?: string;
 };
 export type OIDCActionOptions = {
@@ -253,27 +260,27 @@ export type OIDCPersistedSession<TClaims extends OIDCUserClaims = OIDCUserClaims
 export type OIDCInstance<TClaims extends OIDCUserClaims = OIDCUserClaims, TSession extends OIDCSession<TClaims> = OIDCSession<TClaims>> = {
     handle: Handle;
     hook: (event: {
-        cookies: RequestEvent['cookies'];
+        cookies: Cookies;
         locals: App.Locals;
     }) => Promise<{
         oidc: OIDCHandleLocals<TClaims, TSession>;
     }>;
     getMetadata: () => Promise<OIDCDiscoveryDocument>;
     getSession: (event: {
-        cookies: RequestEvent['cookies'];
+        cookies: Cookies;
     }) => Promise<TSession | null>;
     getPublicSession: (event: {
-        cookies: RequestEvent['cookies'];
+        cookies: Cookies;
     }) => Promise<OIDCPublicSession<TClaims> | null>;
     getSessionManagementConfig: () => Promise<OIDCSessionManagementConfig>;
-    login: (event: RequestEvent, loginOptions?: OIDCLoginOptions) => Promise<never>;
-    logout: (event: RequestEvent, logoutOptions?: OIDCLogoutOptions) => Promise<never>;
-    handleCallback: (event: RequestEvent) => Promise<OIDCCallbackResult<TClaims, TSession>>;
-    handleBackChannelLogout: (event: RequestEvent) => Promise<Response>;
-    loginHandler: (defaults?: OIDCLoginOptions) => RequestHandler;
-    callbackHandler: (handlerOptions?: OIDCCallbackHandlerOptions<TClaims, TSession>) => RequestHandler;
-    logoutHandler: (defaults?: OIDCLogoutOptions) => RequestHandler;
-    backChannelLogoutHandler: () => RequestHandler;
+    login: (event: MinimalRequestEvent, loginOptions?: OIDCLoginOptions) => Promise<never>;
+    logout: (event: MinimalRequestEvent, logoutOptions?: OIDCLogoutOptions) => Promise<never>;
+    handleCallback: (event: MinimalRequestEvent) => Promise<OIDCCallbackResult<TClaims, TSession>>;
+    handleBackChannelLogout: (event: MinimalRequestEvent) => Promise<Response>;
+    loginHandler: <T extends MinimalRequestEvent = RequestEvent>(defaults?: OIDCLoginOptions) => MinimalRequestHandler<T>;
+    callbackHandler: <T extends MinimalRequestEvent = RequestEvent>(handlerOptions?: OIDCCallbackHandlerOptions<TClaims, TSession>) => MinimalRequestHandler<T>;
+    logoutHandler: <T extends MinimalRequestEvent = RequestEvent>(defaults?: OIDCLogoutOptions) => MinimalRequestHandler<T>;
+    backChannelLogoutHandler: <T extends MinimalRequestEvent = RequestEvent>() => MinimalRequestHandler<T>;
     createActions: (actionOptions?: OIDCActionOptions) => Readonly<{
         login: Action;
         logout: Action;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourceregistry/sveltekit-oidc",
-  "version": "1.6.11",
+  "version": "1.6.13",
   "description": "OIDC authentication helpers for SvelteKit applications",
   "license": "Apache-2.0",
   "scripts": {