Bladeren bron

Changes to support converted features

GitOrigin-RevId: 5f46cbf77c6f814820231b9cbfab9906dab6270d
Andrew Rumble 2 jaren geleden
bovenliggende
commit
ad9c0446e2
3 gewijzigde bestanden met toevoegingen van 38 en 43 verwijderingen
  1. 2 5
      services/web/app.mjs
  2. 1 1
      services/web/app/src/infrastructure/Server.mjs
  3. 35 37
      services/web/app/src/router.mjs

+ 2 - 5
services/web/app.mjs

@@ -6,13 +6,10 @@ import metrics from '@overleaf/metrics'
 import Settings from '@overleaf/settings'
 import logger from '@overleaf/logger'
 import PlansLocator from './app/src/Features/Subscription/PlansLocator.js'
-import SiteAdminHandler from './app/src/infrastructure/SiteAdminHandler.mjs'
-
+import SiteAdminHandler from './app/src/infrastructure/SiteAdminHandler.js'
 import http from 'node:http'
 import https from 'node:https'
-
-import * as Serializers from './app/src/infrastructure/LoggerSerializers.mjs'
-
+import * as Serializers from './app/src/infrastructure/LoggerSerializers.js'
 import Server from './app/src/infrastructure/Server.mjs'
 import QueueWorkers from './app/src/infrastructure/QueueWorkers.js'
 import mongodb from './app/src/infrastructure/mongodb.js'

+ 1 - 1
services/web/app/src/infrastructure/Server.mjs

@@ -20,7 +20,7 @@ import cookieParser from 'cookie-parser'
 import bearerTokenMiddleware from 'express-bearer-token'
 import passport from 'passport'
 import { Strategy as LocalStrategy } from 'passport-local'
-import ReferalConnect from '../Features/Referal/ReferalConnect.js'
+import ReferalConnect from '../Features/Referal/ReferalConnect.mjs'
 import RedirectManager from './RedirectManager.js'
 import translations from './Translations.js'
 import Views from './Views.js'

+ 35 - 37
services/web/app/src/router.mjs

@@ -2,39 +2,39 @@ import AdminController from './Features/ServerAdmin/AdminController.js'
 import ErrorController from './Features/Errors/ErrorController.js'
 import Features from './infrastructure/Features.js'
 import ProjectController from './Features/Project/ProjectController.js'
-import ProjectApiController from './Features/Project/ProjectApiController.js'
-import ProjectListController from './Features/Project/ProjectListController.js'
-import SpellingController from './Features/Spelling/SpellingController.js'
-import EditorRouter from './Features/Editor/EditorRouter.js'
+import ProjectApiController from './Features/Project/ProjectApiController.mjs'
+import ProjectListController from './Features/Project/ProjectListController.mjs'
+import SpellingController from './Features/Spelling/SpellingController.mjs'
+import EditorRouter from './Features/Editor/EditorRouter.mjs'
 import Settings from '@overleaf/settings'
-import TpdsController from './Features/ThirdPartyDataStore/TpdsController.js'
-import SubscriptionRouter from './Features/Subscription/SubscriptionRouter.js'
-import UploadsRouter from './Features/Uploads/UploadsRouter.js'
+import TpdsController from './Features/ThirdPartyDataStore/TpdsController.mjs'
+import SubscriptionRouter from './Features/Subscription/SubscriptionRouter.mjs'
+import UploadsRouter from './Features/Uploads/UploadsRouter.mjs'
 import metrics from '@overleaf/metrics'
-import ReferalController from './Features/Referal/ReferalController.js'
+import ReferalController from './Features/Referal/ReferalController.mjs'
 import AuthenticationController from './Features/Authentication/AuthenticationController.js'
 import PermissionsController from './Features/Authorization/PermissionsController.js'
 import SessionManager from './Features/Authentication/SessionManager.js'
-import TagsController from './Features/Tags/TagsController.js'
-import NotificationsController from './Features/Notifications/NotificationsController.js'
-import CollaboratorsRouter from './Features/Collaborators/CollaboratorsRouter.js'
+import TagsController from './Features/Tags/TagsController.mjs'
+import NotificationsController from './Features/Notifications/NotificationsController.mjs'
+import CollaboratorsRouter from './Features/Collaborators/CollaboratorsRouter.mjs'
 import UserInfoController from './Features/User/UserInfoController.js'
 import UserController from './Features/User/UserController.js'
 import UserEmailsController from './Features/User/UserEmailsController.js'
-import UserPagesController from './Features/User/UserPagesController.js'
-import TutorialController from './Features/Tutorial/TutorialController.js'
-import DocumentController from './Features/Documents/DocumentController.js'
+import UserPagesController from './Features/User/UserPagesController.mjs'
+import TutorialController from './Features/Tutorial/TutorialController.mjs'
+import DocumentController from './Features/Documents/DocumentController.mjs'
 import CompileManager from './Features/Compile/CompileManager.js'
 import CompileController from './Features/Compile/CompileController.js'
 import ClsiCookieManagerFactory from './Features/Compile/ClsiCookieManager.js'
