From 21c92a045dd6c6150b1f0dae5434b27dbdb67abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Thu, 10 Feb 2022 10:51:38 +0100
Subject: [PATCH] Merge pull request #6672 from
 overleaf/ta-router-apply-signature-fix

Use Correct Router Apply Function Signature

GitOrigin-RevId: 567ff9a4c59834ae200bba860e265abe2e0173e5
---
 .../app/src/Features/Collaborators/CollaboratorsRouter.js   | 2 +-
 services/web/app/src/Features/Editor/EditorRouter.js        | 6 +++---
 .../app/src/Features/PasswordReset/PasswordResetRouter.js   | 2 +-
 .../web/app/src/Features/StaticPages/StaticPagesRouter.js   | 2 +-
 services/web/app/src/Features/Uploads/UploadsRouter.js      | 2 +-
 services/web/modules/launchpad/app/src/LaunchpadRouter.js   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsRouter.js b/services/web/app/src/Features/Collaborators/CollaboratorsRouter.js
index 5634f79fd9..663f7fe3d9 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsRouter.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsRouter.js
@@ -9,7 +9,7 @@ const AnalyticsRegistrationSourceMiddleware = require('../Analytics/AnalyticsReg
 const { Joi, validate } = require('../../infrastructure/Validation')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter) {
     webRouter.post(
       '/project/:Project_id/leave',
       AuthenticationController.requireLogin(),
diff --git a/services/web/app/src/Features/Editor/EditorRouter.js b/services/web/app/src/Features/Editor/EditorRouter.js
index 35e012e4aa..917edcb81b 100644
--- a/services/web/app/src/Features/Editor/EditorRouter.js
+++ b/services/web/app/src/Features/Editor/EditorRouter.js
@@ -5,7 +5,7 @@ const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
 const { Joi, validate } = require('../../infrastructure/Validation')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter, privateApiRouter) {
     webRouter.post(
       '/project/:Project_id/doc',
       AuthorizationMiddleware.ensureUserCanWriteProjectContent,
@@ -55,7 +55,7 @@ module.exports = {
       AuthorizationMiddleware.ensureUserCanWriteProjectContent,
       EditorHttpController.deleteFolder
     )
-    apiRouter.post(
+    privateApiRouter.post(
       '/project/:Project_id/doc/:entity_id/convert-to-file',
       AuthenticationController.requirePrivateApiAuth(),
       validate({
@@ -69,7 +69,7 @@ module.exports = {
     // Called by the real-time API to load up the current project state.
     // This is a post request because it's more than just a getting of data. We take actions
     // whenever a user joins a project, like updating the deleted status.
-    apiRouter.post(
+    privateApiRouter.post(
       '/project/:Project_id/join',
       AuthenticationController.requirePrivateApiAuth(),
       RateLimiterMiddleware.rateLimit({
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js b/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
index 1fed0c8fe7..22a6dfe503 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
@@ -5,7 +5,7 @@ const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
 const { Joi, validate } = require('../../infrastructure/Validation')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter) {
     const rateLimit = RateLimiterMiddleware.rateLimit({
       endpointName: 'password_reset_rate_limit',
       ipOnly: true,
diff --git a/services/web/app/src/Features/StaticPages/StaticPagesRouter.js b/services/web/app/src/Features/StaticPages/StaticPagesRouter.js
index 72f8fe61f3..4070731968 100644
--- a/services/web/app/src/Features/StaticPages/StaticPagesRouter.js
+++ b/services/web/app/src/Features/StaticPages/StaticPagesRouter.js
@@ -12,7 +12,7 @@ const HomeController = require('./HomeController')
 const UniversityController = require('./UniversityController')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter) {
     webRouter.get('/', HomeController.index)
     webRouter.get('/home', HomeController.home)
 
diff --git a/services/web/app/src/Features/Uploads/UploadsRouter.js b/services/web/app/src/Features/Uploads/UploadsRouter.js
index 575114bba9..5ab3602916 100644
--- a/services/web/app/src/Features/Uploads/UploadsRouter.js
+++ b/services/web/app/src/Features/Uploads/UploadsRouter.js
@@ -5,7 +5,7 @@ const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
 const Settings = require('@overleaf/settings')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter) {
     webRouter.post(
       '/project/new/upload',
       AuthenticationController.requireLogin(),
diff --git a/services/web/modules/launchpad/app/src/LaunchpadRouter.js b/services/web/modules/launchpad/app/src/LaunchpadRouter.js
index 21d8a58b48..6ac3008d4b 100644
--- a/services/web/modules/launchpad/app/src/LaunchpadRouter.js
+++ b/services/web/modules/launchpad/app/src/LaunchpadRouter.js
@@ -15,7 +15,7 @@ const AuthenticationController = require('../../../../app/src/Features/Authentic
 const AuthorizationMiddleware = require('../../../../app/src/Features/Authorization/AuthorizationMiddleware')
 
 module.exports = {
-  apply(webRouter, apiRouter) {
+  apply(webRouter) {
     logger.log({}, 'Init launchpad router')
 
     webRouter.get('/launchpad', LaunchpadController.launchpadPage)