Просмотр исходного кода

Merge pull request #6672 from overleaf/ta-router-apply-signature-fix

Use Correct Router Apply Function Signature

GitOrigin-RevId: 567ff9a4c59834ae200bba860e265abe2e0173e5
Timothée Alby 4 лет назад
Родитель
Сommit
21c92a045d

+ 1 - 1
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(),

+ 3 - 3
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({

+ 1 - 1
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,

+ 1 - 1
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)
 

+ 1 - 1
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(),

+ 1 - 1
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)