Преглед изворни кода

Merge pull request #4101 from overleaf/ae-settings-module

Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
Jakob Ackermann пре 5 година
родитељ
комит
5e773ce950
100 измењених фајлова са 102 додато и 102 уклоњено
  1. 1 1
      services/web/app.js
  2. 1 1
      services/web/app/src/Features/Analytics/AnalyticsManager.js
  3. 1 1
      services/web/app/src/Features/Analytics/AnalyticsProxy.js
  4. 1 1
      services/web/app/src/Features/Authentication/AuthenticationController.js
  5. 1 1
      services/web/app/src/Features/Authentication/AuthenticationManager.js
  6. 1 1
      services/web/app/src/Features/BetaProgram/BetaProgramController.js
  7. 1 1
      services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
  8. 1 1
      services/web/app/src/Features/Captcha/CaptchaMiddleware.js
  9. 1 1
      services/web/app/src/Features/Chat/ChatApiHandler.js
  10. 1 1
      services/web/app/src/Features/Collaborators/CollaboratorsEmailHandler.js
  11. 1 1
      services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js
  12. 1 1
      services/web/app/src/Features/Compile/ClsiCookieManager.js
  13. 1 1
      services/web/app/src/Features/Compile/ClsiFormatChecker.js
  14. 1 1
      services/web/app/src/Features/Compile/ClsiManager.js
  15. 1 1
      services/web/app/src/Features/Compile/ClsiStateManager.js
  16. 1 1
      services/web/app/src/Features/Compile/CompileController.js
  17. 1 1
      services/web/app/src/Features/Compile/CompileManager.js
  18. 1 1
      services/web/app/src/Features/Contacts/ContactManager.js
  19. 1 1
      services/web/app/src/Features/Contacts/ContactRouter.js
  20. 1 1
      services/web/app/src/Features/Docstore/DocstoreManager.js
  21. 1 1
      services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js
  22. 1 1
      services/web/app/src/Features/Editor/EditorRealTimeController.js
  23. 1 1
      services/web/app/src/Features/Email/EmailBuilder.js
  24. 1 1
      services/web/app/src/Features/Email/EmailHandler.js
  25. 1 1
      services/web/app/src/Features/Email/EmailSender.js
  26. 1 1
      services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js
  27. 1 1
      services/web/app/src/Features/Errors/Errors.js
  28. 1 1
      services/web/app/src/Features/Errors/HttpErrorHandler.js
  29. 2 2
      services/web/app/src/Features/Exports/ExportsHandler.js
  30. 1 1
      services/web/app/src/Features/FileStore/FileStoreHandler.js
  31. 1 1
      services/web/app/src/Features/HealthCheck/HealthCheckController.js
  32. 1 1
      services/web/app/src/Features/Helpers/NewLogsUI.js
  33. 1 1
      services/web/app/src/Features/Helpers/UrlHelper.js
  34. 1 1
      services/web/app/src/Features/History/HistoryController.js
  35. 1 1
      services/web/app/src/Features/History/HistoryManager.js
  36. 1 1
      services/web/app/src/Features/History/RestoreManager.js
  37. 1 1
      services/web/app/src/Features/Institutions/InstitutionsAPI.js
  38. 1 1
      services/web/app/src/Features/Institutions/InstitutionsFeatures.js
  39. 1 1
      services/web/app/src/Features/LinkedFiles/LinkedFilesController.js
  40. 1 1
      services/web/app/src/Features/LinkedFiles/ProjectFileAgent.js
  41. 1 1
      services/web/app/src/Features/LinkedFiles/ProjectOutputFileAgent.js
  42. 1 1
      services/web/app/src/Features/Newsletter/NewsletterManager.js
  43. 1 1
      services/web/app/src/Features/Notifications/NotificationsBuilder.js
  44. 1 1
      services/web/app/src/Features/Notifications/NotificationsHandler.js
  45. 1 1
      services/web/app/src/Features/PasswordReset/PasswordResetHandler.js
  46. 1 1
      services/web/app/src/Features/Project/ProjectController.js
  47. 1 1
      services/web/app/src/Features/Project/ProjectCreationHandler.js
  48. 1 1
      services/web/app/src/Features/Project/ProjectDetailsHandler.js
  49. 1 1
      services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
  50. 1 1
      services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
  51. 1 1
      services/web/app/src/Features/Project/ProjectHelper.js
  52. 1 1
      services/web/app/src/Features/Project/ProjectHistoryHandler.js
  53. 1 1
      services/web/app/src/Features/Project/ProjectOptionsHandler.js
  54. 1 1
      services/web/app/src/Features/Referal/ReferalFeatures.js
  55. 1 1
      services/web/app/src/Features/References/ReferencesController.js
  56. 1 1
      services/web/app/src/Features/References/ReferencesHandler.js
  57. 1 1
      services/web/app/src/Features/Security/RateLimiterMiddleware.js
  58. 1 1
      services/web/app/src/Features/ServerAdmin/AdminController.js
  59. 1 1
      services/web/app/src/Features/Spelling/SpellingController.js
  60. 1 1
      services/web/app/src/Features/Spelling/SpellingHandler.js
  61. 1 1
      services/web/app/src/Features/SplitTests/SplitTestHandler.js
  62. 2 2
      services/web/app/src/Features/StaticPages/UniversityController.js
  63. 1 1
      services/web/app/src/Features/Subscription/FeaturesUpdater.js
  64. 1 1
      services/web/app/src/Features/Subscription/GroupPlansData.js
  65. 1 1
      services/web/app/src/Features/Subscription/LimitationsManager.js
  66. 1 1
      services/web/app/src/Features/Subscription/PlansLocator.js
  67. 1 1
      services/web/app/src/Features/Subscription/RecurlyClient.js
  68. 1 1
      services/web/app/src/Features/Subscription/RecurlyWrapper.js
  69. 1 1
      services/web/app/src/Features/Subscription/SubscriptionController.js
  70. 1 1
      services/web/app/src/Features/Subscription/SubscriptionFormatters.js
  71. 1 1
      services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
  72. 1 1
      services/web/app/src/Features/Subscription/SubscriptionRouter.js
  73. 1 1
      services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
  74. 1 1
      services/web/app/src/Features/Subscription/TeamInvitesController.js
  75. 1 1
      services/web/app/src/Features/Subscription/TeamInvitesHandler.js
  76. 1 1
      services/web/app/src/Features/Subscription/V1SubscriptionManager.js
  77. 1 1
      services/web/app/src/Features/SystemMessages/SystemMessageController.js
  78. 1 1
      services/web/app/src/Features/Templates/TemplatesManager.js
  79. 1 1
      services/web/app/src/Features/Templates/TemplatesMiddleware.js
  80. 1 1
      services/web/app/src/Features/ThirdPartyDataStore/TpdsQueueManager.js
  81. 1 1
      services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js
  82. 1 1
      services/web/app/src/Features/TokenAccess/TokenAccessController.js
  83. 1 1
      services/web/app/src/Features/TokenAccess/TokenAccessHandler.js
  84. 1 1
      services/web/app/src/Features/Uploads/ArchiveManager.js
  85. 1 1
      services/web/app/src/Features/Uploads/FileTypeManager.js
  86. 1 1
      services/web/app/src/Features/Uploads/ProjectUploadController.js
  87. 1 1
      services/web/app/src/Features/Uploads/UploadsRouter.js
  88. 1 1
      services/web/app/src/Features/User/ThirdPartyIdentityManager.js
  89. 1 1
      services/web/app/src/Features/User/UserEmailsConfirmationHandler.js
  90. 1 1
      services/web/app/src/Features/User/UserGetter.js
  91. 1 1
      services/web/app/src/Features/User/UserPagesController.js
  92. 1 1
      services/web/app/src/Features/User/UserRegistrationHandler.js
  93. 1 1
      services/web/app/src/Features/User/UserSessionsManager.js
  94. 1 1
      services/web/app/src/Features/V1/V1Api.js
  95. 1 1
      services/web/app/src/Features/V1/V1Handler.js
  96. 1 1
      services/web/app/src/infrastructure/ExpressLocals.js
  97. 1 1
      services/web/app/src/infrastructure/Features.js
  98. 1 1
      services/web/app/src/infrastructure/FileWriter.js
  99. 1 1
      services/web/app/src/infrastructure/GeoIpLookup.js
  100. 1 1
      services/web/app/src/infrastructure/JsonWebToken.js

