Release v2.20.2

src/web.js

@@ -24,7 +24,7 @@ const { rbacData } = require('#src/web/lib/auth/index');
 const { createPlayerActionService } = require('#src/web/lib/player-actions');
 const { isClientNameAvailable, withClientNameReservation } = require('#src/data/client-name-check');
 const { createSessionService, getRequestOrigin } = require('#src/web/lib/auth/index');
-const { createBetterAuth, getRoleTwoFactorAuthError } = require('#src/web/lib/auth/better-auth');
+const { createBetterAuth, ensureBetterAuthClientIp, getRoleTwoFactorAuthError } = require('#src/web/lib/auth/better-auth');
 const { fetchAppSettings } = require('#src/data/app-settings');
 const { sendAccountEmail } = require('#src/data/mailer');
 const { recordRequestAuditEvent } = require('#src/data/audit-log');
@@ -121,6 +121,7 @@ async function start() {
   const setAuthMessageCookie = sessionService.setAuthMessageCookie;
   const consumeAuthMessageCookie = sessionService.consumeAuthMessageCookie;
   const loadCurrentUser = async function (pool, req) {
+    ensureBetterAuthClientIp(req);
     const authSession = await betterAuth.api.getSession({ headers: fromNodeHeaders(req.headers) });
     if (!authSession || !authSession.session || !authSession.session.token) return null;
     req.betterAuthSession = authSession;
@@ -138,9 +139,6 @@ async function start() {
       if (currentUser && currentUser.isViewingAs && (authPath.startsWith('/api/auth/two-factor/') || authPath.startsWith('/api/auth/passkey/'))) {
         return res.status(403).json({ message: 'Exit View as before changing authentication settings.' });
       }
-      if (!req.headers['x-forwarded-for'] && req.socket && req.socket.remoteAddress) {
-        req.headers['x-forwarded-for'] = req.socket.remoteAddress;
-      }
       return betterAuthHandler(req, res, next);
     } catch (error) {
       next(error);