fastify-txstate 3.6.0 → 3.6.2

package/lib/unified-auth.d.ts

@@ -4,7 +4,6 @@ export interface IssuerConfigRaw extends Omit<IssuerConfig, 'validateUrl' | 'log
     validateUrl?: string;
     logoutUrl?: string;
 }
-export declare const uaCookieName: string;
 export declare function unifiedAuthenticate(req: FastifyRequest, options?: {
     authenticateAll?: boolean;
     exceptRoutes?: Set<string>;

package/lib/unified-auth.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uaCookieName = void 0;
 exports.unifiedAuthenticate = unifiedAuthenticate;
 exports.unifiedAuthenticateAll = unifiedAuthenticateAll;
 exports.requireCookieAuth = requireCookieAuth;
@@ -12,7 +11,8 @@ let hasInit = false;
 const issuerKeys = new Map();
 const issuerConfig = new Map();
 const trustedClients = new Set();
-exports.uaCookieName = process.env.UA_COOKIE_NAME ?? (0, crypto_1.randomBytes)(16).toString('hex');
+const uaCookieName = process.env.UA_COOKIE_NAME ?? (0, crypto_1.randomBytes)(16).toString('hex');
+const uaCookieNameRegex = new RegExp(`${uaCookieName}=([^;]+)`);
 const tokenCache = new txstate_utils_1.Cache(async (token, req) => {
     const claims = (0, jose_1.decodeJwt)(token);
     let verifyKey;
@@ -70,9 +70,7 @@ function processIssuerConfig(config) {
     if (config.iss === 'unified-auth') {
         const validateUrl = (0, txstate_utils_1.isNotBlank)(config.validateUrl)
             ? new URL(config.validateUrl, config.url)
-            : (0, txstate_utils_1.isNotBlank)(process.env.UA_URL)
-                ? new URL(process.env.UA_URL + '/validateToken')
-                : new URL('validateToken', config.url);
+            : new URL('validateToken', config.url);
         const logoutUrl = (0, txstate_utils_1.isNotBlank)(config.logoutUrl)
             ? new URL(config.logoutUrl, config.url)
             : (0, txstate_utils_1.isNotBlank)(process.env.UA_URL)
@@ -114,7 +112,7 @@ function tokenFromReq(req) {
     const m = req?.headers.authorization?.match(/^bearer (.*)$/i);
     if (m != null)
         return m[1];
-    const m2 = req?.headers.cookie?.match(new RegExp(`${exports.uaCookieName}=([^;]+)`));
+    const m2 = req?.headers.cookie?.match(uaCookieNameRegex);
     if (m2 != null)
         return m2[1];
 }
@@ -184,7 +182,7 @@ function registerUaCookieRoutes(app) {
             headers: {
                 type: 'object',
                 properties: {
-                    cookie: { type: 'string', pattern: `${exports.uaCookieName}=[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+` }
+                    cookie: { type: 'string', pattern: `${uaCookieName}=[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+` }
                 },
                 required: ['cookie']
             }
@@ -194,7 +192,7 @@ function registerUaCookieRoutes(app) {
             ? `${req.auth.issuerConfig.logoutUrl.toString()}?unifiedJwt=${encodeURIComponent(req.auth.token)}`
             : (process.env.PUBLIC_URL || new URL('..', req.url).toString());
         return res
-            .header('Set-Cookie', `${exports.uaCookieName}=; Path=/; Secure; HttpOnly; SameSite=Lax; Expires=Thu, 01 Jan 1970 00:00:00 GMT`)
+            .header('Set-Cookie', `${uaCookieName}=; Path=/; Secure; HttpOnly; SameSite=Lax; Expires=Thu, 01 Jan 1970 00:00:00 GMT`)
             .redirect(redirectUrl);
     });
     app.get('/.uaService', {
@@ -211,7 +209,7 @@ function registerUaCookieRoutes(app) {
         }
     }, async (req, res) => {
         return res
-            .header('Set-Cookie', `${exports.uaCookieName}=${req.query.unifiedJwt}; Path=/; Secure; HttpOnly; SameSite=Lax`)
+            .header('Set-Cookie', `${uaCookieName}=${req.query.unifiedJwt}; Path=/; Secure; HttpOnly; SameSite=Lax`)
             .redirect(req.query.requestedUrl ?? (process.env.PUBLIC_URL || new URL('..', req.url).toString()));
     });
     /**

package/lib-esm/index.js

@@ -8,6 +8,7 @@ export const ValidationError = ftxst.ValidationError
 export const ValidationErrors = ftxst.ValidationErrors
 export const unifiedAuthenticate = ftxst.unifiedAuthenticate
 export const unifiedAuthenticateAll = ftxst.unifiedAuthenticateAll
+export const registerUaCookieRoutes = ftxst.registerUaCookieRoutes
 export const analyticsPlugin = ftxst.analyticsPlugin
 export const AnalyticsClient = ftxst.AnalyticsClient
 export const LoggingAnalyticsClient = ftxst.LoggingAnalyticsClient

package/package.json

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