+ 1 - 1
services/web/app.js

@@ -11,7 +11,7 @@
  */
  */
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
 metrics.initialize(process.env.METRICS_APP_NAME || 'web')
 metrics.initialize(process.env.METRICS_APP_NAME || 'web')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const PlansLocator = require('./app/src/Features/Subscription/PlansLocator')
 const PlansLocator = require('./app/src/Features/Subscription/PlansLocator')
 logger.initialize(process.env.METRICS_APP_NAME || 'web')
 logger.initialize(process.env.METRICS_APP_NAME || 'web')

+ 1 - 1
services/web/app/src/Features/Analytics/AnalyticsManager.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const Metrics = require('../../infrastructure/Metrics')
 const Metrics = require('../../infrastructure/Metrics')
 const Queues = require('../../infrastructure/Queues')
 const Queues = require('../../infrastructure/Queues')
 
 

+ 1 - 1
services/web/app/src/Features/Analytics/AnalyticsProxy.js

@@ -1,4 +1,4 @@
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const httpProxy = require('express-http-proxy')
 const httpProxy = require('express-http-proxy')
 const URL = require('url')
 const URL = require('url')

+ 1 - 1
services/web/app/src/Features/Authentication/AuthenticationController.js

@@ -5,7 +5,7 @@ const UserUpdater = require('../User/UserUpdater')
 const Metrics = require('@overleaf/metrics')
 const Metrics = require('@overleaf/metrics')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const querystring = require('querystring')
 const querystring = require('querystring')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const basicAuth = require('basic-auth-connect')
 const basicAuth = require('basic-auth-connect')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const UserHandler = require('../User/UserHandler')
 const UserHandler = require('../User/UserHandler')

+ 1 - 1
services/web/app/src/Features/Authentication/AuthenticationManager.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const { User } = require('../../models/User')
 const { User } = require('../../models/User')
 const { db, ObjectId } = require('../../infrastructure/mongodb')
 const { db, ObjectId } = require('../../infrastructure/mongodb')
 const bcrypt = require('bcrypt')
 const bcrypt = require('bcrypt')

+ 1 - 1
services/web/app/src/Features/BetaProgram/BetaProgramController.js

@@ -1,7 +1,7 @@
 const BetaProgramHandler = require('./BetaProgramHandler')
 const BetaProgramHandler = require('./BetaProgramHandler')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 
 

+ 1 - 1
services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js

@@ -1,6 +1,6 @@
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const url = require('url')
 const url = require('url')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const V1Api = require('../V1/V1Api')
 const sanitizeHtml = require('sanitize-html')
 const sanitizeHtml = require('sanitize-html')

+ 1 - 1
services/web/app/src/Features/Captcha/CaptchaMiddleware.js

