fastify-txstate 3.6.3 → 3.6.4

package/lib/unified-auth.d.ts

@@ -7,6 +7,7 @@ export interface IssuerConfigRaw extends Omit<IssuerConfig, 'validateUrl' | 'log
 export declare function unifiedAuthenticate(req: FastifyRequest, options?: {
     authenticateAll?: boolean;
     exceptRoutes?: Set<string>;
+    optionalRoutes?: Set<string>;
     usingUaCookieRoutes?: boolean;
 }): Promise<FastifyTxStateAuthInfo | undefined>;
 /**

package/lib/unified-auth.js

@@ -145,13 +145,17 @@ async function unifiedAuthenticate(req, options) {
         options.exceptRoutes ??= new Set();
         options.exceptRoutes.add('/.uaService');
         options.exceptRoutes.add('/.uaRedirect');
+        options.optionalRoutes ??= new Set();
+        options.optionalRoutes.add('/.uaLogout');
     }
-    const isAuthenticatedRoute = options?.authenticateAll && (options.exceptRoutes == null || !options.exceptRoutes.has(req.routeOptions.url));
-    if (isAuthenticatedRoute) {
-        if ((0, txstate_utils_1.isBlank)(auth?.username))
-            throw new Error('Request requires authentication.');
+    const isNoAuthenticationRoute = options?.exceptRoutes?.has(req.routeOptions.url);
+    const requiresAuthenticationRoute = options?.authenticateAll &&
+        !options?.exceptRoutes?.has(req.routeOptions.url) &&
+        !options?.optionalRoutes?.has(req.routeOptions.url);
+    if (requiresAuthenticationRoute && (0, txstate_utils_1.isBlank)(auth?.username)) {
+        throw new Error('Request requires authentication.');
     }
-    return auth;
+    return isNoAuthenticationRoute ? undefined : auth;
 }
 /**
  * @deprecated Use unifiedAuthenticateWithOptions with { authenticateAll: true } instead.
@@ -189,7 +193,7 @@ function registerUaCookieRoutes(app) {
             }
         }
     }, async (req, res) => {
-        const redirectUrl = req.auth?.issuerConfig?.logoutUrl
+        const redirectUrl = req.auth?.issuerConfig?.logoutUrl && (0, txstate_utils_1.isNotBlank)(req.auth.token)
             ? `${req.auth.issuerConfig.logoutUrl.toString()}?unifiedJwt=${encodeURIComponent(req.auth.token)}`
             : (process.env.PUBLIC_URL || new URL('..', req.url).toString());
         return res
@@ -231,8 +235,10 @@ function registerUaCookieRoutes(app) {
             }
         }
     }, async (req, res) => {
-        const loginUrl = new URL(process.env.UA_URL + '/login');
-        loginUrl.searchParams.set('clientId', process.env.UA_CLIENTID);
+        const loginUrl = (0, txstate_utils_1.isNotBlank)(process.env.UA_URL)
+            ? new URL(process.env.UA_URL + '/login')
+            : new URL('login', issuerConfig.get('unified-auth')?.url);
+        loginUrl.searchParams.set('clientId', process.env.UA_CLIENTID ?? process.env.JWT_TRUSTED_CLIENTIDS.split(',')[0]);
         const returnUrl = uaServiceUrl ?? new URL('.uaService', req.protocol + '://' + req.hostname).toString();
         loginUrl.searchParams.set('returnUrl', returnUrl);
         if (req.query.requestedUrl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-txstate",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "A small wrapper for fastify providing a set of common conventions & utility functions we use.",
   "exports": {
     ".": {