-import HealthCheckController from './Features/HealthCheck/HealthCheckController.js'
-import ProjectDownloadsController from './Features/Downloads/ProjectDownloadsController.js'
-import FileStoreController from './Features/FileStore/FileStoreController.js'
-import DocumentUpdaterController from './Features/DocumentUpdater/DocumentUpdaterController.js'
+import HealthCheckController from './Features/HealthCheck/HealthCheckController.mjs'
+import ProjectDownloadsController from './Features/Downloads/ProjectDownloadsController.mjs'
+import FileStoreController from './Features/FileStore/FileStoreController.mjs'
+import DocumentUpdaterController from './Features/DocumentUpdater/DocumentUpdaterController.mjs'
 import HistoryController from './Features/History/HistoryController.js'
-import ExportsController from './Features/Exports/ExportsController.js'
-import PasswordResetRouter from './Features/PasswordReset/PasswordResetRouter.js'
-import StaticPagesRouter from './Features/StaticPages/StaticPagesRouter.js'
+import ExportsController from './Features/Exports/ExportsController.mjs'
+import PasswordResetRouter from './Features/PasswordReset/PasswordResetRouter.mjs'
+import StaticPagesRouter from './Features/StaticPages/StaticPagesRouter.mjs'
 import ChatController from './Features/Chat/ChatController.js'
 import Modules from './infrastructure/Modules.js'
 import {
@@ -43,28 +43,24 @@ import {
   overleafLoginRateLimiter,
 } from './infrastructure/RateLimiter.js'
 import RateLimiterMiddleware from './Features/Security/RateLimiterMiddleware.js'
-import InactiveProjectController from './Features/InactiveData/InactiveProjectController.js'
-import ContactRouter from './Features/Contacts/ContactRouter.js'
-import ReferencesController from './Features/References/ReferencesController.js'
+import InactiveProjectController from './Features/InactiveData/InactiveProjectController.mjs'
+import ContactRouter from './Features/Contacts/ContactRouter.mjs'
+import ReferencesController from './Features/References/ReferencesController.mjs'
 import AuthorizationMiddleware from './Features/Authorization/AuthorizationMiddleware.js'
-import BetaProgramController from './Features/BetaProgram/BetaProgramController.js'
-import AnalyticsRouter from './Features/Analytics/AnalyticsRouter.js'
-import MetaController from './Features/Metadata/MetaController.js'
-import TokenAccessController from './Features/TokenAccess/TokenAccessController.js'
-import TokenAccessRouter from './Features/TokenAccess/TokenAccessRouter.js'
-import LinkedFilesRouter from './Features/LinkedFiles/LinkedFilesRouter.js'
+import BetaProgramController from './Features/BetaProgram/BetaProgramController.mjs'
+import AnalyticsRouter from './Features/Analytics/AnalyticsRouter.mjs'
+import MetaController from './Features/Metadata/MetaController.mjs'
+import TokenAccessController from './Features/TokenAccess/TokenAccessController.mjs'
+import TokenAccessRouter from './Features/TokenAccess/TokenAccessRouter.mjs'
+import LinkedFilesRouter from './Features/LinkedFiles/LinkedFilesRouter.mjs'
 import TemplatesRouter from './Features/Templates/TemplatesRouter.js'
-import UserMembershipRouter from './Features/UserMembership/UserMembershipRouter.js'
+import UserMembershipRouter from './Features/UserMembership/UserMembershipRouter.mjs'
 import SystemMessageController from './Features/SystemMessages/SystemMessageController.js'
 import AnalyticsRegistrationSourceMiddleware from './Features/Analytics/AnalyticsRegistrationSourceMiddleware.js'
-import AnalyticsUTMTrackingMiddleware from './Features/Analytics/AnalyticsUTMTrackingMiddleware.js'
+import AnalyticsUTMTrackingMiddleware from './Features/Analytics/AnalyticsUTMTrackingMiddleware.mjs'
 import CaptchaMiddleware from './Features/Captcha/CaptchaMiddleware.js'
 import { Joi, validate } from './infrastructure/Validation.js'
-import {
-  renderUnsupportedBrowserPage,
-  unsupportedBrowserMiddleware,
-} from './infrastructure/UnsupportedBrowserMiddleware.js'
-
+import UnsupportedBrowserMiddleware from './infrastructure/UnsupportedBrowserMiddleware.js'
 import logger from '@overleaf/logger'
 import _ from 'lodash'
 import { plainTextResponse } from './infrastructure/Response.js'
@@ -72,6 +68,8 @@ import PublicAccessLevels from './Features/Authorization/PublicAccessLevels.js'
 const ClsiCookieManager = ClsiCookieManagerFactory(
   Settings.apis.clsi != null ? Settings.apis.clsi.backendGroupName : undefined
 )
+const { renderUnsupportedBrowserPage, unsupportedBrowserMiddleware } =
+  UnsupportedBrowserMiddleware
 
 const rateLimiters = {
   addEmail: new RateLimiter('add-email', {