@payez/next-mvp 4.1.9 → 4.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +792 -792
- package/dist/api-handlers/auth/refresh.js +38 -15
- package/dist/auth/better-auth.js +4 -3
- package/dist/components/account/MobileNavDrawer.js +18 -18
- package/dist/components/account/UserAvatarMenu.js +1 -1
- package/dist/components/admin/AlertSettingsTab.js +40 -40
- package/dist/components/admin/LoggingSettingsTab.js +28 -28
- package/dist/lib/ensure-fresh-access-token.js +42 -8
- package/dist/lib/idp-fetch.js +25 -9
- package/dist/lib/session-store.d.ts +1 -0
- package/dist/lib/session-store.js +12 -8
- package/dist/lib/token-lifecycle.d.ts +2 -0
- package/dist/lib/token-lifecycle.js +21 -3
- package/dist/pages/login/page.js +28 -28
- package/dist/pages/settings/EnhancedSettingsPage.js +17 -17
- package/package.json +893 -893
- package/scripts/dev-broker.ps1 +35 -35
- package/scripts/dev-local.ps1 +45 -45
- package/src/api/auth-handler.ts +548 -548
- package/src/api-handlers/account/change-password.ts +142 -142
- package/src/api-handlers/account/update-phone.ts +79 -79
- package/src/api-handlers/account/verify-email.ts +125 -125
- package/src/api-handlers/account/verify-sms.ts +125 -125
- package/src/api-handlers/admin/analytics.ts +443 -443
- package/src/api-handlers/admin/audit.ts +223 -223
- package/src/api-handlers/admin/index.ts +63 -63
- package/src/api-handlers/admin/redis-sessions.ts +251 -251
- package/src/api-handlers/admin/sessions.ts +318 -318
- package/src/api-handlers/admin/site-logs.ts +365 -365
- package/src/api-handlers/admin/users.ts +242 -242
- package/src/api-handlers/admin/vibe-data.ts +324 -324
- package/src/api-handlers/auth/refresh.ts +705 -682
- package/src/api-handlers/auth/signout.ts +199 -199
- package/src/api-handlers/auth/status.ts +20 -20
- package/src/api-handlers/auth/update-session.ts +110 -110
- package/src/api-handlers/auth/verify-code.ts +112 -112
- package/src/api-handlers/session/refresh-viability.ts +36 -36
- package/src/api-handlers/test/force-expire.ts +60 -60
- package/src/auth/auth-decision.ts +229 -229
- package/src/auth/better-auth.ts +467 -466
- package/src/auth/route-config.ts +219 -219
- package/src/auth/types/auth-types.ts +555 -555
- package/src/auth/types/index.ts +7 -7
- package/src/auth/utils/idp-client.ts +445 -445
- package/src/auth/utils/index.ts +6 -6
- package/src/auth/utils/token-utils.ts +243 -243
- package/src/client/AuthContext.tsx +143 -143
- package/src/client/fetch-with-auth.ts +47 -47
- package/src/components/SessionSync.tsx +138 -138
- package/src/components/SignalRHealthCheck.tsx +131 -131
- package/src/components/account/MobileNavDrawer.tsx +305 -305
- package/src/components/account/UserAvatarMenu.tsx +266 -266
- package/src/components/account/index.ts +13 -13
- package/src/components/admin/AlertSettingsTab.tsx +728 -728
- package/src/components/admin/AnalyticsTab.tsx +703 -703
- package/src/components/admin/DataBrowserTab.tsx +505 -505
- package/src/components/admin/LoggingSettingsTab.tsx +665 -665
- package/src/components/admin/SessionsTab.tsx +414 -414
- package/src/components/admin/StatsTab.tsx +379 -379
- package/src/components/admin/VibeAdminLayout.tsx +187 -187
- package/src/components/admin/index.ts +59 -59
- package/src/components/auth/FederatedAuthSection.tsx +95 -95
- package/src/components/auth/ModeAwareLoginPage.tsx +135 -135
- package/src/components/auth/ModeAwareSignupPage.tsx +267 -267
- package/src/components/auth/TraditionalAuthSection.tsx +99 -99
- package/src/components/recovery/CompleteStep.tsx +36 -36
- package/src/components/recovery/InitiateRecoveryStep.tsx +68 -68
- package/src/components/recovery/SelectMethodStep.tsx +73 -73
- package/src/components/recovery/SetPasswordStep.tsx +97 -97
- package/src/components/recovery/VerifyCodeStep.tsx +90 -90
- package/src/components/reserved/ReservedRecoveryWarning.tsx +160 -160
- package/src/components/reserved/ReservedStatusBox.tsx +118 -118
- package/src/components/ui/BetaBadge.tsx +58 -58
- package/src/components/ui/Footer.tsx +93 -93
- package/src/config/env.ts +57 -57
- package/src/config/logger.ts +62 -62
- package/src/config/vibe-log-transport.ts +264 -264
- package/src/hooks/useAuth.ts +117 -117
- package/src/hooks/useAuthSettings.ts +97 -97
- package/src/hooks/useAvailableProviders.ts +120 -120
- package/src/hooks/usePasswordValidation.ts +127 -127
- package/src/hooks/usePublicAuthSettings.ts +149 -149
- package/src/hooks/useSessionExpiration.ts +101 -101
- package/src/hooks/useViabilitySession.ts +336 -336
- package/src/index.ts +60 -60
- package/src/lib/api-handler.ts +643 -643
- package/src/lib/app-slug.ts +178 -178
- package/src/lib/ensure-fresh-access-token.ts +369 -335
- package/src/lib/geolocation.ts +265 -265
- package/src/lib/idp-fetch.ts +26 -10
- package/src/lib/jwt-decode.ts +82 -82
- package/src/lib/roles.ts +177 -177
- package/src/lib/session-store.ts +4 -1
- package/src/lib/site-logger.ts +245 -245
- package/src/lib/standardized-client-api.ts +901 -901
- package/src/lib/test-aware-get-token.ts +41 -41
- package/src/lib/token-lifecycle.ts +30 -3
- package/src/lib/user-agent-parser.ts +252 -252
- package/src/logging/api/admin-analytics.ts +51 -51
- package/src/logging/api/audit-log.ts +53 -53
- package/src/logging/components/AdminAnalyticsLayout.tsx +49 -49
- package/src/logging/components/AuditLogViewer.tsx +125 -125
- package/src/logging/components/ErrorMetricsCard.tsx +98 -98
- package/src/logging/components/HealthMetricsCard.tsx +70 -70
- package/src/logging/hooks/useAdminAnalytics.ts +22 -22
- package/src/logging/hooks/useAuditLog.ts +24 -24
- package/src/logging/hooks/useErrorMetrics.ts +40 -40
- package/src/logging/hooks/useHealthMetrics.ts +44 -44
- package/src/logging/index.ts +18 -18
- package/src/logging/types/analytics.ts +81 -81
- package/src/logging/types/audit.ts +31 -31
- package/src/logging/types/index.ts +3 -3
- package/src/middleware/create-middleware.ts +663 -663
- package/src/middleware/rbac-check.ts +279 -279
- package/src/middleware/twofa-presets.ts +224 -224
- package/src/pages/admin-login/page.tsx +221 -221
- package/src/pages/admin-page-permissions/PagePermissionsAdminPage.tsx +527 -527
- package/src/pages/admin-page-permissions/index.ts +7 -7
- package/src/pages/admin-roles/RolesAdminPage.tsx +533 -533
- package/src/pages/admin-roles/modals.tsx +469 -469
- package/src/pages/client-admin/ClientSiteAdminPage.tsx +382 -382
- package/src/pages/client-admin/index.ts +33 -33
- package/src/pages/coming-soon/page.tsx +83 -83
- package/src/pages/login/page.tsx +456 -456
- package/src/pages/profile/EnhancedProfilePage.tsx +485 -485
- package/src/pages/profile/index.ts +9 -9
- package/src/pages/profile/page.tsx +166 -166
- package/src/pages/recovery/page.tsx +234 -234
- package/src/pages/roles/MyRolesPage.tsx +211 -211
- package/src/pages/roles/components.tsx +294 -294
- package/src/pages/roles/index.ts +17 -17
- package/src/pages/security/EnhancedSecurityPage.tsx +565 -565
- package/src/pages/security/index.ts +9 -9
- package/src/pages/security/page.tsx +507 -507
- package/src/pages/settings/EnhancedSettingsPage.tsx +642 -642
- package/src/pages/settings/index.ts +9 -9
- package/src/pages/settings/page.tsx +47 -47
- package/src/pages/showcase/ShowcasePage.tsx +532 -532
- package/src/pages/showcase/index.ts +13 -13
- package/src/pages/test-env/EmergencyLogoutPage.tsx +180 -180
- package/src/pages/test-env/JwtInspectPage.tsx +456 -456
- package/src/pages/test-env/RefreshTokenPage.tsx +157 -157
- package/src/pages/test-env/TestEnvPage.tsx +118 -118
- package/src/pages/test-env/index.ts +25 -25
- package/src/pages/verify-code/page.tsx +652 -652
- package/src/routes/account/update-phone.ts +13 -13
- package/src/routes/auth/logout.ts +108 -108
- package/src/routes/auth/nextauth.ts +45 -45
- package/src/routes/auth/settings.ts +75 -75
- package/src/routes/auth/viability.ts +224 -224
- package/src/server/auth-guard.ts +170 -170
- package/src/server/slim-middleware.ts +117 -117
- package/src/server/with-auth.ts +93 -93
- package/src/stores/authStore.ts +1899 -1899
- package/src/templates/instrumentation.ts +41 -41
- package/src/utils/logout.ts +30 -30
- package/src/vibe/client.ts +590 -590
- package/src/vibe/enterprise-auth.ts +208 -208
- package/src/vibe/errors.ts +185 -185
- package/src/vibe/generic.ts +431 -431
- package/src/vibe/hooks/index.ts +367 -367
- package/src/vibe/index.ts +132 -132
- package/src/vibe/sessions.ts +551 -551
- package/src/vibe/types.ts +577 -577
|
@@ -1,230 +1,230 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Auth Decision Engine - Pure function for middleware auth flow
|
|
3
|
-
*
|
|
4
|
-
* This module provides a deterministic decision tree for authentication middleware.
|
|
5
|
-
* All auth flow logic is centralized here for testability and maintainability.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
// Input types for the decision engine
|
|
9
|
-
export interface AuthContext {
|
|
10
|
-
pathname: string;
|
|
11
|
-
isPublicRoute: boolean;
|
|
12
|
-
isLoginPage: boolean;
|
|
13
|
-
searchParams: URLSearchParams;
|
|
14
|
-
sessionPointer: {
|
|
15
|
-
exists: boolean;
|
|
16
|
-
sessionToken?: string;
|
|
17
|
-
expired?: boolean;
|
|
18
|
-
};
|
|
19
|
-
sessionStatus: {
|
|
20
|
-
exists: boolean | null; // null = check failed/timeout
|
|
21
|
-
forceInvalid: boolean | null; // null = check failed/timeout
|
|
22
|
-
requires2FA: boolean;
|
|
23
|
-
twoFactorComplete: boolean;
|
|
24
|
-
};
|
|
25
|
-
circuitBreakerOpen: boolean;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
// Output types for the decision engine
|
|
29
|
-
export type AuthAction =
|
|
30
|
-
| { type: 'allow' }
|
|
31
|
-
| { type: 'redirect'; location: string; reason: string; clearCookies?: boolean }
|
|
32
|
-
| { type: 'service_error'; reason: string };
|
|
33
|
-
|
|
34
|
-
/**
|
|
35
|
-
* Main decision function - pure, testable, deterministic
|
|
36
|
-
*/
|
|
37
|
-
export function makeAuthDecision(context: AuthContext): AuthAction {
|
|
38
|
-
const {
|
|
39
|
-
pathname,
|
|
40
|
-
isPublicRoute,
|
|
41
|
-
isLoginPage,
|
|
42
|
-
searchParams,
|
|
43
|
-
sessionPointer,
|
|
44
|
-
sessionStatus,
|
|
45
|
-
circuitBreakerOpen
|
|
46
|
-
} = context;
|
|
47
|
-
|
|
48
|
-
// SAFEGUARD: Never use auth pages as callback URLs to prevent redirect loops
|
|
49
|
-
const safeCallbackUrl = pathname.startsWith('/account-auth/') ? '/' : pathname;
|
|
50
|
-
|
|
51
|
-
// Public routes are allowed, but we need to check login page separately
|
|
52
|
-
if (isPublicRoute && !isLoginPage) {
|
|
53
|
-
// For non-login public routes, check if authenticated user needs 2FA
|
|
54
|
-
if (sessionPointer.exists && sessionStatus.exists && sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
55
|
-
// Skip redirect for verify-code page
|
|
56
|
-
if (pathname === '/account-auth/verify-code') {
|
|
57
|
-
return { type: 'allow' };
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
return { type: 'allow' };
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
// Circuit breaker open - redirect to login with service unavailable
|
|
64
|
-
if (circuitBreakerOpen) {
|
|
65
|
-
if (isLoginPage) {
|
|
66
|
-
return { type: 'allow' }; // Let them see login page
|
|
67
|
-
}
|
|
68
|
-
return {
|
|
69
|
-
type: 'redirect',
|
|
70
|
-
location: '/account-auth/login?error=ServiceUnavailable&reason=CircuitBreakerOpen',
|
|
71
|
-
reason: 'CircuitBreakerOpen',
|
|
72
|
-
clearCookies: true
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
// No session pointer (JWT cookie) - need to login
|
|
77
|
-
if (!sessionPointer.exists) {
|
|
78
|
-
if (isLoginPage) {
|
|
79
|
-
return { type: 'allow' };
|
|
80
|
-
}
|
|
81
|
-
// Redirect root to configured URL for unauthenticated users
|
|
82
|
-
if (pathname === '/') {
|
|
83
|
-
const unauthUrl = process.env.UNAUTHENTICATED_REDIRECT_URL || '/account-auth/login';
|
|
84
|
-
return {
|
|
85
|
-
type: 'redirect',
|
|
86
|
-
location: unauthUrl,
|
|
87
|
-
reason: 'unauthenticated_root_redirect'
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
return {
|
|
91
|
-
type: 'redirect',
|
|
92
|
-
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
93
|
-
reason: 'no_session_pointer'
|
|
94
|
-
};
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
// Redis/service errors - can't verify session
|
|
98
|
-
if (sessionStatus.exists === null || sessionStatus.forceInvalid === null) {
|
|
99
|
-
return {
|
|
100
|
-
type: 'service_error',
|
|
101
|
-
reason: 'redis_unavailable'
|
|
102
|
-
};
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
// Session force invalidated - need fresh login
|
|
106
|
-
if (sessionStatus.forceInvalid) {
|
|
107
|
-
if (isLoginPage) {
|
|
108
|
-
return { type: 'allow' };
|
|
109
|
-
}
|
|
110
|
-
return {
|
|
111
|
-
type: 'redirect',
|
|
112
|
-
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&reason=force_invalidated`,
|
|
113
|
-
reason: 'force_invalidated',
|
|
114
|
-
clearCookies: true
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
// Stale session (cookie exists but not in Redis) - need fresh login
|
|
119
|
-
if (!sessionStatus.exists) {
|
|
120
|
-
if (isLoginPage) {
|
|
121
|
-
return { type: 'allow' };
|
|
122
|
-
}
|
|
123
|
-
return {
|
|
124
|
-
type: 'redirect',
|
|
125
|
-
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&reason=stale_session`,
|
|
126
|
-
reason: 'stale_session',
|
|
127
|
-
clearCookies: true
|
|
128
|
-
};
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
// PRIORITIZE 2FA: If session exists and 2FA is required but not complete, handle this before token-expired logic
|
|
132
|
-
if (sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
133
|
-
console.log('[MIDDLEWARE-DECISION] 2FA required but not complete', {
|
|
134
|
-
pathname,
|
|
135
|
-
isLoginPage,
|
|
136
|
-
sessionExists: sessionStatus.exists,
|
|
137
|
-
sessionToken: sessionPointer.sessionToken?.substring(0, 8) + '...'
|
|
138
|
-
});
|
|
139
|
-
|
|
140
|
-
// Already on the 2FA page
|
|
141
|
-
if (pathname === '/account-auth/verify-code') {
|
|
142
|
-
console.log('[MIDDLEWARE-DECISION] Already on verify-code page, allowing');
|
|
143
|
-
return { type: 'allow' };
|
|
144
|
-
}
|
|
145
|
-
// If user is on the login page, send them to verify-code with the original callback
|
|
146
|
-
if (isLoginPage) {
|
|
147
|
-
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
148
|
-
// CRITICAL FIX: Never use auth pages as callback URLs
|
|
149
|
-
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
150
|
-
console.log('[MIDDLEWARE-DECISION] On login page with 2FA incomplete, redirecting to verify-code', {
|
|
151
|
-
originalCallback: callbackUrl,
|
|
152
|
-
safeCallback: safeCallbackUrl,
|
|
153
|
-
originalUrl: pathname
|
|
154
|
-
});
|
|
155
|
-
return {
|
|
156
|
-
type: 'redirect',
|
|
157
|
-
location: `/account-auth/verify-code?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
158
|
-
reason: '2fa_required_login_redirect'
|
|
159
|
-
};
|
|
160
|
-
}
|
|
161
|
-
// For protected routes, allow middleware to proceed (it may refresh tokens); pages will enforce 2FA
|
|
162
|
-
console.log('[MIDDLEWARE-DECISION] Protected route with incomplete 2FA, allowing middleware to handle');
|
|
163
|
-
return { type: 'allow' };
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
// Token expired - redirect to login
|
|
167
|
-
if (sessionPointer.expired) {
|
|
168
|
-
if (isLoginPage) {
|
|
169
|
-
return { type: 'allow' };
|
|
170
|
-
}
|
|
171
|
-
return {
|
|
172
|
-
type: 'redirect',
|
|
173
|
-
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&error=SessionExpired`,
|
|
174
|
-
reason: 'token_expired'
|
|
175
|
-
};
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
// Authenticated root path should land on dashboards
|
|
179
|
-
if (pathname === '/') {
|
|
180
|
-
return {
|
|
181
|
-
type: 'redirect',
|
|
182
|
-
location: '/',
|
|
183
|
-
reason: 'authenticated_root_redirect'
|
|
184
|
-
};
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
// Valid session but 2FA required and not complete - more intelligent handling
|
|
188
|
-
if (sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
189
|
-
if (pathname === '/account-auth/verify-code') {
|
|
190
|
-
return { type: 'allow' }; // Already on 2FA page
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
// For login page, redirect to 2FA with original callback
|
|
194
|
-
if (isLoginPage) {
|
|
195
|
-
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
196
|
-
// CRITICAL FIX: Never use auth pages as callback URLs
|
|
197
|
-
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
198
|
-
return {
|
|
199
|
-
type: 'redirect',
|
|
200
|
-
location: `/account-auth/verify-code?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
201
|
-
reason: '2fa_required'
|
|
202
|
-
};
|
|
203
|
-
}
|
|
204
|
-
|
|
205
|
-
// For protected routes:
|
|
206
|
-
// - If access token is expired and we have a valid refresh token, let middleware handle refresh first
|
|
207
|
-
// - Only redirect to verify-code if access token is still valid or refresh failed
|
|
208
|
-
// - Allow middleware to pass - it will either refresh successfully or handle redirect appropriately
|
|
209
|
-
return { type: 'allow' };
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
// Authenticated user on login page - redirect to dashboard or callback
|
|
213
|
-
if (isLoginPage) {
|
|
214
|
-
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
215
|
-
// CRITICAL FIX: Never redirect back to login page (prevents infinite loop)
|
|
216
|
-
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
217
|
-
console.log('[MIDDLEWARE-DECISION] Authenticated user on login page, redirecting', {
|
|
218
|
-
originalCallback: callbackUrl,
|
|
219
|
-
safeCallback: safeCallbackUrl
|
|
220
|
-
});
|
|
221
|
-
return {
|
|
222
|
-
type: 'redirect',
|
|
223
|
-
location: safeCallbackUrl,
|
|
224
|
-
reason: 'already_authenticated'
|
|
225
|
-
};
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
// All checks passed - allow access
|
|
229
|
-
return { type: 'allow' };
|
|
1
|
+
/**
|
|
2
|
+
* Auth Decision Engine - Pure function for middleware auth flow
|
|
3
|
+
*
|
|
4
|
+
* This module provides a deterministic decision tree for authentication middleware.
|
|
5
|
+
* All auth flow logic is centralized here for testability and maintainability.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
// Input types for the decision engine
|
|
9
|
+
export interface AuthContext {
|
|
10
|
+
pathname: string;
|
|
11
|
+
isPublicRoute: boolean;
|
|
12
|
+
isLoginPage: boolean;
|
|
13
|
+
searchParams: URLSearchParams;
|
|
14
|
+
sessionPointer: {
|
|
15
|
+
exists: boolean;
|
|
16
|
+
sessionToken?: string;
|
|
17
|
+
expired?: boolean;
|
|
18
|
+
};
|
|
19
|
+
sessionStatus: {
|
|
20
|
+
exists: boolean | null; // null = check failed/timeout
|
|
21
|
+
forceInvalid: boolean | null; // null = check failed/timeout
|
|
22
|
+
requires2FA: boolean;
|
|
23
|
+
twoFactorComplete: boolean;
|
|
24
|
+
};
|
|
25
|
+
circuitBreakerOpen: boolean;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
// Output types for the decision engine
|
|
29
|
+
export type AuthAction =
|
|
30
|
+
| { type: 'allow' }
|
|
31
|
+
| { type: 'redirect'; location: string; reason: string; clearCookies?: boolean }
|
|
32
|
+
| { type: 'service_error'; reason: string };
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Main decision function - pure, testable, deterministic
|
|
36
|
+
*/
|
|
37
|
+
export function makeAuthDecision(context: AuthContext): AuthAction {
|
|
38
|
+
const {
|
|
39
|
+
pathname,
|
|
40
|
+
isPublicRoute,
|
|
41
|
+
isLoginPage,
|
|
42
|
+
searchParams,
|
|
43
|
+
sessionPointer,
|
|
44
|
+
sessionStatus,
|
|
45
|
+
circuitBreakerOpen
|
|
46
|
+
} = context;
|
|
47
|
+
|
|
48
|
+
// SAFEGUARD: Never use auth pages as callback URLs to prevent redirect loops
|
|
49
|
+
const safeCallbackUrl = pathname.startsWith('/account-auth/') ? '/' : pathname;
|
|
50
|
+
|
|
51
|
+
// Public routes are allowed, but we need to check login page separately
|
|
52
|
+
if (isPublicRoute && !isLoginPage) {
|
|
53
|
+
// For non-login public routes, check if authenticated user needs 2FA
|
|
54
|
+
if (sessionPointer.exists && sessionStatus.exists && sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
55
|
+
// Skip redirect for verify-code page
|
|
56
|
+
if (pathname === '/account-auth/verify-code') {
|
|
57
|
+
return { type: 'allow' };
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return { type: 'allow' };
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// Circuit breaker open - redirect to login with service unavailable
|
|
64
|
+
if (circuitBreakerOpen) {
|
|
65
|
+
if (isLoginPage) {
|
|
66
|
+
return { type: 'allow' }; // Let them see login page
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
type: 'redirect',
|
|
70
|
+
location: '/account-auth/login?error=ServiceUnavailable&reason=CircuitBreakerOpen',
|
|
71
|
+
reason: 'CircuitBreakerOpen',
|
|
72
|
+
clearCookies: true
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
// No session pointer (JWT cookie) - need to login
|
|
77
|
+
if (!sessionPointer.exists) {
|
|
78
|
+
if (isLoginPage) {
|
|
79
|
+
return { type: 'allow' };
|
|
80
|
+
}
|
|
81
|
+
// Redirect root to configured URL for unauthenticated users
|
|
82
|
+
if (pathname === '/') {
|
|
83
|
+
const unauthUrl = process.env.UNAUTHENTICATED_REDIRECT_URL || '/account-auth/login';
|
|
84
|
+
return {
|
|
85
|
+
type: 'redirect',
|
|
86
|
+
location: unauthUrl,
|
|
87
|
+
reason: 'unauthenticated_root_redirect'
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
type: 'redirect',
|
|
92
|
+
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
93
|
+
reason: 'no_session_pointer'
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
// Redis/service errors - can't verify session
|
|
98
|
+
if (sessionStatus.exists === null || sessionStatus.forceInvalid === null) {
|
|
99
|
+
return {
|
|
100
|
+
type: 'service_error',
|
|
101
|
+
reason: 'redis_unavailable'
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
// Session force invalidated - need fresh login
|
|
106
|
+
if (sessionStatus.forceInvalid) {
|
|
107
|
+
if (isLoginPage) {
|
|
108
|
+
return { type: 'allow' };
|
|
109
|
+
}
|
|
110
|
+
return {
|
|
111
|
+
type: 'redirect',
|
|
112
|
+
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&reason=force_invalidated`,
|
|
113
|
+
reason: 'force_invalidated',
|
|
114
|
+
clearCookies: true
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
// Stale session (cookie exists but not in Redis) - need fresh login
|
|
119
|
+
if (!sessionStatus.exists) {
|
|
120
|
+
if (isLoginPage) {
|
|
121
|
+
return { type: 'allow' };
|
|
122
|
+
}
|
|
123
|
+
return {
|
|
124
|
+
type: 'redirect',
|
|
125
|
+
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&reason=stale_session`,
|
|
126
|
+
reason: 'stale_session',
|
|
127
|
+
clearCookies: true
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
// PRIORITIZE 2FA: If session exists and 2FA is required but not complete, handle this before token-expired logic
|
|
132
|
+
if (sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
133
|
+
console.log('[MIDDLEWARE-DECISION] 2FA required but not complete', {
|
|
134
|
+
pathname,
|
|
135
|
+
isLoginPage,
|
|
136
|
+
sessionExists: sessionStatus.exists,
|
|
137
|
+
sessionToken: sessionPointer.sessionToken?.substring(0, 8) + '...'
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
// Already on the 2FA page
|
|
141
|
+
if (pathname === '/account-auth/verify-code') {
|
|
142
|
+
console.log('[MIDDLEWARE-DECISION] Already on verify-code page, allowing');
|
|
143
|
+
return { type: 'allow' };
|
|
144
|
+
}
|
|
145
|
+
// If user is on the login page, send them to verify-code with the original callback
|
|
146
|
+
if (isLoginPage) {
|
|
147
|
+
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
148
|
+
// CRITICAL FIX: Never use auth pages as callback URLs
|
|
149
|
+
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
150
|
+
console.log('[MIDDLEWARE-DECISION] On login page with 2FA incomplete, redirecting to verify-code', {
|
|
151
|
+
originalCallback: callbackUrl,
|
|
152
|
+
safeCallback: safeCallbackUrl,
|
|
153
|
+
originalUrl: pathname
|
|
154
|
+
});
|
|
155
|
+
return {
|
|
156
|
+
type: 'redirect',
|
|
157
|
+
location: `/account-auth/verify-code?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
158
|
+
reason: '2fa_required_login_redirect'
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
// For protected routes, allow middleware to proceed (it may refresh tokens); pages will enforce 2FA
|
|
162
|
+
console.log('[MIDDLEWARE-DECISION] Protected route with incomplete 2FA, allowing middleware to handle');
|
|
163
|
+
return { type: 'allow' };
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
// Token expired - redirect to login
|
|
167
|
+
if (sessionPointer.expired) {
|
|
168
|
+
if (isLoginPage) {
|
|
169
|
+
return { type: 'allow' };
|
|
170
|
+
}
|
|
171
|
+
return {
|
|
172
|
+
type: 'redirect',
|
|
173
|
+
location: `/account-auth/login?callbackUrl=${encodeURIComponent(safeCallbackUrl)}&error=SessionExpired`,
|
|
174
|
+
reason: 'token_expired'
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
// Authenticated root path should land on dashboards
|
|
179
|
+
if (pathname === '/') {
|
|
180
|
+
return {
|
|
181
|
+
type: 'redirect',
|
|
182
|
+
location: '/',
|
|
183
|
+
reason: 'authenticated_root_redirect'
|
|
184
|
+
};
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
// Valid session but 2FA required and not complete - more intelligent handling
|
|
188
|
+
if (sessionStatus.requires2FA && !sessionStatus.twoFactorComplete) {
|
|
189
|
+
if (pathname === '/account-auth/verify-code') {
|
|
190
|
+
return { type: 'allow' }; // Already on 2FA page
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
// For login page, redirect to 2FA with original callback
|
|
194
|
+
if (isLoginPage) {
|
|
195
|
+
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
196
|
+
// CRITICAL FIX: Never use auth pages as callback URLs
|
|
197
|
+
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
198
|
+
return {
|
|
199
|
+
type: 'redirect',
|
|
200
|
+
location: `/account-auth/verify-code?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`,
|
|
201
|
+
reason: '2fa_required'
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
// For protected routes:
|
|
206
|
+
// - If access token is expired and we have a valid refresh token, let middleware handle refresh first
|
|
207
|
+
// - Only redirect to verify-code if access token is still valid or refresh failed
|
|
208
|
+
// - Allow middleware to pass - it will either refresh successfully or handle redirect appropriately
|
|
209
|
+
return { type: 'allow' };
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
// Authenticated user on login page - redirect to dashboard or callback
|
|
213
|
+
if (isLoginPage) {
|
|
214
|
+
const callbackUrl = searchParams.get('callbackUrl') || '/';
|
|
215
|
+
// CRITICAL FIX: Never redirect back to login page (prevents infinite loop)
|
|
216
|
+
const safeCallbackUrl = callbackUrl.startsWith('/account-auth/') ? '/' : callbackUrl;
|
|
217
|
+
console.log('[MIDDLEWARE-DECISION] Authenticated user on login page, redirecting', {
|
|
218
|
+
originalCallback: callbackUrl,
|
|
219
|
+
safeCallback: safeCallbackUrl
|
|
220
|
+
});
|
|
221
|
+
return {
|
|
222
|
+
type: 'redirect',
|
|
223
|
+
location: safeCallbackUrl,
|
|
224
|
+
reason: 'already_authenticated'
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
// All checks passed - allow access
|
|
229
|
+
return { type: 'allow' };
|
|
230
230
|
}
|