Merge pull request #930 from jboolean/dependabot/npm_and_yarn/backend/types/express-4.17.21

github-actions[bot] · web-flow · commit 18e0408293ca · 2024-08-03T16:11:59.000Z
Bump @types/express from 4.17.14 to 4.17.21 in /backend
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -24,7 +24,7 @@
     "@types/cors": "^2.8.12",
     "@types/eslint": "^8.44.3",
     "@types/eslint-plugin-prettier": "^3.1.0",
-    "@types/express": "^4.17.14",
+    "@types/express": "^4.17.21",
     "@types/geojson": "^7946.0.10",
     "@types/http-errors": "^2.0.1",
     "@types/jsonstream": "^0.8.31",
diff --git a/backend/src/api/AuthenticationController.ts b/backend/src/api/AuthenticationController.ts
@@ -56,12 +56,10 @@ export class AuthenticationController extends Controller {
   ): Promise<LoginResponse> {
     const userId = await getUserFromRequestOrCreateAndSetCookie(req);
     const { requestedEmail, returnToPath, requireVerifiedEmail } = loginRequest;
-    const ipAddress = req.ip;
     const apiBase = `${req.protocol}://${required(req.get('host'), 'host')}`;
     const result = await UserService.processLoginRequest(
       requestedEmail,
       userId,
-      ipAddress,
       apiBase,
       returnToPath,
       requireVerifiedEmail
diff --git a/backend/src/api/auth/userAuthUtils.ts b/backend/src/api/auth/userAuthUtils.ts
@@ -1,5 +1,5 @@
-import * as UserService from '../../business/users/UserService';
 import * as express from 'express';
+import * as UserService from '../../business/users/UserService';
 import { setAuthCookie } from './authCookieUtils';
 
 export const USER_TOKEN_COOKIE = 'user-token';
@@ -25,7 +25,7 @@ export async function getUserFromRequestOrCreateAndSetCookie(
   }
 
   if (!token || !userId) {
-    const userCreationResult = await UserService.createUser(req.ip);
+    const userCreationResult = await UserService.createUser(req.ip as string);
     userId = userCreationResult.userId;
     token = userCreationResult.token;
   }
diff --git a/backend/src/business/users/UserService.ts b/backend/src/business/users/UserService.ts
@@ -150,7 +150,6 @@ async function sendMagicLink(
 export async function processLoginRequest(
   requestedEmail: string,
   authenticatedUserId: number,
-  ipAddress: string,
   apiBase: string,
   returnToPath?: string,
   requireVerifiedEmail = false

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import * as UserService from '../../business/users/UserService';`
`2`	`1`	`import * as express from 'express';`
	`2`	`+import * as UserService from '../../business/users/UserService';`
`3`	`3`	`import { setAuthCookie } from './authCookieUtils';`
`4`	`4`
`5`	`5`	`export const USER_TOKEN_COOKIE = 'user-token';`
`@@ -25,7 +25,7 @@ export async function getUserFromRequestOrCreateAndSetCookie(`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`if (!token \|\| !userId) {`
`28`		`- const userCreationResult = await UserService.createUser(req.ip);`
	`28`	`+ const userCreationResult = await UserService.createUser(req.ip as string);`
`29`	`29`	`userId = userCreationResult.userId;`
`30`	`30`	`token = userCreationResult.token;`
`31`	`31`	`}`