@@ -13,7 +13,7 @@
 let CaptchaMiddleware
 let CaptchaMiddleware
 const request = require('request')
 const request = require('request')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = CaptchaMiddleware = {
 module.exports = CaptchaMiddleware = {
   validateCaptcha(action) {
   validateCaptcha(action) {

+ 1 - 1
services/web/app/src/Features/Chat/ChatApiHandler.js

@@ -14,7 +14,7 @@
 let ChatApiHandler
 let ChatApiHandler
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 module.exports = ChatApiHandler = {
 module.exports = ChatApiHandler = {
   _apiRequest(opts, callback) {
   _apiRequest(opts, callback) {

+ 1 - 1
services/web/app/src/Features/Collaborators/CollaboratorsEmailHandler.js

@@ -13,7 +13,7 @@
 let CollaboratorsEmailHandler
 let CollaboratorsEmailHandler
 const { Project } = require('../../models/Project')
 const { Project } = require('../../models/Project')
 const EmailHandler = require('../Email/EmailHandler')
 const EmailHandler = require('../Email/EmailHandler')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = CollaboratorsEmailHandler = {
 module.exports = CollaboratorsEmailHandler = {
   _buildInviteUrl(project, invite) {
   _buildInviteUrl(project, invite) {

+ 1 - 1
services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js

@@ -20,7 +20,7 @@ const UserGetter = require('../User/UserGetter')
 const CollaboratorsGetter = require('./CollaboratorsGetter')
 const CollaboratorsGetter = require('./CollaboratorsGetter')
 const CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
 const CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')

+ 1 - 1
services/web/app/src/Features/Compile/ClsiCookieManager.js

@@ -13,7 +13,7 @@
  */
  */
 let rclient_secondary
 let rclient_secondary
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const request = require('request').defaults({ timeout: 30 * 1000 })
 const request = require('request').defaults({ timeout: 30 * 1000 })
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('clsi_cookie')
 const rclient = RedisWrapper.client('clsi_cookie')

+ 1 - 1
services/web/app/src/Features/Compile/ClsiFormatChecker.js

@@ -12,7 +12,7 @@
 let ClsiFormatChecker
 let ClsiFormatChecker
 const _ = require('lodash')
 const _ = require('lodash')
 const async = require('async')
 const async = require('async')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 module.exports = ClsiFormatChecker = {
 module.exports = ClsiFormatChecker = {
   checkRecoursesForProblems(resources, callback) {
   checkRecoursesForProblems(resources, callback) {

+ 1 - 1
services/web/app/src/Features/Compile/ClsiManager.js

@@ -1,5 +1,5 @@
 const async = require('async')
 const async = require('async')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const request = require('request')
 const request = require('request')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')

+ 1 - 1
services/web/app/src/Features/Compile/ClsiStateManager.js

@@ -14,7 +14,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 let ClsiStateManager
 let ClsiStateManager
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')

+ 1 - 1
services/web/app/src/Features/Compile/CompileController.js

@@ -22,7 +22,7 @@ const ClsiManager = require('./ClsiManager')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const request = require('request')
 const request = require('request')
 const sanitize = require('sanitizer')
 const sanitize = require('sanitizer')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const RateLimiter = require('../../infrastructure/RateLimiter')
 const RateLimiter = require('../../infrastructure/RateLimiter')

+ 1 - 1
services/web/app/src/Features/Compile/CompileManager.js

@@ -14,7 +14,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 let CompileManager
 let CompileManager
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('clsi_recently_compiled')
 const rclient = RedisWrapper.client('clsi_recently_compiled')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectGetter = require('../Project/ProjectGetter')

+ 1 - 1
services/web/app/src/Features/Contacts/ContactManager.js

@@ -15,7 +15,7 @@
 let ContactManager
 let ContactManager
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 module.exports = ContactManager = {
 module.exports = ContactManager = {
   getContactIds(user_id, options, callback) {
   getContactIds(user_id, options, callback) {

+ 1 - 1
services/web/app/src/Features/Contacts/ContactRouter.js

@@ -1,6 +1,6 @@
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const ContactController = require('./ContactController')
 const ContactController = require('./ContactController')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 function contactsAuthenticationMiddleware() {
 function contactsAuthenticationMiddleware() {
   if (!Settings.allowAnonymousReadAndWriteSharing) {
   if (!Settings.allowAnonymousReadAndWriteSharing) {

+ 1 - 1
services/web/app/src/Features/Docstore/DocstoreManager.js

@@ -15,7 +15,7 @@
 const request = require('request').defaults({ jar: false })
 const request = require('request').defaults({ jar: false })
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 
 

+ 1 - 1
services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js

@@ -1,6 +1,6 @@
 const request = require('request').defaults({ timeout: 30 * 100 })
 const request = require('request').defaults({ timeout: 30 * 100 })
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const _ = require('underscore')
 const _ = require('underscore')
 const async = require('async')
 const async = require('async')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')

+ 1 - 1
services/web/app/src/Features/Editor/EditorRealTimeController.js

@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 let EditorRealTimeController
 let EditorRealTimeController
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const Metrics = require('@overleaf/metrics')
 const Metrics = require('@overleaf/metrics')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('pubsub')
 const rclient = RedisWrapper.client('pubsub')

+ 1 - 1
services/web/app/src/Features/Email/EmailBuilder.js

@@ -1,5 +1,5 @@
 const _ = require('underscore')
 const _ = require('underscore')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const moment = require('moment')
 const moment = require('moment')
 const EmailMessageHelper = require('./EmailMessageHelper')
 const EmailMessageHelper = require('./EmailMessageHelper')
 const StringHelper = require('../Helpers/StringHelper')
 const StringHelper = require('../Helpers/StringHelper')

+ 1 - 1
services/web/app/src/Features/Email/EmailHandler.js

@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
 const { callbackify } = require('util')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const EmailBuilder = require('./EmailBuilder')
 const EmailBuilder = require('./EmailBuilder')
 const EmailSender = require('./EmailSender')
 const EmailSender = require('./EmailSender')
 
 

+ 1 - 1
services/web/app/src/Features/Email/EmailSender.js

@@ -1,7 +1,7 @@
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const nodemailer = require('nodemailer')
 const nodemailer = require('nodemailer')
 const sesTransport = require('nodemailer-ses-transport')
 const sesTransport = require('nodemailer-ses-transport')
 const mandrillTransport = require('nodemailer-mandrill-transport')
 const mandrillTransport = require('nodemailer-mandrill-transport')

+ 1 - 1
services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js

@@ -1,5 +1,5 @@
 const _ = require('underscore')
 const _ = require('underscore')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 module.exports = _.template(`\
 module.exports = _.template(`\
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

+ 1 - 1
services/web/app/src/Features/Errors/Errors.js

@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 // Error class for legacy errors so they inherit OError while staying
 // Error class for legacy errors so they inherit OError while staying
 // backward-compatible (can be instantiated with string as argument instead
 // backward-compatible (can be instantiated with string as argument instead

+ 1 - 1
services/web/app/src/Features/Errors/HttpErrorHandler.js

@@ -1,5 +1,5 @@
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 function renderJSONError(res, message, info = {}) {
 function renderJSONError(res, message, info = {}) {
   if (info.message) {
   if (info.message) {

+ 2 - 2
services/web/app/src/Features/Exports/ExportsHandler.js

@@ -21,11 +21,11 @@ const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-let settings = require('settings-sharelatex')
+let settings = require('@overleaf/settings')
 const async = require('async')
 const async = require('async')
 let request = require('request')
 let request = require('request')
 request = request.defaults()
 request = request.defaults()
-settings = require('settings-sharelatex')
+settings = require('@overleaf/settings')
 
 
 module.exports = ExportsHandler = self = {
 module.exports = ExportsHandler = self = {
   exportProject(export_params, callback) {
   exportProject(export_params, callback) {

+ 1 - 1
services/web/app/src/Features/FileStore/FileStoreHandler.js

@@ -2,7 +2,7 @@ const _ = require('underscore')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const fs = require('fs')
 const fs = require('fs')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Async = require('async')
 const Async = require('async')
 const FileHashManager = require('./FileHashManager')
 const FileHashManager = require('./FileHashManager')
 const { File } = require('../../models/File')
 const { File } = require('../../models/File')

+ 1 - 1
services/web/app/src/Features/HealthCheck/HealthCheckController.js

@@ -1,6 +1,6 @@
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('health_check')
 const rclient = RedisWrapper.client('health_check')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const {
 const {

+ 1 - 1
services/web/app/src/Features/Helpers/NewLogsUI.js

@@ -1,5 +1,5 @@
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 const EXISTING_UI = { newLogsUI: false, subvariant: null }
 const EXISTING_UI = { newLogsUI: false, subvariant: null }
 const NEW_UI_WITH_POPUP = {
 const NEW_UI_WITH_POPUP = {

+ 1 - 1
services/web/app/src/Features/Helpers/UrlHelper.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const { URL } = require('url')
 const { URL } = require('url')
 
 
 function getSafeRedirectPath(value) {
 function getSafeRedirectPath(value) {

+ 1 - 1
services/web/app/src/Features/History/HistoryController.js

@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const async = require('async')
 const async = require('async')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')

+ 1 - 1
services/web/app/src/Features/History/HistoryManager.js

@@ -1,6 +1,6 @@
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 const request = require('request-promise-native')
 const request = require('request-promise-native')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 
 

+ 1 - 1
services/web/app/src/Features/History/RestoreManager.js

@@ -13,7 +13,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 let RestoreManager
 let RestoreManager
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const Path = require('path')
 const Path = require('path')
 const FileWriter = require('../../infrastructure/FileWriter')
 const FileWriter = require('../../infrastructure/FileWriter')
 const FileSystemImportManager = require('../Uploads/FileSystemImportManager')
 const FileSystemImportManager = require('../Uploads/FileSystemImportManager')

+ 1 - 1
services/web/app/src/Features/Institutions/InstitutionsAPI.js

@@ -1,7 +1,7 @@
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const request = require('request')
 const request = require('request')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')

+ 1 - 1
services/web/app/src/Features/Institutions/InstitutionsFeatures.js

@@ -1,7 +1,7 @@
 let InstitutionsFeatures
 let InstitutionsFeatures
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const PlansLocator = require('../Subscription/PlansLocator')
 const PlansLocator = require('../Subscription/PlansLocator')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = InstitutionsFeatures = {
 module.exports = InstitutionsFeatures = {
   getInstitutionsFeatures(userId, callback) {
   getInstitutionsFeatures(userId, callback) {

+ 1 - 1
services/web/app/src/Features/LinkedFiles/LinkedFilesController.js

@@ -16,7 +16,7 @@ let LinkedFilesController
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const EditorController = require('../Editor/EditorController')
 const EditorController = require('../Editor/EditorController')
 const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectLocator = require('../Project/ProjectLocator')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const _ = require('underscore')
 const LinkedFilesHandler = require('./LinkedFilesHandler')
 const LinkedFilesHandler = require('./LinkedFilesHandler')

+ 1 - 1
services/web/app/src/Features/LinkedFiles/ProjectFileAgent.js

@@ -20,7 +20,7 @@ const DocstoreManager = require('../Docstore/DocstoreManager')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const FileStoreHandler = require('../FileStore/FileStoreHandler')
 const FileStoreHandler = require('../FileStore/FileStoreHandler')
 const _ = require('underscore')
 const _ = require('underscore')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const LinkedFilesHandler = require('./LinkedFilesHandler')
 const LinkedFilesHandler = require('./LinkedFilesHandler')
 const {
 const {
   BadDataError,
   BadDataError,

+ 1 - 1
services/web/app/src/Features/LinkedFiles/ProjectOutputFileAgent.js

@@ -15,7 +15,7 @@
 let ProjectOutputFileAgent
 let ProjectOutputFileAgent
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectGetter = require('../Project/ProjectGetter')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const CompileManager = require('../Compile/CompileManager')
 const CompileManager = require('../Compile/CompileManager')
 const ClsiManager = require('../Compile/ClsiManager')
 const ClsiManager = require('../Compile/ClsiManager')
 const ProjectFileAgent = require('./ProjectFileAgent')
 const ProjectFileAgent = require('./ProjectFileAgent')

+ 1 - 1
services/web/app/src/Features/Newsletter/NewsletterManager.js

@@ -1,6 +1,6 @@
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const Mailchimp = require('mailchimp-api-v3')
 const Mailchimp = require('mailchimp-api-v3')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')

+ 1 - 1
services/web/app/src/Features/Notifications/NotificationsBuilder.js

@@ -1,7 +1,7 @@
 const NotificationsHandler = require('./NotificationsHandler')
 const NotificationsHandler = require('./NotificationsHandler')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 function dropboxDuplicateProjectNames(userId) {
 function dropboxDuplicateProjectNames(userId) {
   return {
   return {

+ 1 - 1
services/web/app/src/Features/Notifications/NotificationsHandler.js

@@ -1,4 +1,4 @@
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const request = require('request')
 const request = require('request')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const _ = require('lodash')
 const _ = require('lodash')

+ 1 - 1
services/web/app/src/Features/PasswordReset/PasswordResetHandler.js

@@ -1,4 +1,4 @@
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const UserAuditLogHandler = require('../User/UserAuditLogHandler')
 const UserAuditLogHandler = require('../User/UserAuditLogHandler')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')

+ 1 - 1
services/web/app/src/Features/Project/ProjectController.js

@@ -17,7 +17,7 @@ const TagsHandler = require('../Tags/TagsHandler')
 const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
 const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
 const NotificationsHandler = require('../Notifications/NotificationsHandler')
 const NotificationsHandler = require('../Notifications/NotificationsHandler')
 const LimitationsManager = require('../Subscription/LimitationsManager')
 const LimitationsManager = require('../Subscription/LimitationsManager')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const InactiveProjectManager = require('../InactiveData/InactiveProjectManager')
 const InactiveProjectManager = require('../InactiveData/InactiveProjectManager')
 const ProjectUpdateHandler = require('./ProjectUpdateHandler')
 const ProjectUpdateHandler = require('./ProjectUpdateHandler')

+ 1 - 1
services/web/app/src/Features/Project/ProjectCreationHandler.js

@@ -1,7 +1,7 @@
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
 const { Project } = require('../../models/Project')
 const { Project } = require('../../models/Project')
 const { Folder } = require('../../models/Folder')
 const { Folder } = require('../../models/Folder')

+ 1 - 1
services/web/app/src/Features/Project/ProjectDetailsHandler.js

@@ -8,7 +8,7 @@ const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const TokenGenerator = require('../TokenGenerator/TokenGenerator')
 const TokenGenerator = require('../TokenGenerator/TokenGenerator')
 const ProjectHelper = require('./ProjectHelper')
 const ProjectHelper = require('./ProjectHelper')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 
 
 const MAX_PROJECT_NAME_LENGTH = 150
 const MAX_PROJECT_NAME_LENGTH = 150

+ 1 - 1
services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js

@@ -4,7 +4,7 @@ const _ = require('underscore')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const path = require('path')
 const path = require('path')
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const CooldownManager = require('../Cooldown/CooldownManager')
 const CooldownManager = require('../Cooldown/CooldownManager')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')

+ 1 - 1
services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const async = require('async')
 const async = require('async')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const Path = require('path')
 const Path = require('path')
 const fs = require('fs')
 const fs = require('fs')
 const { Doc } = require('../../models/Doc')
 const { Doc } = require('../../models/Doc')

+ 1 - 1
services/web/app/src/Features/Project/ProjectHelper.js

@@ -1,7 +1,7 @@
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
 const _ = require('lodash')
 const _ = require('lodash')
 const { promisify } = require('util')
 const { promisify } = require('util')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 const ENGINE_TO_COMPILER_MAP = {
 const ENGINE_TO_COMPILER_MAP = {
   latex_dvipdf: 'latex',
   latex_dvipdf: 'latex',

+ 1 - 1
services/web/app/src/Features/Project/ProjectHistoryHandler.js

@@ -16,7 +16,7 @@
 const { Project } = require('../../models/Project')
 const { Project } = require('../../models/Project')
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const HistoryManager = require('../History/HistoryManager')
 const HistoryManager = require('../History/HistoryManager')
 const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')
 const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')

+ 1 - 1
services/web/app/src/Features/Project/ProjectOptionsHandler.js

@@ -1,5 +1,5 @@
 const { Project } = require('../../models/Project')
 const { Project } = require('../../models/Project')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 
 
 const safeCompilers = ['xelatex', 'pdflatex', 'latex', 'lualatex']
 const safeCompilers = ['xelatex', 'pdflatex', 'latex', 'lualatex']

+ 1 - 1
services/web/app/src/Features/Referal/ReferalFeatures.js

@@ -1,6 +1,6 @@
 const _ = require('underscore')
 const _ = require('underscore')
 const { User } = require('../../models/User')
 const { User } = require('../../models/User')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 let ReferalFeatures
 let ReferalFeatures
 
 

+ 1 - 1
services/web/app/src/Features/References/ReferencesController.js

@@ -13,7 +13,7 @@
 let ReferencesController
 let ReferencesController
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const ReferencesHandler = require('./ReferencesHandler')
 const ReferencesHandler = require('./ReferencesHandler')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 
 
 module.exports = ReferencesController = {
 module.exports = ReferencesController = {

+ 1 - 1
services/web/app/src/Features/References/ReferencesHandler.js

@@ -16,7 +16,7 @@ let ReferencesHandler
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Features = require('../../infrastructure/Features')
 const Features = require('../../infrastructure/Features')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')

+ 1 - 1
services/web/app/src/Features/Security/RateLimiterMiddleware.js

@@ -2,7 +2,7 @@ const RateLimiter = require('../../infrastructure/RateLimiter')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const LoginRateLimiter = require('./LoginRateLimiter')
 const LoginRateLimiter = require('./LoginRateLimiter')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 /*
 /*
   Do not allow more than opts.maxRequests from a single client in
   Do not allow more than opts.maxRequests from a single client in

+ 1 - 1
services/web/app/src/Features/ServerAdmin/AdminController.js

@@ -19,7 +19,7 @@ const metrics = require('@overleaf/metrics')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const _ = require('underscore')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
 const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')

+ 1 - 1
services/web/app/src/Features/Spelling/SpellingController.js

@@ -1,5 +1,5 @@
 const request = require('request')
 const request = require('request')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 
 

+ 1 - 1
services/web/app/src/Features/Spelling/SpellingHandler.js

@@ -1,5 +1,5 @@
 const request = require('request')
 const request = require('request')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 
 
 const TIMEOUT = 10 * 1000
 const TIMEOUT = 10 * 1000

+ 1 - 1
services/web/app/src/Features/SplitTests/SplitTestHandler.js

@@ -1,7 +1,7 @@
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const UserUpdater = require('../User/UserUpdater')
 const UserUpdater = require('../User/UserUpdater')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const _ = require('lodash')
 const _ = require('lodash')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')

+ 2 - 2
services/web/app/src/Features/StaticPages/UniversityController.js

@@ -10,9 +10,9 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 let UniversityController
 let UniversityController
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = UniversityController = {
 module.exports = UniversityController = {
   getPage(req, res, next) {
   getPage(req, res, next) {

+ 1 - 1
services/web/app/src/Features/Subscription/FeaturesUpdater.js

@@ -4,7 +4,7 @@ const PlansLocator = require('./PlansLocator')
 const _ = require('lodash')
 const _ = require('lodash')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const UserFeaturesUpdater = require('./UserFeaturesUpdater')
 const UserFeaturesUpdater = require('./UserFeaturesUpdater')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const ReferalFeatures = require('../Referal/ReferalFeatures')
 const ReferalFeatures = require('../Referal/ReferalFeatures')
 const V1SubscriptionManager = require('./V1SubscriptionManager')
 const V1SubscriptionManager = require('./V1SubscriptionManager')

+ 1 - 1
services/web/app/src/Features/Subscription/GroupPlansData.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const fs = require('fs')
 const fs = require('fs')
 const Path = require('path')
 const Path = require('path')
 
 

+ 1 - 1
services/web/app/src/Features/Subscription/LimitationsManager.js

@@ -3,7 +3,7 @@ const logger = require('logger-sharelatex')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SubscriptionLocator = require('./SubscriptionLocator')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
 const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
 const CollaboratorsInvitesHandler = require('../Collaborators/CollaboratorsInviteHandler')
 const CollaboratorsInvitesHandler = require('../Collaborators/CollaboratorsInviteHandler')
 const V1SubscriptionManager = require('./V1SubscriptionManager')
 const V1SubscriptionManager = require('./V1SubscriptionManager')

+ 1 - 1
services/web/app/src/Features/Subscription/PlansLocator.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 
 
 function ensurePlansAreSetupCorrectly() {
 function ensurePlansAreSetupCorrectly() {

+ 1 - 1
services/web/app/src/Features/Subscription/RecurlyClient.js

@@ -1,5 +1,5 @@
 const recurly = require('recurly')
 const recurly = require('recurly')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')

+ 1 - 1
services/web/app/src/Features/Subscription/RecurlyWrapper.js

@@ -19,7 +19,7 @@ const OError = require('@overleaf/o-error')
 const querystring = require('querystring')
 const querystring = require('querystring')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const request = require('request')
 const request = require('request')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const xml2js = require('xml2js')
 const xml2js = require('xml2js')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const Async = require('async')
 const Async = require('async')

+ 1 - 1
services/web/app/src/Features/Subscription/SubscriptionController.js

@@ -4,7 +4,7 @@ const PlansLocator = require('./PlansLocator')
 const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder')
 const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder')
 const LimitationsManager = require('./LimitationsManager')
 const LimitationsManager = require('./LimitationsManager')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const RecurlyWrapper = require('./RecurlyWrapper')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const GeoIpLookup = require('../../infrastructure/GeoIpLookup')
 const GeoIpLookup = require('../../infrastructure/GeoIpLookup')
 const FeaturesUpdater = require('./FeaturesUpdater')
 const FeaturesUpdater = require('./FeaturesUpdater')

+ 1 - 1
services/web/app/src/Features/Subscription/SubscriptionFormatters.js

@@ -10,7 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 const dateformat = require('dateformat')
 const dateformat = require('dateformat')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 const currenySymbols = {
 const currenySymbols = {
   EUR: '€',
   EUR: '€',

+ 1 - 1
services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js

@@ -24,7 +24,7 @@ const LimitationsManager = require('./LimitationsManager')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const EmailHandler = require('../Email/EmailHandler')
 const EmailHandler = require('../Email/EmailHandler')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
 const UserMembershipViewModel = require('../UserMembership/UserMembershipViewModel')
 const UserMembershipViewModel = require('../UserMembership/UserMembershipViewModel')
 
 

+ 1 - 1
services/web/app/src/Features/Subscription/SubscriptionRouter.js

@@ -13,7 +13,7 @@ const SubscriptionController = require('./SubscriptionController')
 const SubscriptionGroupController = require('./SubscriptionGroupController')
 const SubscriptionGroupController = require('./SubscriptionGroupController')
 const TeamInvitesController = require('./TeamInvitesController')
 const TeamInvitesController = require('./TeamInvitesController')
 const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
 const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = {
 module.exports = {
   apply(webRouter, privateApiRouter, publicApiRouter) {
   apply(webRouter, privateApiRouter, publicApiRouter) {

+ 1 - 1
services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const PlansLocator = require('./PlansLocator')
 const PlansLocator = require('./PlansLocator')
 const SubscriptionFormatters = require('./SubscriptionFormatters')
 const SubscriptionFormatters = require('./SubscriptionFormatters')

+ 1 - 1
services/web/app/src/Features/Subscription/TeamInvitesController.js

@@ -11,7 +11,7 @@
  * DS207: Consider shorter variations of null checks
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const TeamInvitesHandler = require('./TeamInvitesHandler')
 const TeamInvitesHandler = require('./TeamInvitesHandler')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')

+ 1 - 1
services/web/app/src/Features/Subscription/TeamInvitesHandler.js

@@ -3,7 +3,7 @@ const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const crypto = require('crypto')
 const async = require('async')
 const async = require('async')
 
 
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
 
 
 const { Subscription } = require('../../models/Subscription')
 const { Subscription } = require('../../models/Subscription')

+ 1 - 1
services/web/app/src/Features/Subscription/V1SubscriptionManager.js

@@ -14,7 +14,7 @@
 let V1SubscriptionManager
 let V1SubscriptionManager
 const UserGetter = require('../User/UserGetter')
 const UserGetter = require('../User/UserGetter')
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { V1ConnectionError, NotFoundError } = require('../Errors/Errors')
 const { V1ConnectionError, NotFoundError } = require('../Errors/Errors')
 
 
 module.exports = V1SubscriptionManager = {
 module.exports = V1SubscriptionManager = {

+ 1 - 1
services/web/app/src/Features/SystemMessages/SystemMessageController.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const SystemMessageManager = require('./SystemMessageManager')
 const SystemMessageManager = require('./SystemMessageManager')
 
 

+ 1 - 1
services/web/app/src/Features/Templates/TemplatesManager.js

@@ -23,7 +23,7 @@ const util = require('util')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const request = require('request')
 const request = require('request')
 const requestPromise = require('request-promise-native')
 const requestPromise = require('request-promise-native')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const uuid = require('uuid')
 const uuid = require('uuid')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const _ = require('underscore')
 const _ = require('underscore')

+ 1 - 1
services/web/app/src/Features/Templates/TemplatesMiddleware.js

@@ -8,7 +8,7 @@
  * DS102: Remove unnecessary code created because of implicit returns
  * DS102: Remove unnecessary code created because of implicit returns
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 
 
 module.exports = {
 module.exports = {

+ 1 - 1
services/web/app/src/Features/ThirdPartyDataStore/TpdsQueueManager.js

@@ -1,4 +1,4 @@
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const request = require('request-promise-native')
 const request = require('request-promise-native')
 
 
 async function getQueues(userId) {
 async function getQueues(userId) {

+ 1 - 1
services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js

@@ -5,7 +5,7 @@ const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
 const path = require('path')
 const path = require('path')
 const request = require('request-promise-native')
 const request = require('request-promise-native')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 
 
 const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
 const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
   .promises
   .promises

+ 1 - 1
services/web/app/src/Features/TokenAccess/TokenAccessController.js

@@ -2,7 +2,7 @@ const AuthenticationController = require('../Authentication/AuthenticationContro
 const TokenAccessHandler = require('./TokenAccessHandler')
 const TokenAccessHandler = require('./TokenAccessHandler')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const { expressify } = require('../../util/promises')
 const { expressify } = require('../../util/promises')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')

+ 1 - 1
services/web/app/src/Features/TokenAccess/TokenAccessHandler.js

@@ -2,7 +2,7 @@ const { Project } = require('../../models/Project')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const { ObjectId } = require('mongodb')
 const { ObjectId } = require('mongodb')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const V1Api = require('../V1/V1Api')
 const crypto = require('crypto')
 const crypto = require('crypto')

+ 1 - 1
services/web/app/src/Features/Uploads/ArchiveManager.js

@@ -19,7 +19,7 @@ const fs = require('fs')
 const Path = require('path')
 const Path = require('path')
 const fse = require('fs-extra')
 const fse = require('fs-extra')
 const yauzl = require('yauzl')
 const yauzl = require('yauzl')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const {
 const {
   InvalidZipFileError,
   InvalidZipFileError,
   EmptyZipFileError,
   EmptyZipFileError,

+ 1 - 1
services/web/app/src/Features/Uploads/FileTypeManager.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const Path = require('path')
 const Path = require('path')
 const isUtf8 = require('utf-8-validate')
 const isUtf8 = require('utf-8-validate')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 const FileTypeManager = {
 const FileTypeManager = {
   TEXT_EXTENSIONS: Settings.textExtensions.map(ext => `.${ext}`),
   TEXT_EXTENSIONS: Settings.textExtensions.map(ext => `.${ext}`),

+ 1 - 1
services/web/app/src/Features/Uploads/ProjectUploadController.js

@@ -19,7 +19,7 @@ const Path = require('path')
 const FileSystemImportManager = require('./FileSystemImportManager')
 const FileSystemImportManager = require('./FileSystemImportManager')
 const ProjectUploadManager = require('./ProjectUploadManager')
 const ProjectUploadManager = require('./ProjectUploadManager')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const { InvalidZipFileError } = require('./ArchiveErrors')
 const { InvalidZipFileError } = require('./ArchiveErrors')
 const multer = require('multer')
 const multer = require('multer')
 
 

+ 1 - 1
services/web/app/src/Features/Uploads/UploadsRouter.js

@@ -2,7 +2,7 @@ const AuthorizationMiddleware = require('../Authorization/AuthorizationMiddlewar
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const ProjectUploadController = require('./ProjectUploadController')
 const ProjectUploadController = require('./ProjectUploadController')
 const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
 const RateLimiterMiddleware = require('../Security/RateLimiterMiddleware')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 module.exports = {
 module.exports = {
   apply(webRouter, apiRouter) {
   apply(webRouter, apiRouter) {

+ 1 - 1
services/web/app/src/Features/User/ThirdPartyIdentityManager.js

@@ -6,7 +6,7 @@ const Errors = require('../Errors/Errors')
 const _ = require('lodash')
 const _ = require('lodash')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { User } = require(`${APP_ROOT}/models/User`)
 const { User } = require(`${APP_ROOT}/models/User`)
 const { promisifyAll } = require(`${APP_ROOT}/util/promises`)
 const { promisifyAll } = require(`${APP_ROOT}/util/promises`)
 
 

+ 1 - 1
services/web/app/src/Features/User/UserEmailsConfirmationHandler.js

@@ -1,7 +1,7 @@
 const EmailHelper = require('../Helpers/EmailHelper')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EmailHandler = require('../Email/EmailHandler')
 const EmailHandler = require('../Email/EmailHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const UserUpdater = require('./UserUpdater')
 const UserUpdater = require('./UserUpdater')
 const UserGetter = require('./UserGetter')
 const UserGetter = require('./UserGetter')

+ 1 - 1
services/web/app/src/Features/User/UserGetter.js

@@ -3,7 +3,7 @@ const { db } = require('../../infrastructure/mongodb')
 const metrics = require('@overleaf/metrics')
 const metrics = require('@overleaf/metrics')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const moment = require('moment')
 const moment = require('moment')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 const {
 const {
   promises: InstitutionsAPIPromises,
   promises: InstitutionsAPIPromises,

+ 1 - 1
services/web/app/src/Features/User/UserPagesController.js

@@ -2,7 +2,7 @@ const UserGetter = require('./UserGetter')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const UserSessionsManager = require('./UserSessionsManager')
 const UserSessionsManager = require('./UserSessionsManager')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const _ = require('lodash')
 const _ = require('lodash')
 
 

+ 1 - 1
services/web/app/src/Features/User/UserRegistrationHandler.js

@@ -9,7 +9,7 @@ const crypto = require('crypto')
 const EmailHandler = require('../Email/EmailHandler')
 const EmailHandler = require('../Email/EmailHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const Analytics = require('../Analytics/AnalyticsManager')
 const Analytics = require('../Analytics/AnalyticsManager')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EmailHelper = require('../Helpers/EmailHelper')
 
 
 const UserRegistrationHandler = {
 const UserRegistrationHandler = {

+ 1 - 1
services/web/app/src/Features/User/UserSessionsManager.js

@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const Async = require('async')
 const Async = require('async')
 const _ = require('underscore')
 const _ = require('underscore')

+ 1 - 1
services/web/app/src/Features/V1/V1Api.js

@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
  */
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 const Errors = require('../Errors/Errors')
 const { promisifyAll } = require('../../util/promises')
 const { promisifyAll } = require('../../util/promises')
 
 

+ 1 - 1
services/web/app/src/Features/V1/V1Handler.js

@@ -16,7 +16,7 @@
 let V1Handler
 let V1Handler
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
 const V1Api = require('./V1Api')
 const V1Api = require('./V1Api')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 
 
 module.exports = V1Handler = {
 module.exports = V1Handler = {

+ 1 - 1
services/web/app/src/infrastructure/ExpressLocals.js

@@ -1,5 +1,5 @@
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const querystring = require('querystring')
 const querystring = require('querystring')
 const _ = require('lodash')
 const _ = require('lodash')
 const Url = require('url')
 const Url = require('url')

+ 1 - 1
services/web/app/src/infrastructure/Features.js

@@ -1,5 +1,5 @@
 const _ = require('lodash')
 const _ = require('lodash')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const fs = require('fs')
 const fs = require('fs')
 
 
 const publicRegistrationModuleAvailable = fs.existsSync(
 const publicRegistrationModuleAvailable = fs.existsSync(

+ 1 - 1
services/web/app/src/infrastructure/FileWriter.js

@@ -15,7 +15,7 @@ const OError = require('@overleaf/o-error')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const uuid = require('uuid')
 const uuid = require('uuid')
 const _ = require('underscore')
 const _ = require('underscore')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 const request = require('request')
 const request = require('request')
 const { Transform, pipeline } = require('stream')
 const { Transform, pipeline } = require('stream')
 const { FileTooLargeError } = require('../Features/Errors/Errors')
 const { FileTooLargeError } = require('../Features/Errors/Errors')

+ 1 - 1
services/web/app/src/infrastructure/GeoIpLookup.js

@@ -1,5 +1,5 @@
 const request = require('request')
 const request = require('request')
-const settings = require('settings-sharelatex')
+const settings = require('@overleaf/settings')
 const _ = require('underscore')
 const _ = require('underscore')
 const logger = require('logger-sharelatex')
 const logger = require('logger-sharelatex')
 const URL = require('url')
 const URL = require('url')

+ 1 - 1
services/web/app/src/infrastructure/JsonWebToken.js

@@ -1,6 +1,6 @@
 const { callbackify, promisify } = require('util')
 const { callbackify, promisify } = require('util')
 const JWT = require('jsonwebtoken')
 const JWT = require('jsonwebtoken')
-const Settings = require('settings-sharelatex')
+const Settings = require('@overleaf/settings')
 
 
 const jwtSign = promisify(JWT.sign)
 const jwtSign = promisify(JWT.sign)
 
 

Неке датотеке нису приказане због велике количине промена