cloudflare-next-intl 0.6.7 → 0.6.8

package/dist/src/firebase_auth/middleware/update_session.bench.js

@@ -10,13 +10,14 @@ const baseFa = {
     redirectAuthPath: '/login',
     homePath: '/',
     isAuthPath: (path) => path === '/login',
+    verifyEmailPath: '/verify-email',
 };
 vi.mock('@intl-config', () => ({
     default: { locales: ['en'], defaultLocale: 'en', firebaseAuth: baseFa },
 }));
-function makeJwt(exp) {
+function makeJwt(exp, claims = {}) {
     const header = Buffer.from(JSON.stringify({ alg: 'none' })).toString('base64url');
-    const payload = Buffer.from(JSON.stringify({ exp })).toString('base64url');
+    const payload = Buffer.from(JSON.stringify({ exp, ...claims })).toString('base64url');
     return `${header}.${payload}.sig`;
 }
 describe('updateSession', () => {
@@ -34,4 +35,11 @@ describe('updateSession', () => {
         });
         await updateSession(req, NextResponse.next(), 'en');
     });
+    bench('valid session, unverified email: decodeJwtPayload + verifyEmailPath redirect', async () => {
+        const { default: updateSession } = await import('./update_session');
+        const req = makeTestRequest('https://example.com/en/dashboard', {
+            cookies: { __fa_session__: makeJwt(Date.now() / 1000 + 3600, { email_verified: false }) },
+        });
+        await updateSession(req, NextResponse.next(), 'en');
+    });
 });

package/dist/src/firebase_auth/middleware/update_session.js

@@ -9,16 +9,19 @@ const DEFAULT_REFRESH_MAX_AGE = 60 * 60 * 24 * 365;
 // time can hand a client a token that dies moments after this check, forcing
 // an extra round-trip on the very next request.
 const CLOCK_SKEW_MARGIN_MS = 60 * 1000;
-function isJwtExpired(token) {
+function decodeJwtPayload(token) {
     try {
         const payload = token.split('.')[1];
-        const { exp } = JSON.parse(atob(payload.replace(/[-_]/g, (c) => c === '-' ? '+' : '/')));
-        return !exp || exp * 1000 - CLOCK_SKEW_MARGIN_MS <= Date.now();
+        return JSON.parse(atob(payload.replace(/[-_]/g, (c) => c === '-' ? '+' : '/')));
     }
     catch {
-        return true;
+        return null;
     }
 }
+function isJwtExpired(token) {
+    const decoded = decodeJwtPayload(token);
+    return !decoded?.exp || decoded.exp * 1000 - CLOCK_SKEW_MARGIN_MS <= Date.now();
+}
 // Refreshing an ID token is a real network round-trip to Google on the
 // Edge middleware's critical path, on every request where the session
 // cookie has expired — which, for any session older than the ~1hr ID-token
@@ -170,7 +173,7 @@ export default async function updateSession(request, baseResponse, locale) {
     if (rawPath.startsWith('/_next') || /\.[a-zA-Z0-9]+$/.test(lastSegment)) {
         return baseResponse;
     }
-    const localePrefix = locale === config.locales[0] ? '' : requestPrefix;
+    const localePrefix = locale === config.defaultLocale ? '' : requestPrefix;
     const localeUrl = (target) => new URL(`${localePrefix}${target === '/' ? '' : target}` || '/', request.url);
     const isWhiteListed = fa.whiteListPaths?.includes(path) ?? false;
     if (isWhiteListed)
@@ -210,6 +213,7 @@ export default async function updateSession(request, baseResponse, locale) {
     }
     const hasSession = !!token;
     let response;
+    const isVerifyEmailPage = !!fa.verifyEmailPath && path === fa.verifyEmailPath;
     if (refreshWasTransientFailure) {
         // Couldn't confirm the session either way — pass through without
         // forcing a redirect in either direction. The next request (or the
@@ -223,6 +227,9 @@ export default async function updateSession(request, baseResponse, locale) {
     else if (isAuthPage) {
         response = buildRedirect(baseResponse, localeUrl(fa.homePath));
     }
+    else if (fa.verifyEmailPath && !isVerifyEmailPage && token && decodeJwtPayload(token)?.email_verified === false) {
+        response = buildRedirect(baseResponse, localeUrl(fa.verifyEmailPath));
+    }
     else {
         response = baseResponse;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",