From 63520c707630d6693e826dd53e7b6f955436a190 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 6 Feb 2024 09:34:15 +0000 Subject: [PATCH] Merge pull request #16859 from overleaf/jpa-sharelatex-cleanup [misc] ShareLaTeX cleanup - high impact GitOrigin-RevId: 6dcce9b0f15e30f7afcf6d69c3df36a369f38120 --- develop/dev.env | 4 +-- docker-compose.yml | 12 +++---- libraries/logger/logging-manager.js | 2 +- libraries/metrics/LICENSE | 2 +- .../overleaf-editor-core/lib/safe_pathname.js | 2 +- libraries/settings/README.md | 4 +-- libraries/settings/Settings.js | 8 ++++- server-ce/Dockerfile | 4 +-- server-ce/config/settings.js | 32 ++++++++++--------- server-ce/hotfix/3.5.6/Dockerfile | 2 +- services/chat/README.md | 2 +- services/chat/config/settings.defaults.cjs | 2 +- services/clsi/README.md | 10 +++--- services/clsi/docker-compose-config.yml | 4 +-- .../clsi/test/unit/js/DockerRunnerTests.js | 4 +-- .../config/settings.defaults.js | 2 +- .../PersistenceManagerTests.js | 2 +- services/filestore/README.md | 4 +-- services/history-v1/config/test.json | 2 +- services/history-v1/docker-compose.ci.yml | 5 +-- services/history-v1/docker-compose.yml | 5 +-- services/notifications/app.js | 4 +-- .../app/js/UpdateTranslator.js | 4 +-- .../config/settings.defaults.cjs | 2 +- .../clear_project_version_out_of_order.js | 2 +- .../HistoryStoreManagerTests.js | 4 +-- .../js/WebApiManager/WebApiManagerTests.js | 2 +- services/real-time/app/js/HttpController.js | 2 +- .../real-time/config/settings.defaults.js | 4 +-- .../test/unit/js/SpellingAPIManagerTests.js | 2 +- services/web/.storybook/main.ts | 2 +- services/web/Makefile | 20 ++++++------ services/web/Makefile.module | 2 +- .../ThirdPartyDataStore/TpdsUpdateSender.js | 2 +- .../web/app/src/infrastructure/mongodb.js | 2 +- services/web/app/src/router.js | 4 +-- services/web/app/views/_metadata.pug | 6 ++-- .../app/views/general/account-merge-error.pug | 11 ------- services/web/app/views/layout-base.pug | 10 ------ services/web/config/settings.defaults.js | 10 +++--- services/web/docker-compose.ci.yml | 6 ++-- services/web/docker-compose.common.env | 4 +-- services/web/docker-compose.yml | 6 ++-- services/web/frontend/js/base.js | 2 +- services/web/frontend/js/ide.js | 4 +-- .../HumanReadableLogsHints.jsx | 2 +- services/web/frontend/js/main.js | 4 +-- .../stylesheets/app/templates-v2.less | 2 +- .../web/frontend/stylesheets/main-style.less | 2 +- services/web/install_deps.sh | 2 +- services/web/local-dev.env | 2 +- services/web/local-test.env | 2 +- services/web/package.json | 14 ++++---- .../config/settings.test.defaults.js | 2 +- .../acceptance/config/settings.test.saas.js | 2 +- .../web/test/acceptance/src/ApiClsiTests.js | 2 +- .../acceptance/src/PrimaryEmailCheckTests.js | 2 +- services/web/test/acceptance/src/TagsTests.js | 2 +- .../test/acceptance/src/TpdsUpdateTests.js | 8 ++--- services/web/test/frontend/bootstrap.js | 2 +- .../languages/latex/latex-linter.test.ts | 14 ++++---- .../AuthenticationControllerTests.js | 6 ++-- .../AuthenticationManagerTests.js | 6 ++-- .../test/unit/src/Chat/ChatApiHandlerTests.js | 2 +- .../unit/src/Contact/ContactManagerTests.js | 2 +- .../unit/src/Docstore/DocstoreManagerTests.js | 2 +- .../src/FileStore/FileStoreHandlerTests.js | 2 +- .../NotificationsHandlerTests.js | 2 +- .../src/Project/ProjectEditorHandlerTests.js | 18 +++++------ .../SubscriptionControllerTests.js | 2 +- .../SubscriptionGroupHandlerTests.js | 2 +- .../src/Templates/TemplatesManagerTests.js | 2 +- .../TpdsUpdateSenderTests.js | 4 +-- .../test/unit/src/User/UserControllerTests.js | 2 +- .../unit/src/User/UserInfoControllerTests.js | 6 ++-- .../src/infrastructure/TranslationsTests.js | 12 +++---- 76 files changed, 176 insertions(+), 189 deletions(-) delete mode 100644 services/web/app/views/general/account-merge-error.pug diff --git a/develop/dev.env b/develop/dev.env index 477e226d36..f817987f8e 100644 --- a/develop/dev.env +++ b/develop/dev.env @@ -15,6 +15,6 @@ REALTIME_HOST=real-time REDIS_HOST=redis SPELLING_HOST=spelling WEBPACK_HOST=webpack -WEB_API_PASSWORD=sharelatex -WEB_API_USER=sharelatex +WEB_API_PASSWORD=overleaf +WEB_API_USER=overleaf WEB_HOST=web diff --git a/docker-compose.yml b/docker-compose.yml index 051e38c882..09a2c1e7f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,20 +50,20 @@ services: ## Set for SSL via nginx-proxy #VIRTUAL_HOST: 103.112.212.22 - # SHARELATEX_SITE_URL: http://sharelatex.mydomain.com - # SHARELATEX_NAV_TITLE: Our ShareLaTeX Instance - # SHARELATEX_HEADER_IMAGE_URL: http://somewhere.com/mylogo.png + # SHARELATEX_SITE_URL: http://overleaf.example.com + # SHARELATEX_NAV_TITLE: Overleaf Community Edition + # SHARELATEX_HEADER_IMAGE_URL: http://example.com/mylogo.png # SHARELATEX_ADMIN_EMAIL: support@it.com - # SHARELATEX_LEFT_FOOTER: '[{"text": "Powered by ShareLaTeX 2016"},{"text": "Another page I want to link to can be found here"} ]' + # SHARELATEX_LEFT_FOOTER: '[{"text": "Another page I want to link to can be found here"} ]' # SHARELATEX_RIGHT_FOOTER: '[{"text": "Hello I am on the Right"} ]' - # SHARELATEX_EMAIL_FROM_ADDRESS: "team@sharelatex.com" + # SHARELATEX_EMAIL_FROM_ADDRESS: "hello@example.com" # SHARELATEX_EMAIL_AWS_SES_ACCESS_KEY_ID: # SHARELATEX_EMAIL_AWS_SES_SECRET_KEY: - # SHARELATEX_EMAIL_SMTP_HOST: smtp.mydomain.com + # SHARELATEX_EMAIL_SMTP_HOST: smtp.example.com # SHARELATEX_EMAIL_SMTP_PORT: 587 # SHARELATEX_EMAIL_SMTP_SECURE: false # SHARELATEX_EMAIL_SMTP_USER: diff --git a/libraries/logger/logging-manager.js b/libraries/logger/logging-manager.js index facc75a951..33754a918d 100644 --- a/libraries/logger/logging-manager.js +++ b/libraries/logger/logging-manager.js @@ -147,7 +147,7 @@ const LoggingManager = { }, } -LoggingManager.initialize('default-sharelatex') +LoggingManager.initialize('default') function handleWarning(err) { LoggingManager.warn({ err }, 'Warning details') diff --git a/libraries/metrics/LICENSE b/libraries/metrics/LICENSE index f49ce1ac14..54e6916a8f 100644 --- a/libraries/metrics/LICENSE +++ b/libraries/metrics/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 ShareLaTeX +Copyright (c) 2024 Overleaf Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/libraries/overleaf-editor-core/lib/safe_pathname.js b/libraries/overleaf-editor-core/lib/safe_pathname.js index 9b4ab79a1d..637c003604 100644 --- a/libraries/overleaf-editor-core/lib/safe_pathname.js +++ b/libraries/overleaf-editor-core/lib/safe_pathname.js @@ -5,7 +5,7 @@ const path = require('path') /** * Regular expressions for Overleaf v2 taken from - * https://github.com/sharelatex/web-sharelatex/blob/master/app/coffee/Features/Project/SafePath.coffee + * https://github.com/overleaf/internal/blob/f7b287b6a07354000a6b463ca3a5828104e4a811/services/web/app/src/Features/Project/SafePath.js */ // diff --git a/libraries/settings/README.md b/libraries/settings/README.md index ac5adfc14f..c06978bba3 100644 --- a/libraries/settings/README.md +++ b/libraries/settings/README.md @@ -8,9 +8,9 @@ Settings file location ---------------------- You can specify a custom location for the settings file by setting the -`SHARELATEX_CONFIG` environment variable. E.g. +`OVERLEAF_CONFIG` environment variable. E.g. - $ export SHARELATEX_CONFIG=/home/james/config/settings.development.js + $ export OVERLEAF_CONFIG=/home/james/config/settings.development.js Otherwise, the settings will be loaded from `config/settings.NODE_ENV.js`, where `NODE_ENV` is another environment variable, or defaults to `development`. diff --git a/libraries/settings/Settings.js b/libraries/settings/Settings.js index 358b83b52a..02f5af763c 100644 --- a/libraries/settings/Settings.js +++ b/libraries/settings/Settings.js @@ -9,6 +9,12 @@ const ENTRY_POINT_DIR = process.argv[1] : undefined const NODE_ENV = (process.env.NODE_ENV || 'development').toLowerCase() const SHARELATEX_CONFIG = process.env.SHARELATEX_CONFIG +const OVERLEAF_CONFIG = process.env.OVERLEAF_CONFIG || SHARELATEX_CONFIG +if (SHARELATEX_CONFIG && SHARELATEX_CONFIG !== OVERLEAF_CONFIG) { + throw new Error( + 'found mismatching SHARELATEX_CONFIG, rename to OVERLEAF_CONFIG' + ) +} let settings let settingsExist = false @@ -26,7 +32,7 @@ if (defaultsPath) { } const overridesPath = - pathIfExists(SHARELATEX_CONFIG) || + pathIfExists(OVERLEAF_CONFIG) || pathIfExists(Path.join(CWD, `config/settings.${NODE_ENV}.cjs`)) || pathIfExists(Path.join(CWD, `config/settings.${NODE_ENV}.js`)) if (overridesPath) { diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index de4d3e634f..c7474de5f2 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -84,9 +84,9 @@ RUN touch $SITE_MAINTENANCE_FILE # Set Environment Variables # -------------------------------- -ENV SHARELATEX_CONFIG /etc/sharelatex/settings.js +ENV OVERLEAF_CONFIG /etc/sharelatex/settings.js -ENV WEB_API_USER "sharelatex" +ENV WEB_API_USER "overleaf" ENV ADMIN_PRIVILEGE_AVAILABLE "true" ENV SHARELATEX_APP_NAME "Overleaf Community Edition" diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js index 7c37c2ab76..7d4c457ea0 100644 --- a/server-ce/config/settings.js +++ b/server-ce/config/settings.js @@ -18,10 +18,12 @@ const Path = require('path') // These credentials are used for authenticating api requests // between services that may need to go over public channels -const httpAuthUser = 'sharelatex' +const httpAuthUser = process.env.WEB_API_USER const httpAuthPass = process.env.WEB_API_PASSWORD const httpAuthUsers = {} -httpAuthUsers[httpAuthUser] = httpAuthPass +if (httpAuthUser && httpAuthPass) { + httpAuthUsers[httpAuthUser] = httpAuthPass +} const parse = function (option) { if (option != null) { @@ -58,7 +60,7 @@ const settings = { // Databases // --------- - // ShareLaTeX's main persistent data store is MongoDB (http://www.mongodb.org/) + // Overleaf Community Edition's main persistent data store is MongoDB (http://www.mongodb.org/) // Documentation about the URL connection string format can be found at: // // http://docs.mongodb.org/manual/reference/connection-string/ @@ -68,7 +70,7 @@ const settings = { url: process.env.SHARELATEX_MONGO_URL || 'mongodb://dockerhost/sharelatex', }, - // Redis is used in ShareLaTeX for high volume queries, like real-time + // Redis is used in Overleaf Community Edition for high volume queries, like real-time // editing, and session management. // // The following config will work with Redis's default settings: @@ -175,15 +177,15 @@ const settings = { // Server Config // ------------- - // Where your instance of ShareLaTeX can be found publicly. This is used + // Where your instance of Overleaf Community Edition can be found publicly. This is used // when emails are sent out and in generated links: siteUrl: (siteUrl = process.env.SHARELATEX_SITE_URL || 'http://localhost'), // Status page URL as displayed on the maintenance/500 pages. statusPageUrl: process.env.SHARELATEX_STATUS_PAGE_URL, - // The name this is used to describe your ShareLaTeX Installation - appName: process.env.SHARELATEX_APP_NAME || 'ShareLaTeX (Community Edition)', + // The name this is used to describe your Overleaf Community Edition Installation + appName: process.env.SHARELATEX_APP_NAME || 'Overleaf Community Edition', restrictInvitesToExistingAccounts: process.env.SHARELATEX_RESTRICT_INVITES_TO_EXISTING_ACCOUNTS === 'true', @@ -192,11 +194,11 @@ const settings = { title: process.env.SHARELATEX_NAV_TITLE || process.env.SHARELATEX_APP_NAME || - 'ShareLaTeX Community Edition', + 'Overleaf Community Edition', }, // The email address which users will be directed to as the main point of - // contact for this installation of ShareLaTeX. + // contact for this installation of Overleaf Community Edition. adminEmail: process.env.SHARELATEX_ADMIN_EMAIL || 'placeholder@example.com', // If provided, a sessionSecret is used to sign cookies so that they cannot be @@ -218,11 +220,11 @@ const settings = { // but should be set to true in production. cacheStaticAssets: true, - // If you are running ShareLaTeX over https, set this to true to send the + // If you are running Overleaf Community Edition over https, set this to true to send the // cookie with a secure flag (recommended). secureCookie: process.env.SHARELATEX_SECURE_COOKIE != null, - // If you are running ShareLaTeX behind a proxy (like Apache, Nginx, etc) + // If you are running Overleaf Community Edition behind a proxy (like Apache, Nginx, etc) // then set this to true to allow it to correctly detect the forwarded IP // address and http/https protocol information. @@ -317,7 +319,7 @@ if (process.env.SHARELATEX_HEADER_NAV_LINKS != null) { # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # WARNING: SHARELATEX_HEADER_NAV_LINKS is no longer supported -# See https://github.com/sharelatex/sharelatex/wiki/Configuring-Headers,-Footers-&-Logo +# See https://github.com/overleaf/overleaf/wiki/Configuring-Headers,-Footers-&-Logo # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #\ `) @@ -338,7 +340,7 @@ if (process.env.SHARELATEX_HEADER_EXTRAS != null) { // ------------- // // You must configure a mail server to be able to send invite emails from -// ShareLaTeX. The config settings are passed to nodemailer. See the nodemailer +// Overleaf Community Edition. The config settings are passed to nodemailer. See the nodemailer // documentation for available options: // // http://www.nodemailer.com/docs/transports @@ -418,7 +420,7 @@ if ( } // ###################### -// ShareLaTeX Server Pro +// Overleaf Server Pro // ###################### if (parse(process.env.SHARELATEX_IS_SERVER_PRO) === true) { @@ -503,7 +505,7 @@ switch (process.env.SHARELATEX_FILESTORE_BACKEND) { stores: { user_files: process.env.SHARELATEX_FILESTORE_USER_FILES_BUCKET_NAME, template_files: - process.env.SHARELATEX_FILESTORE_TEMPLATE_FILES_BUCKET_NAME, + process.env.SHARELATEX_FILESTORE_TEMPLATE_FILES_BUCKET_NAME, }, s3: { key: diff --git a/server-ce/hotfix/3.5.6/Dockerfile b/server-ce/hotfix/3.5.6/Dockerfile index e59890fd9f..3c78fe99a1 100644 --- a/server-ce/hotfix/3.5.6/Dockerfile +++ b/server-ce/hotfix/3.5.6/Dockerfile @@ -1,6 +1,6 @@ FROM sharelatex/sharelatex:3.5.5 -# Patch: support trustProxyIps in Server CE/Pro +# Patch: support trustProxyIps in Overleaf Community Edition/Server Pro COPY trusted_proxy_ips.patch . RUN patch -p0 --directory=/etc/sharelatex < trusted_proxy_ips.patch diff --git a/services/chat/README.md b/services/chat/README.md index a9d20fd79e..8bbc0128a6 100644 --- a/services/chat/README.md +++ b/services/chat/README.md @@ -1,7 +1,7 @@ overleaf/chat =============== -The backend API that powers the chat service in ShareLaTeX +The backend API that powers the chat service in Overleaf License ------- diff --git a/services/chat/config/settings.defaults.cjs b/services/chat/config/settings.defaults.cjs index 43371e5aab..0d43e551ba 100644 --- a/services/chat/config/settings.defaults.cjs +++ b/services/chat/config/settings.defaults.cjs @@ -11,7 +11,7 @@ module.exports = { url: `http://${process.env.WEB_HOST || 'localhost'}:${ process.env.WEB_PORT || 3000 }`, - user: process.env.WEB_API_USER || 'sharelatex', + user: process.env.WEB_API_USER || 'overleaf', pass: process.env.WEB_API_PASSWORD || 'password', }, }, diff --git a/services/clsi/README.md b/services/clsi/README.md index 11e35eb95d..0626bb4cfe 100644 --- a/services/clsi/README.md +++ b/services/clsi/README.md @@ -100,14 +100,14 @@ sudo chmod -R g+w compiles sudo chmod g+s compiles ``` -Another solution is to create a `sharelatex` group and add both `root` and the user with `uid` `1000` to it. If the host does not have a user with that `uid`, you will need to create one first. +Another solution is to create a `overleaf` group and add both `root` and the user with `uid` `1000` to it. If the host does not have a user with that `uid`, you will need to create one first. ```shell sudo useradd --uid 1000 host-node-user # If required -sudo groupadd sharelatex -sudo usermod -a -G sharelatex root -sudo usermod -a -G sharelatex $(id -nu 1000) -sudo chown -R 1000:sharelatex compiles +sudo groupadd overleaf +sudo usermod -a -G overleaf root +sudo usermod -a -G overleaf $(id -nu 1000) +sudo chown -R 1000:overleaf compiles sudo chmod -R g+w compiles sudo chmod g+s compiles ``` diff --git a/services/clsi/docker-compose-config.yml b/services/clsi/docker-compose-config.yml index 9a9a7ee01c..949dce17d8 100644 --- a/services/clsi/docker-compose-config.yml +++ b/services/clsi/docker-compose-config.yml @@ -6,7 +6,7 @@ services: ALLOWED_IMAGES: "quay.io/sharelatex/texlive-full:2017.1" TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1 TEXLIVE_IMAGE_USER: "tex" - SHARELATEX_CONFIG: /overleaf/services/clsi/config/settings.defaults.js + OVERLEAF_CONFIG: /overleaf/services/clsi/config/settings.defaults.js DOCKER_RUNNER: "true" COMPILES_HOST_DIR: $PWD/compiles volumes: @@ -20,7 +20,7 @@ services: ALLOWED_IMAGES: ${TEXLIVE_IMAGE} TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1 TEXLIVE_IMAGE_USER: "tex" - SHARELATEX_CONFIG: /overleaf/services/clsi/config/settings.defaults.js + OVERLEAF_CONFIG: /overleaf/services/clsi/config/settings.defaults.js DOCKER_RUNNER: "true" COMPILES_HOST_DIR: $PWD/compiles volumes: diff --git a/services/clsi/test/unit/js/DockerRunnerTests.js b/services/clsi/test/unit/js/DockerRunnerTests.js index caa5d87529..8ff9c6107b 100644 --- a/services/clsi/test/unit/js/DockerRunnerTests.js +++ b/services/clsi/test/unit/js/DockerRunnerTests.js @@ -72,7 +72,7 @@ describe('DockerRunner', function () { this.directory = '/local/compile/directory' this.mainFile = 'main-file.tex' this.compiler = 'pdflatex' - this.image = 'example.com/sharelatex/image:2016.2' + this.image = 'example.com/overleaf/image:2016.2' this.env = {} this.callback = sinon.stub() this.project_id = 'project-id-123' @@ -154,7 +154,7 @@ describe('DockerRunner', function () { describe('when path.sandboxedCompilesHostDir is set', function () { beforeEach(function () { this.Settings.path.sandboxedCompilesHostDir = '/some/host/dir/compiles' - this.directory = '/var/lib/sharelatex/data/compiles/xyz' + this.directory = '/var/lib/overleaf/data/compiles/xyz' this.DockerRunner._runAndWaitForContainer = sinon .stub() .callsArgWith(3, null, (this.output = 'mock-output')) diff --git a/services/document-updater/config/settings.defaults.js b/services/document-updater/config/settings.defaults.js index 338edb743f..5cdac22640 100755 --- a/services/document-updater/config/settings.defaults.js +++ b/services/document-updater/config/settings.defaults.js @@ -11,7 +11,7 @@ module.exports = { url: `http://${ process.env.WEB_API_HOST || process.env.WEB_HOST || 'localhost' }:${process.env.WEB_API_PORT || process.env.WEB_PORT || 3000}`, - user: process.env.WEB_API_USER || 'sharelatex', + user: process.env.WEB_API_USER || 'overleaf', pass: process.env.WEB_API_PASSWORD || 'password', }, project_history: { diff --git a/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js b/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js index 2d0c622fec..3fd2065cd4 100644 --- a/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js +++ b/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js @@ -35,7 +35,7 @@ describe('PersistenceManager', function () { this.Settings.apis = { web: { url: (this.url = 'www.example.com'), - user: (this.user = 'sharelatex'), + user: (this.user = 'overleaf'), pass: (this.pass = 'password'), }, } diff --git a/services/filestore/README.md b/services/filestore/README.md index 3ee6cadff6..921fb4b76e 100644 --- a/services/filestore/README.md +++ b/services/filestore/README.md @@ -11,8 +11,8 @@ filestore acts as a proxy between the CLSIs and (currently) Amazon S3 storage, p * `/project/:project_id/size` * `/bucket/:bucket/key/*` * `/shutdown` -* `/status` - returns `filestore sharelatex up` or `server is being shut down` (HTTP 500) -* `/health_check` +* `/status` - returns HTTP 200 `filestore is up` or HTTP 503 when shutting down +* `/health_check` License ------- diff --git a/services/history-v1/config/test.json b/services/history-v1/config/test.json index 4864d81ddb..1e4ddd3a0b 100644 --- a/services/history-v1/config/test.json +++ b/services/history-v1/config/test.json @@ -1,5 +1,5 @@ { - "databaseUrl": "postgres://sharelatex:sharelatex@postgres/sharelatex", + "databaseUrl": "postgres://overleaf:overleaf@postgres/overleaf-history-v1-test", "persistor": { "backend": "gcs", "gcs": { diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml index 8371597d38..62a2719003 100644 --- a/services/history-v1/docker-compose.ci.yml +++ b/services/history-v1/docker-compose.ci.yml @@ -58,8 +58,9 @@ services: postgres: image: postgres:10 environment: - POSTGRES_USER: sharelatex - POSTGRES_PASSWORD: sharelatex + POSTGRES_USER: overleaf + POSTGRES_PASSWORD: overleaf + POSTGRES_DB: overleaf-history-v1-test healthcheck: test: pg_isready --quiet interval: 1s diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml index a8a16a2569..bed2d78e6f 100644 --- a/services/history-v1/docker-compose.yml +++ b/services/history-v1/docker-compose.yml @@ -61,8 +61,9 @@ services: postgres: image: postgres:10 environment: - POSTGRES_USER: sharelatex - POSTGRES_PASSWORD: sharelatex + POSTGRES_USER: overleaf + POSTGRES_PASSWORD: overleaf + POSTGRES_DB: overleaf-history-v1-test healthcheck: test: pg_isready --host=localhost --quiet interval: 1s diff --git a/services/notifications/app.js b/services/notifications/app.js index 4e38d33cf6..ea210540ac 100644 --- a/services/notifications/app.js +++ b/services/notifications/app.js @@ -4,7 +4,7 @@ require('@overleaf/metrics/initialize') const metrics = require('@overleaf/metrics') const Settings = require('@overleaf/settings') const logger = require('@overleaf/logger') -logger.initialize('notifications-sharelatex') +logger.initialize('notifications') const express = require('express') const app = express() const methodOverride = require('method-override') @@ -34,7 +34,7 @@ app.delete('/key/:key', controller.removeNotificationByKeyOnly) app.get('/key/:key/count', controller.countNotificationsByKeyOnly) app.delete('/key/:key/bulk', controller.deleteUnreadNotificationsByKeyOnlyBulk) -app.get('/status', (req, res) => res.send('notifications sharelatex up')) +app.get('/status', (req, res) => res.send('notifications is up')) app.get('/health_check', (req, res) => HealthCheckController.check(function (err) { diff --git a/services/project-history/app/js/UpdateTranslator.js b/services/project-history/app/js/UpdateTranslator.js index bef0756822..75d54fa082 100644 --- a/services/project-history/app/js/UpdateTranslator.js +++ b/services/project-history/app/js/UpdateTranslator.js @@ -142,10 +142,10 @@ export function _convertPathname(pathname) { // workaround for filenames containing asterisks, this will // fail if a corresponding replacement file already exists but it // would fail anyway without this attempt to fix the pathname. - // See https://github.com/overleaf/sharelatex/issues/900 + // See https://github.com/overleaf/internal/issues/900 pathname = pathname.replace(/\*/g, '__ASTERISK__') // workaround for filenames beginning with spaces - // See https://github.com/overleaf/sharelatex/issues/1404 + // See https://github.com/overleaf/internal/issues/1404 // note: we have already stripped any leading slash above pathname = pathname.replace(/^ /, '__SPACE__') // handle top-level pathname = pathname.replace(/\/ /g, '/__SPACE__') // handle folders diff --git a/services/project-history/config/settings.defaults.cjs b/services/project-history/config/settings.defaults.cjs index fa2cd9c694..559fdf93e0 100644 --- a/services/project-history/config/settings.defaults.cjs +++ b/services/project-history/config/settings.defaults.cjs @@ -27,7 +27,7 @@ module.exports = { url: `http://${ process.env.WEB_API_HOST || process.env.WEB_HOST || 'localhost' }:${process.env.WEB_PORT || 3000}`, - user: process.env.WEB_API_USER || 'sharelatex', + user: process.env.WEB_API_USER || 'overleaf', pass: process.env.WEB_API_PASSWORD || 'password', historyIdCacheSize: parseInt( process.env.HISTORY_ID_CACHE_SIZE || '10000', diff --git a/services/project-history/scripts/clear_project_version_out_of_order.js b/services/project-history/scripts/clear_project_version_out_of_order.js index 4adab1e329..54883a8c1f 100755 --- a/services/project-history/scripts/clear_project_version_out_of_order.js +++ b/services/project-history/scripts/clear_project_version_out_of_order.js @@ -232,7 +232,7 @@ async function main() { 'number of queues with project structure version out of order on incoming updates=', results.length ) - // now clear the sharelatex projects + // now clear the projects async.eachSeries(results.slice(0, limit), checkAndClear, err => { console.log('Final error status', err) console.log( diff --git a/services/project-history/test/unit/js/HistoryStoreManager/HistoryStoreManagerTests.js b/services/project-history/test/unit/js/HistoryStoreManager/HistoryStoreManagerTests.js index 5d25164ff2..0a175e1aeb 100644 --- a/services/project-history/test/unit/js/HistoryStoreManager/HistoryStoreManagerTests.js +++ b/services/project-history/test/unit/js/HistoryStoreManager/HistoryStoreManagerTests.js @@ -15,13 +15,13 @@ describe('HistoryStoreManager', function () { overleaf: { history: { host: 'http://example.com', - user: 'sharelatex', + user: 'overleaf', pass: 'password', }, }, apis: { filestore: { - url: 'http://filestore.sharelatex.production', + url: 'http://filestore.overleaf.production', }, history_v1: { requestTimeout: 123 }, }, diff --git a/services/project-history/test/unit/js/WebApiManager/WebApiManagerTests.js b/services/project-history/test/unit/js/WebApiManager/WebApiManagerTests.js index 01ae803e0b..4506a0290f 100644 --- a/services/project-history/test/unit/js/WebApiManager/WebApiManagerTests.js +++ b/services/project-history/test/unit/js/WebApiManager/WebApiManagerTests.js @@ -12,7 +12,7 @@ describe('WebApiManager', function () { apis: { web: { url: 'http://example.com', - user: 'sharelatex', + user: 'overleaf', pass: 'password', }, }, diff --git a/services/real-time/app/js/HttpController.js b/services/real-time/app/js/HttpController.js index 153e091017..79978ed02d 100644 --- a/services/real-time/app/js/HttpController.js +++ b/services/real-time/app/js/HttpController.js @@ -2,7 +2,7 @@ let HttpController module.exports = HttpController = { // The code in this controller is hard to unit test because of a lot of // dependencies on internal socket.io methods. It is not critical to the running - // of ShareLaTeX, and is only used for getting stats about connected clients, + // of Overleaf, and is only used for getting stats about connected clients, // and for checking internal state in acceptance tests. The acceptances tests // should provide appropriate coverage. _getConnectedClientView(ioClient) { diff --git a/services/real-time/config/settings.defaults.js b/services/real-time/config/settings.defaults.js index 4252a8765c..4defc888cb 100644 --- a/services/real-time/config/settings.defaults.js +++ b/services/real-time/config/settings.defaults.js @@ -92,7 +92,7 @@ const settings = { url: `http://${ process.env.WEB_API_HOST || process.env.WEB_HOST || 'localhost' }:${process.env.WEB_API_PORT || process.env.WEB_PORT || 3000}`, - user: process.env.WEB_API_USER || 'sharelatex', + user: process.env.WEB_API_USER || 'overleaf', pass: process.env.WEB_API_PASSWORD || 'password', }, documentupdater: { @@ -108,7 +108,7 @@ const settings = { sessionSecret: process.env.SESSION_SECRET || 'secret-please-change', }, - cookieName: process.env.COOKIE_NAME || 'sharelatex.sid', + cookieName: process.env.COOKIE_NAME || 'overleaf.sid', // Expose the hostname in the `debug.getHostname` rpc exposeHostname: process.env.EXPOSE_HOSTNAME === 'true', diff --git a/services/spelling/test/unit/js/SpellingAPIManagerTests.js b/services/spelling/test/unit/js/SpellingAPIManagerTests.js index bfee383573..0ee05c4a10 100644 --- a/services/spelling/test/unit/js/SpellingAPIManagerTests.js +++ b/services/spelling/test/unit/js/SpellingAPIManagerTests.js @@ -28,7 +28,7 @@ describe('SpellingAPIManager', function () { } this.SpellingAPIManager = await esmock(MODULE_PATH, { '../../../app/js/ASpell.js': this.ASpell, - '@overleaf/settings': { ignoredMisspellings: ['ShareLaTeX'] }, + '@overleaf/settings': { ignoredMisspellings: ['Overleaf'] }, }) }) diff --git a/services/web/.storybook/main.ts b/services/web/.storybook/main.ts index c4f9e126bc..32788ec78c 100644 --- a/services/web/.storybook/main.ts +++ b/services/web/.storybook/main.ts @@ -4,7 +4,7 @@ import path from 'node:path' const rootDir = path.resolve(__dirname, '..') // NOTE: must be set before webpack config is imported -process.env.SHARELATEX_CONFIG = path.join(rootDir, 'config/settings.webpack.js') +process.env.OVERLEAF_CONFIG = path.join(rootDir, 'config/settings.webpack.js') const config: StorybookConfig = { core: { diff --git a/services/web/Makefile b/services/web/Makefile index 2f47929429..b9eb20eeba 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -5,8 +5,8 @@ BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) PROJECT_NAME = web BUILD_DIR_NAME = $(shell pwd | xargs basename | tr -cd '[a-zA-Z0-9_.\-]') -export SHARELATEX_CONFIG ?= /overleaf/services/web/test/acceptance/config/settings.test.saas.js -export BASE_CONFIG ?= ${SHARELATEX_CONFIG} +export OVERLEAF_CONFIG ?= /overleaf/services/web/test/acceptance/config/settings.test.saas.js +export BASE_CONFIG ?= ${OVERLEAF_CONFIG} CFG_SAAS=/overleaf/services/web/test/acceptance/config/settings.test.saas.js CFG_SERVER_CE=/overleaf/services/web/test/acceptance/config/settings.test.server-ce.js @@ -179,11 +179,11 @@ TEST_ACCEPTANCE_APP := \ test_acceptance_app: $(TEST_ACCEPTANCE_APP) test_acceptance_app_saas: export COMPOSE_PROJECT_NAME=acceptance_test_saas_$(BUILD_DIR_NAME) -test_acceptance_app_saas: export SHARELATEX_CONFIG=$(CFG_SAAS) +test_acceptance_app_saas: export OVERLEAF_CONFIG=$(CFG_SAAS) test_acceptance_app_server_ce: export COMPOSE_PROJECT_NAME=acceptance_test_server_ce_$(BUILD_DIR_NAME) -test_acceptance_app_server_ce: export SHARELATEX_CONFIG=$(CFG_SERVER_CE) +test_acceptance_app_server_ce: export OVERLEAF_CONFIG=$(CFG_SERVER_CE) test_acceptance_app_server_pro: export COMPOSE_PROJECT_NAME=acceptance_test_server_pro_$(BUILD_DIR_NAME) -test_acceptance_app_server_pro: export SHARELATEX_CONFIG=$(CFG_SERVER_PRO) +test_acceptance_app_server_pro: export OVERLEAF_CONFIG=$(CFG_SERVER_PRO) $(TEST_ACCEPTANCE_APP): $(DOCKER_COMPOSE) down -v -t 0 @@ -197,8 +197,8 @@ $(TEST_ACCEPTANCE_APP): # add a dependency on each modules Makefile and cross-link that to the # template at the very top of this file. # Example: `web$ make modules/server-ce-scripts/test_acceptance_server_ce` -# Description: Run the acceptance tests of the server-ce-scripts module in a -# Server CE Environment. +# Description: Run the acceptance tests of the server-ce-scripts module in an +# Overleaf Community Edition Environment. # Break down: # Target: modules/server-ce-scripts/test_acceptance_server_ce # -> depends on modules/server-ce-scripts/Makefile @@ -261,7 +261,7 @@ test_acceptance_module_maybe_in_server_pro: export BASE_CONFIG=$(CFG_SERVER_PRO) # service would start mongo/redis. $(TEST_ACCEPTANCE_MODULE_MAYBE_IN): test_acceptance_module_maybe_in_%: $(MAKE) $(shell \ - SHARELATEX_CONFIG=$(BASE_CONFIG) \ + OVERLEAF_CONFIG=$(BASE_CONFIG) \ $(DOCKER_COMPOSE) run --rm test_unit \ node test/acceptance/getModuleTargets test_acceptance_$* \ | grep -e /$(MODULE_NAME)/ || echo test_acceptance_module_noop LABEL=$* \ @@ -285,7 +285,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_INNER = $(MODULE_DIRS:=/test_acceptance_merged_in $(TEST_ACCEPTANCE_MODULES_MERGED_INNER): %/test_acceptance_merged_inner: %/Makefile test_acceptance_modules_merged_inner: $(MAKE) $(shell \ - SHARELATEX_CONFIG=$(BASE_CONFIG) \ + OVERLEAF_CONFIG=$(BASE_CONFIG) \ node test/acceptance/getModuleTargets test_acceptance_merged_inner \ ) @@ -308,7 +308,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_INNER_SPLIT = \ # Finally we check with grep for any targets in a batch and print a fallback if none were found. $(TEST_ACCEPTANCE_MODULES_MERGED_INNER_SPLIT): $(MAKE) $(shell \ - SHARELATEX_CONFIG=$(BASE_CONFIG) \ + OVERLEAF_CONFIG=$(BASE_CONFIG) \ node test/acceptance/getModuleTargets test_acceptance_merged_inner \ | tail -n+$(START) | head -n 10 \ | grep -e . || echo no_more_targets \ diff --git a/services/web/Makefile.module b/services/web/Makefile.module index 56f9606fb0..0b5e96ef2a 100644 --- a/services/web/Makefile.module +++ b/services/web/Makefile.module @@ -3,7 +3,7 @@ MODULE_NAME := $(notdir $(shell pwd)) MODULE_DIR := modules/$(MODULE_NAME) PROJECT_NAME = web -export SHARELATEX_CONFIG = /overleaf/services/web/$(MODULE_DIR)/test/acceptance/config/settings.test.js +export OVERLEAF_CONFIG = /overleaf/services/web/$(MODULE_DIR)/test/acceptance/config/settings.test.js export BASE_CONFIG ?= /overleaf/services/web/test/acceptance/config/settings.test.saas.js CFG_SAAS=/overleaf/services/web/test/acceptance/config/settings.test.saas.js diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js index 7afd5720ce..674d005f1b 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js @@ -143,7 +143,7 @@ async function deleteEntity(params) { } async function createProject(params) { - if (!tpdsUrl) return // Server CE/Pro + if (!tpdsUrl) return // Overleaf Community Edition/Server Pro const { projectId, projectName, ownerId, userId } = params diff --git a/services/web/app/src/infrastructure/mongodb.js b/services/web/app/src/infrastructure/mongodb.js index 7f5a959ddb..0d95a4cd88 100644 --- a/services/web/app/src/infrastructure/mongodb.js +++ b/services/web/app/src/infrastructure/mongodb.js @@ -97,7 +97,7 @@ async function dropTestDatabase() { const dbName = internalDb.databaseName const env = process.env.NODE_ENV - if (dbName !== 'test-sharelatex' || env !== 'test') { + if (dbName !== 'test-overleaf' || env !== 'test') { throw new OError( `Refusing to clear database '${dbName}' in environment '${env}'` ) diff --git a/services/web/app/src/router.js b/services/web/app/src/router.js index fffded3a45..ebc7585cf7 100644 --- a/services/web/app/src/router.js +++ b/services/web/app/src/router.js @@ -1192,11 +1192,11 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { } else if (!Settings.editorIsOpen) { plainTextResponse(res, 'web editor is closed (web)') } else { - plainTextResponse(res, 'web sharelatex is alive (web)') + plainTextResponse(res, 'web is alive (web)') } }) privateApiRouter.get('/status', (req, res) => { - plainTextResponse(res, 'web sharelatex is alive (api)') + plainTextResponse(res, 'web is alive (api)') }) // used by kubernetes health-check and acceptance tests diff --git a/services/web/app/views/_metadata.pug b/services/web/app/views/_metadata.pug index 0a58a6b4fe..cc9349f12b 100644 --- a/services/web/app/views/_metadata.pug +++ b/services/web/app/views/_metadata.pug @@ -37,7 +37,7 @@ else if (settings.overleaf) meta(itemprop="image", content=buildImgPath('ol-brand/overleaf_og_logo.png')) meta(name="image", content=buildImgPath('ol-brand/overleaf_og_logo.png')) else - //- the default image for ShareLaTeX + //- the default image for Overleaf Community Edition/Server Pro meta(itemprop="image", content='/touch-icon-192x192.png') meta(name="image", content='/touch-icon-192x192.png') @@ -67,7 +67,7 @@ else if (settings.overleaf) //- the default image for Overleaf meta(name="twitter:image", content=buildImgPath('ol-brand/overleaf_og_logo.png')) else - //- the default image for ShareLaTeX + //- the default image for Overleaf Community Edition/Server Pro meta(name="twitter:image", content='/touch-icon-192x192.png') //- Open Graph @@ -87,7 +87,7 @@ else if (settings.overleaf) //- the default image for Overleaf meta(property="og:image", content=buildImgPath('ol-brand/overleaf_og_logo.png')) else - //- the default image for ShareLaTeX + //- the default image for Overleaf Community Edition/Server Pro meta(property="og:image", content='/touch-icon-192x192.png') if (metadata && metadata.openGraphType) diff --git a/services/web/app/views/general/account-merge-error.pug b/services/web/app/views/general/account-merge-error.pug deleted file mode 100644 index 795f69c2fa..0000000000 --- a/services/web/app/views/general/account-merge-error.pug +++ /dev/null @@ -1,11 +0,0 @@ -extends ../layout-marketing - -block content - main.content.content-alt#main-content - .container - .row - .col-md-6.col-md-offset-3 - .card - .page-header - h1 Account Access Error - p.text-danger Sorry, an error occurred accessing your account. Please #[a(href="" data-ol-open-contact-form-modal="contact-us") contact support] and provide any email addresses that you have used to sign in to Overleaf and/or ShareLaTeX for assistance. diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug index fe2e0f4113..87ec7affc6 100644 --- a/services/web/app/views/layout-base.pug +++ b/services/web/app/views/layout-base.pug @@ -39,9 +39,6 @@ html( meta(name="ol-baseAssetPath" content=buildBaseAssetPath()) meta(name="ol-usersEmail" content=getUserEmail()) - meta(name="ol-sharelatex" data-type="json" content={ - siteUrl: settings.siteUrl, - }) meta(name="ol-ab" data-type="json" content={}) meta(name="ol-user_id" content=getLoggedInUserId()) //- Internationalisation settings @@ -60,13 +57,6 @@ html( indexes: settings.algolia.indexes }) - if (typeof(settings.templates) != "undefined") - meta(name="ol-sharelatex.templates" data-type="json" content={ - user_id : settings.templates.user_id, - cdnDomain : settings.templates.cdnDomain, - indexName : settings.templates.indexName - }) - meta(name="ol-isManagedAccount" data-type="boolean" content=isManagedAccount) each restriction in userRestrictions || [] meta(name='ol-cannot-' + restriction data-type="boolean" content=true) diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 923d76d12f..d1ed9ac34f 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -287,7 +287,7 @@ module.exports = { splitTests: [], - // Where your instance of ShareLaTeX can be found publically. Used in emails + // Where your instance of Overleaf Community Edition/Server Pro can be found publicly. Used in emails // that are sent out, generated links, etc. siteUrl: (siteUrl = process.env.PUBLIC_URL || 'http://localhost:3000'), @@ -317,7 +317,7 @@ module.exports = { // use full domain for cookies to only be accessible from that domain, // replace subdomain with dot to have them accessible on all subdomains cookieDomain: process.env.COOKIE_DOMAIN, - cookieName: process.env.COOKIE_NAME || 'sharelatex.sid', + cookieName: process.env.COOKIE_NAME || 'overleaf.sid', cookieRollingSession: true, // this is only used if cookies are used for clsi backend @@ -526,7 +526,7 @@ module.exports = { // Email support // ------------- // - // ShareLaTeX uses nodemailer (http://www.nodemailer.com/) to send transactional emails. + // Overleaf uses nodemailer (http://www.nodemailer.com/) to send transactional emails. // To see the range of transport and options they support, see http://www.nodemailer.com/docs/transports // email: // fromAddress: "" @@ -556,7 +556,7 @@ module.exports = { // them. cacheStaticAssets: false, - // If you are running ShareLaTeX over https, set this to true to send the + // If you are running Overleaf over https, set this to true to send the // cookie with a secure flag (recommended). secureCookie: false, @@ -565,7 +565,7 @@ module.exports = { // https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7 sameSiteCookie: 'lax', - // If you are running ShareLaTeX behind a proxy (like Apache, Nginx, etc) + // If you are running Overleaf behind a proxy (like Apache, Nginx, etc) // then set this to true to allow it to correctly detect the forwarded IP // address and http/https protocol information. behindProxy: false, diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index 24ef71a5ff..502a2c4da5 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -15,7 +15,7 @@ services: working_dir: /overleaf/services/web environment: BASE_CONFIG: - SHARELATEX_CONFIG: + OVERLEAF_CONFIG: NODE_OPTIONS: "--unhandled-rejections=strict" test_acceptance: @@ -27,7 +27,7 @@ services: env_file: docker-compose.common.env environment: BASE_CONFIG: - SHARELATEX_CONFIG: + OVERLEAF_CONFIG: extra_hosts: - 'www.overleaf.test:127.0.0.1' command: npm run test:acceptance:app @@ -97,5 +97,5 @@ services: image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test environment: SAML_BASE_URL_PATH: 'http://saml/simplesaml/' - SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml' + SAML_TEST_SP_ENTITY_ID: 'overleaf-test-saml' SAML_TEST_SP_LOCATION: 'http://www.overleaf.test:23000/saml/callback' diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env index 8568c6f720..9e2e1ce26f 100644 --- a/services/web/docker-compose.common.env +++ b/services/web/docker-compose.common.env @@ -4,7 +4,7 @@ WEB_PORT=23000 REDIS_HOST=redis QUEUES_REDIS_HOST=redis ANALYTICS_QUEUES_REDIS_HOST=redis -MONGO_URL=mongodb://mongo/test-sharelatex +MONGO_URL=mongodb://mongo/test-overleaf SHARELATEX_ALLOW_PUBLIC_ACCESS=true LINKED_URL_PROXY=http://localhost:6543 ENABLED_LINKED_FILE_TYPES=url,project_file,project_output_file,mendeley,zotero @@ -31,7 +31,7 @@ SHARELATEX_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true # Server-Pro SAML SHARELATEX_SAML_ENTRYPOINT=http://saml/simplesaml/saml2/idp/SSOService.php SHARELATEX_SAML_CALLBACK_URL=http://saml/saml/callback -SHARELATEX_SAML_ISSUER=sharelatex-test-saml +SHARELATEX_SAML_ISSUER=overleaf-test-saml SHARELATEX_SAML_IDENTITY_SERVICE_NAME="SAML Test Server" SHARELATEX_SAML_EMAIL_FIELD=email SHARELATEX_SAML_FIRST_NAME_FIELD=givenName diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index af4ff6b0a4..f39b22e92d 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -14,7 +14,7 @@ services: working_dir: /overleaf/services/web environment: BASE_CONFIG: - SHARELATEX_CONFIG: + OVERLEAF_CONFIG: MOCHA_GREP: ${MOCHA_GREP} NODE_OPTIONS: "--unhandled-rejections=strict" command: npm run --silent test:unit:app @@ -31,7 +31,7 @@ services: env_file: docker-compose.common.env environment: BASE_CONFIG: - SHARELATEX_CONFIG: + OVERLEAF_CONFIG: MOCHA_GREP: ${MOCHA_GREP} MONGO_SERVER_SELECTION_TIMEOUT: 600000 MONGO_SOCKET_TIMEOUT: 300000 @@ -96,5 +96,5 @@ services: image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test environment: SAML_BASE_URL_PATH: 'http://saml/simplesaml/' - SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml' + SAML_TEST_SP_ENTITY_ID: 'overleaf-test-saml' SAML_TEST_SP_LOCATION: 'http://www.overleaf.test:23000/saml/callback' diff --git a/services/web/frontend/js/base.js b/services/web/frontend/js/base.js index 029ea16d9a..5efb29fc29 100644 --- a/services/web/frontend/js/base.js +++ b/services/web/frontend/js/base.js @@ -25,7 +25,7 @@ import getMeta from './utils/meta' import { configureMathJax } from './features/mathjax/configure' const App = angular - .module('SharelatexApp', [ + .module('OverleafApp', [ 'ui.bootstrap', 'RecursionHelper', 'ngSanitize', diff --git a/services/web/frontend/js/ide.js b/services/web/frontend/js/ide.js index cb331cadd7..0114740368 100644 --- a/services/web/frontend/js/ide.js +++ b/services/web/frontend/js/ide.js @@ -397,7 +397,7 @@ If the project has been renamed please look in your project list for a new proje cleanupServiceWorker() -angular.module('SharelatexApp').config([ +angular.module('OverleafApp').config([ '$provide', function ($provide) { $provide.decorator('$browser', [ @@ -413,7 +413,7 @@ angular.module('SharelatexApp').config([ }, ]) -export default angular.bootstrap(document.body, ['SharelatexApp']) +export default angular.bootstrap(document.body, ['OverleafApp']) function __guard__(value, transform) { return typeof value !== 'undefined' && value !== null diff --git a/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogsHints.jsx b/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogsHints.jsx index 50909a12db..2e0bbae99c 100644 --- a/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogsHints.jsx +++ b/services/web/frontend/js/ide/human-readable-logs/HumanReadableLogsHints.jsx @@ -260,7 +260,7 @@ const hints = { <> The compiler cannot find the file you want to include. Make sure that you have{' '} - + uploaded the file {' '} and{' '} diff --git a/services/web/frontend/js/main.js b/services/web/frontend/js/main.js index fbb23356a7..74a95144aa 100644 --- a/services/web/frontend/js/main.js +++ b/services/web/frontend/js/main.js @@ -19,7 +19,7 @@ import './features/cookie-banner' import '../../modules/modules-main' import './cdn-load-test' // TODO: remove this? import { debugConsole } from '@/utils/debugging' -angular.module('SharelatexApp').config([ +angular.module('OverleafApp').config([ '$locationProvider', function ($locationProvider) { try { @@ -33,4 +33,4 @@ angular.module('SharelatexApp').config([ } }, ]) -export default angular.bootstrap(document.body, ['SharelatexApp']) +export default angular.bootstrap(document.body, ['OverleafApp']) diff --git a/services/web/frontend/stylesheets/app/templates-v2.less b/services/web/frontend/stylesheets/app/templates-v2.less index 89f9205c91..9fb6f56276 100644 --- a/services/web/frontend/stylesheets/app/templates-v2.less +++ b/services/web/frontend/stylesheets/app/templates-v2.less @@ -83,7 +83,7 @@ } .caption { - // Override ShareLatex template styles + // Override Server Pro template styles background: none; border: none; text-align: center; diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less index 60f86e2760..177aa2025f 100644 --- a/services/web/frontend/stylesheets/main-style.less +++ b/services/web/frontend/stylesheets/main-style.less @@ -94,7 +94,7 @@ // ngTagsInput @import 'components/tags-input.less'; -// ShareLaTeX app classes +// Overleaf app classes @import 'app/base.less'; @import 'app/account-settings.less'; @import 'app/beta-program.less'; diff --git a/services/web/install_deps.sh b/services/web/install_deps.sh index 7ff6a88e05..aea341bf49 100755 --- a/services/web/install_deps.sh +++ b/services/web/install_deps.sh @@ -1,5 +1,5 @@ #!/bin/bash -SHARELATEX_CONFIG=/overleaf/services/web/config/settings.webpack.js npm run webpack:production & WEBPACK=$! +OVERLEAF_CONFIG=/overleaf/services/web/config/settings.webpack.js npm run webpack:production & WEBPACK=$! wait $WEBPACK && echo "Webpack complete" || exit 1 diff --git a/services/web/local-dev.env b/services/web/local-dev.env index a2193da48c..cfaead60f4 100644 --- a/services/web/local-dev.env +++ b/services/web/local-dev.env @@ -15,7 +15,7 @@ COOKIE_DOMAIN=.dev-overleaf.com PUBLIC_URL=https://www.dev-overleaf.com CURRENT_IMAGE_NAME=texlive-full:2021.1 LINKED_URL_PROXY=http://127.0.0.1:8081/proxy/secret-proxy-token -SHARELATEX_CONFIG=$(pwd)/../../config/settings.web.js +OVERLEAF_CONFIG=$(pwd)/../../config/settings.web.js ENABLE_PDF_CACHING=true HAVE_I_BEEN_PWNED_ENABLED=true NODE_ENV=development diff --git a/services/web/local-test.env b/services/web/local-test.env index 8417e1b4f8..30f0985480 100644 --- a/services/web/local-test.env +++ b/services/web/local-test.env @@ -7,7 +7,7 @@ PUBSUB_REDIS_HOST=127.0.0.1 RATELIMITER_REDIS_HOST=127.0.0.1 GCLOUD_2_REDIS_HOST=127.0.0.1 POSTGRES_HOST=127.0.0.1 -MONGO_URL=mongodb://127.0.0.1/test-sharelatex?directConnection=true +MONGO_URL=mongodb://127.0.0.1/test-overleaf?directConnection=true SHARELATEX_LDAP_URL=ldap://127.0.0.1:22389 SAML_BASE_URL_PATH=http://127.0.0.1:22280/simplesaml/ SHARELATEX_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php diff --git a/services/web/package.json b/services/web/package.json index 6892d23b9e..b363ce9551 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -30,8 +30,8 @@ "extract-translations": "i18next-scanner", "migrations": "MONGO_SOCKET_TIMEOUT=0 east", "convert-themes": "node frontend/js/features/source-editor/themes/scripts/convert.js", - "cypress:open-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress open --component", - "cypress:run-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress run --component --browser chrome", + "cypress:open-ct": "OVERLEAF_CONFIG=$PWD/config/settings.webpack.js cypress open --component", + "cypress:run-ct": "OVERLEAF_CONFIG=$PWD/config/settings.webpack.js cypress run --component --browser chrome", "cypress:docker:open-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker compose -f docker-compose.cypress.yml run --rm cypress run cypress:open-ct", "cypress:docker:run-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker compose -f docker-compose.cypress.yml run --rm cypress run cypress:run-ct --browser chrome", "lezer-latex:generate": "node scripts/lezer-latex/generate.js", @@ -41,12 +41,12 @@ "routes": "bin/routes", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", - "local:nodemon": "set -a;. ../../config/dev-environment.env;. ./docker-compose.common.env;. ../../config/local-dev.env;. ./local-dev.env;. ../../config/local.env; set +a; echo $SHARELATEX_CONFIG; WEB_PORT=13000 LISTEN_ADDRESS=0.0.0.0 npm run nodemon", - "local:webpack": "set -a;. ../../config/dev-environment.env;. ./docker-compose.common.env;. ../../config/local-dev.env;. ./local-dev.env;. ../../config/local.env; set +a; PORT=13808 SHARELATEX_CONFIG=$(pwd)/config/settings.webpack.js npm run webpack", + "local:nodemon": "set -a;. ../../config/dev-environment.env;. ./docker-compose.common.env;. ../../config/local-dev.env;. ./local-dev.env;. ../../config/local.env; set +a; echo $OVERLEAF_CONFIG; WEB_PORT=13000 LISTEN_ADDRESS=0.0.0.0 npm run nodemon", + "local:webpack": "set -a;. ../../config/dev-environment.env;. ./docker-compose.common.env;. ../../config/local-dev.env;. ./local-dev.env;. ../../config/local.env; set +a; PORT=13808 OVERLEAF_CONFIG=$(pwd)/config/settings.webpack.js npm run webpack", "local:test:acceptance:run_dir": "set -a;. $(pwd)/docker-compose.common.env;. $(pwd)/local-test.env; set +a; npm run test:acceptance:run_dir", - "local:test:acceptance:run_app": "SHARELATEX_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js npm run local:test:acceptance:run_dir -- $(pwd)/test/acceptance/src", - "local:test:acceptance:run_module": "if [ ! -d $(pwd)/modules/${MODULE}/test/acceptance ]; then echo \"Module '${MODULE}' does not have acceptance tests\"; exit 0; fi; SHARELATEX_CONFIG=$(pwd)/modules/${MODULE}/test/acceptance/config/settings.test.js BASE_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js npm run local:test:acceptance:run_dir -- $(pwd)/modules/${MODULE}/test/acceptance", - "local:test:acceptance:run_modules": "SHARELATEX_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js node $(pwd)/test/acceptance/getModuleTargets --name-only | xargs -n1 sh -c 'MODULE=$0 npm run local:test:acceptance:run_module || exit 255' $1", + "local:test:acceptance:run_app": "OVERLEAF_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js npm run local:test:acceptance:run_dir -- $(pwd)/test/acceptance/src", + "local:test:acceptance:run_module": "if [ ! -d $(pwd)/modules/${MODULE}/test/acceptance ]; then echo \"Module '${MODULE}' does not have acceptance tests\"; exit 0; fi; OVERLEAF_CONFIG=$(pwd)/modules/${MODULE}/test/acceptance/config/settings.test.js BASE_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js npm run local:test:acceptance:run_dir -- $(pwd)/modules/${MODULE}/test/acceptance", + "local:test:acceptance:run_modules": "OVERLEAF_CONFIG=$(pwd)/test/acceptance/config/settings.test.${OVERLEAF_APP}.js node $(pwd)/test/acceptance/getModuleTargets --name-only | xargs -n1 sh -c 'MODULE=$0 npm run local:test:acceptance:run_module || exit 255' $1", "local:test:acceptance:app:saas": "OVERLEAF_APP=saas npm run local:test:acceptance:run_app", "local:test:acceptance:app:server-pro": "OVERLEAF_APP=server-pro npm run local:test:acceptance:run_app", "local:test:acceptance:app:server-ce": "OVERLEAF_APP=server-ce npm run local:test:acceptance:run_app", diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js index 0a97b318d5..48c4b10ff6 100644 --- a/services/web/test/acceptance/config/settings.test.defaults.js +++ b/services/web/test/acceptance/config/settings.test.defaults.js @@ -2,7 +2,7 @@ const { merge } = require('@overleaf/settings/merge') let features -const httpAuthUser = 'sharelatex' +const httpAuthUser = 'overleaf' const httpAuthPass = 'password' const httpAuthUsers = {} httpAuthUsers[httpAuthUser] = httpAuthPass diff --git a/services/web/test/acceptance/config/settings.test.saas.js b/services/web/test/acceptance/config/settings.test.saas.js index 1b5c30fb94..b3ff8462b3 100644 --- a/services/web/test/acceptance/config/settings.test.saas.js +++ b/services/web/test/acceptance/config/settings.test.saas.js @@ -2,7 +2,7 @@ const { merge } = require('@overleaf/settings/merge') const baseApp = require('../../../config/settings.overrides.saas') const baseTest = require('./settings.test.defaults') -const httpAuthUser = 'sharelatex' +const httpAuthUser = 'overleaf' const httpAuthPass = 'password' const httpAuthUsers = {} httpAuthUsers[httpAuthUser] = httpAuthPass diff --git a/services/web/test/acceptance/src/ApiClsiTests.js b/services/web/test/acceptance/src/ApiClsiTests.js index 47ba7e148b..d6581c6fb2 100644 --- a/services/web/test/acceptance/src/ApiClsiTests.js +++ b/services/web/test/acceptance/src/ApiClsiTests.js @@ -15,7 +15,7 @@ const { expect } = require('chai') const request = require('./helpers/request') const Settings = require('@overleaf/settings') -const auth = Buffer.from('sharelatex:password').toString('base64') +const auth = Buffer.from('overleaf:password').toString('base64') const authedRequest = request.defaults({ headers: { Authorization: `Basic ${auth}`, diff --git a/services/web/test/acceptance/src/PrimaryEmailCheckTests.js b/services/web/test/acceptance/src/PrimaryEmailCheckTests.js index 4d2d16b2b7..943baaa825 100644 --- a/services/web/test/acceptance/src/PrimaryEmailCheckTests.js +++ b/services/web/test/acceptance/src/PrimaryEmailCheckTests.js @@ -13,7 +13,7 @@ describe('PrimaryEmailCheck', function () { ) }) - describe('redirections in Server CE/Pro', function () { + describe('redirections in Overleaf Community Edition/Server Pro', function () { before(async function () { if (Features.hasFeature('saas')) { this.skip() diff --git a/services/web/test/acceptance/src/TagsTests.js b/services/web/test/acceptance/src/TagsTests.js index 401cfb4397..731a06c643 100644 --- a/services/web/test/acceptance/src/TagsTests.js +++ b/services/web/test/acceptance/src/TagsTests.js @@ -133,7 +133,7 @@ describe('Tags', function () { }) describe('get tags via api', function () { - const auth = Buffer.from('sharelatex:password').toString('base64') + const auth = Buffer.from('overleaf:password').toString('base64') const authedRequest = request.defaults({ headers: { Authorization: `Basic ${auth}`, diff --git a/services/web/test/acceptance/src/TpdsUpdateTests.js b/services/web/test/acceptance/src/TpdsUpdateTests.js index 877df410b8..4cd2ebd235 100644 --- a/services/web/test/acceptance/src/TpdsUpdateTests.js +++ b/services/web/test/acceptance/src/TpdsUpdateTests.js @@ -31,7 +31,7 @@ describe('TpdsUpdateTests', function () { method: 'POST', url: `/project/${this.projectId}/contents/test.tex`, auth: { - username: 'sharelatex', + username: 'overleaf', password: 'password', sendImmediately: true, }, @@ -67,7 +67,7 @@ describe('TpdsUpdateTests', function () { method: 'DELETE', url: `/project/${this.projectId}/contents/main.tex`, auth: { - username: 'sharelatex', + username: 'overleaf', password: 'password', sendImmediately: true, }, @@ -105,7 +105,7 @@ describe('TpdsUpdateTests', function () { method: 'POST', url: `/user/${this.owner._id}/update/test-project/other.tex`, auth: { - username: 'sharelatex', + username: 'overleaf', password: 'password', sendImmediately: true, }, @@ -153,7 +153,7 @@ describe('TpdsUpdateTests', function () { method: 'POST', url: `/user/${this.owner._id}/update/test-project/test.tex`, auth: { - username: 'sharelatex', + username: 'overleaf', password: 'password', sendImmediately: true, }, diff --git a/services/web/test/frontend/bootstrap.js b/services/web/test/frontend/bootstrap.js index 8e9b39fe34..8f7eec183e 100644 --- a/services/web/test/frontend/bootstrap.js +++ b/services/web/test/frontend/bootstrap.js @@ -12,7 +12,7 @@ require('jsdom-global')(undefined, { }) const path = require('path') -process.env.SHARELATEX_CONFIG = path.resolve( +process.env.OVERLEAF_CONFIG = path.resolve( __dirname, '../../config/settings.webpack.js' ) diff --git a/services/web/test/frontend/features/source-editor/languages/latex/latex-linter.test.ts b/services/web/test/frontend/features/source-editor/languages/latex/latex-linter.test.ts index a83715bb72..cbfce9e145 100644 --- a/services/web/test/frontend/features/source-editor/languages/latex/latex-linter.test.ts +++ b/services/web/test/frontend/features/source-editor/languages/latex/latex-linter.test.ts @@ -220,42 +220,42 @@ describe('LatexLinter', function () { it('should accept \\url|...|', function () { const { errors } = Parse( - 'this is text \\url|http://www.sharelatex.com/| and more\n' + 'this is text \\url|http://www.overleaf.com/| and more\n' ) assert.equal(errors.length, 0) }) it('should accept \\url{...}', function () { const { errors } = Parse( - 'this is text \\url{http://www.sharelatex.com/} and more\n' + 'this is text \\url{http://www.overleaf.com/} and more\n' ) assert.equal(errors.length, 0) }) it('should accept \\url{...} with % chars', function () { const { errors } = Parse( - 'this is text \\url{http://www.sharelatex.com/hello%20world} and more\n' + 'this is text \\url{http://www.overleaf.com/hello%20world} and more\n' ) assert.equal(errors.length, 0) }) it('should accept \\href{...}{...}', function () { const { errors } = Parse( - 'this is text \\href{http://www.sharelatex.com/}{test} and more\n' + 'this is text \\href{http://www.overleaf.com/}{test} and more\n' ) assert.equal(errors.length, 0) }) it('should accept \\href{...}{...} with dollarsign in url', function () { const { errors } = Parse( - 'this is text \\href{http://www.sharelatex.com/foo=$bar}{test} and more\n' + 'this is text \\href{http://www.overleaf.com/foo=$bar}{test} and more\n' ) assert.equal(errors.length, 0) }) it('should not accept \\href|...|{...}', function () { const { errors } = Parse( - 'this is text \\href|http://www.sharelatex.com|{test} and more\n' + 'this is text \\href|http://www.overleaf.com|{test} and more\n' ) assert.equal(errors.length, 1) assert.equal(errors[0].text, 'invalid href command') @@ -264,7 +264,7 @@ describe('LatexLinter', function () { it('should catch error in text argument of \\href{...}{...}', function () { const { errors } = Parse( - 'this is text \\href{http://www.sharelatex.com/foo=$bar}{i have made an $error} and more\n' + 'this is text \\href{http://www.overleaf.com/foo=$bar}{i have made an $error} and more\n' ) assert.equal(errors.length, 2) assert.equal(errors[0].text, 'unclosed $ found at close group }') diff --git a/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js b/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js index 0a162be059..b7765063a6 100644 --- a/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js +++ b/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js @@ -481,7 +481,7 @@ describe('AuthenticationController', function () { beforeEach(function () { this.user = { _id: 'user-id-123', - email: 'user@sharelatex.com', + email: 'user@overleaf.com', } this.middleware = this.AuthenticationController.requireLogin() }) @@ -491,7 +491,7 @@ describe('AuthenticationController', function () { this.req.session = { user: (this.user = { _id: 'user-id-123', - email: 'user@sharelatex.com', + email: 'user@overleaf.com', }), } this.middleware(this.req, this.res, this.next) @@ -524,7 +524,7 @@ describe('AuthenticationController', function () { beforeEach(function () { this.user = { _id: 'user-id-123', - email: 'user@sharelatex.com', + email: 'user@overleaf.com', } this.middleware = this.AuthenticationController.validateUserSession() }) diff --git a/services/web/test/unit/src/Authentication/AuthenticationManagerTests.js b/services/web/test/unit/src/Authentication/AuthenticationManagerTests.js index 3dfbd82630..9b9d89cf4a 100644 --- a/services/web/test/unit/src/Authentication/AuthenticationManagerTests.js +++ b/services/web/test/unit/src/Authentication/AuthenticationManagerTests.js @@ -63,7 +63,7 @@ describe('AuthenticationManager', function () { beforeEach(function () { this.user = { _id: 'user-id', - email: (this.email = 'USER@sharelatex.com'), + email: (this.email = 'USER@overleaf.com'), } this.user.hashedPassword = this.testPassword this.User.findOne = sinon.stub().callsArgWith(1, null, this.user) @@ -194,7 +194,7 @@ describe('AuthenticationManager', function () { beforeEach(function () { this.user = { _id: '5c8791477192a80b5e76ca7e', - email: (this.email = 'USER@sharelatex.com'), + email: (this.email = 'USER@overleaf.com'), } this.db.users.updateOne = sinon this.User.findOne = sinon.stub().callsArgWith(1, null, this.user) @@ -249,7 +249,7 @@ describe('AuthenticationManager', function () { beforeEach(function () { this.user = { _id: 'user-id', - email: (this.email = 'USER@sharelatex.com'), + email: (this.email = 'USER@overleaf.com'), } this.unencryptedPassword = 'banana' this.User.findOne = sinon.stub().callsArgWith(1, null, this.user) diff --git a/services/web/test/unit/src/Chat/ChatApiHandlerTests.js b/services/web/test/unit/src/Chat/ChatApiHandlerTests.js index 594b9606a1..88f2006adc 100644 --- a/services/web/test/unit/src/Chat/ChatApiHandlerTests.js +++ b/services/web/test/unit/src/Chat/ChatApiHandlerTests.js @@ -25,7 +25,7 @@ describe('ChatApiHandler', function () { this.settings = { apis: { chat: { - internal_url: 'chat.sharelatex.env', + internal_url: 'chat.overleaf.env', }, }, } diff --git a/services/web/test/unit/src/Contact/ContactManagerTests.js b/services/web/test/unit/src/Contact/ContactManagerTests.js index 75048dcb1f..5d6029c7a2 100644 --- a/services/web/test/unit/src/Contact/ContactManagerTests.js +++ b/services/web/test/unit/src/Contact/ContactManagerTests.js @@ -17,7 +17,7 @@ describe('ContactManager', function () { '@overleaf/settings': (this.settings = { apis: { contacts: { - url: 'http://contacts.sharelatex.com', + url: 'http://contacts.overleaf.com', }, }, }), diff --git a/services/web/test/unit/src/Docstore/DocstoreManagerTests.js b/services/web/test/unit/src/Docstore/DocstoreManagerTests.js index 20f1e4c1ea..2995f90baf 100644 --- a/services/web/test/unit/src/Docstore/DocstoreManagerTests.js +++ b/services/web/test/unit/src/Docstore/DocstoreManagerTests.js @@ -15,7 +15,7 @@ describe('DocstoreManager', function () { '@overleaf/settings': (this.settings = { apis: { docstore: { - url: 'docstore.sharelatex.com', + url: 'docstore.overleaf.com', }, }, }), diff --git a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js index 5ed9b0f02f..52f2ac3e40 100644 --- a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js +++ b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js @@ -30,7 +30,7 @@ describe('FileStoreHandler', function () { this.readStream = { my: 'readStream', on: sinon.stub() } this.request = sinon.stub() this.request.head = sinon.stub() - this.filestoreUrl = 'http://filestore.sharelatex.test' + this.filestoreUrl = 'http://filestore.overleaf.test' this.settings = { apis: { filestore: { url: this.filestoreUrl } }, } diff --git a/services/web/test/unit/src/Notifications/NotificationsHandlerTests.js b/services/web/test/unit/src/Notifications/NotificationsHandlerTests.js index b8fd9c49f1..5eb431f522 100644 --- a/services/web/test/unit/src/Notifications/NotificationsHandlerTests.js +++ b/services/web/test/unit/src/Notifications/NotificationsHandlerTests.js @@ -23,7 +23,7 @@ const _ = require('lodash') describe('NotificationsHandler', function () { const userId = '123nd3ijdks' const notificationId = '123njdskj9jlk' - const notificationUrl = 'notification.sharelatex.testing' + const notificationUrl = 'notification.overleaf.testing' beforeEach(function () { this.request = sinon.stub().callsArgWith(1) diff --git a/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js b/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js index 93ba9895e2..ff72689d9f 100644 --- a/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js +++ b/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js @@ -55,8 +55,8 @@ describe('ProjectEditorHandler', function () { user: (this.owner = { _id: 'owner-id', first_name: 'Owner', - last_name: 'ShareLaTeX', - email: 'owner@sharelatex.com', + last_name: 'Overleaf', + email: 'owner@overleaf.com', }), privilegeLevel: 'owner', }, @@ -65,7 +65,7 @@ describe('ProjectEditorHandler', function () { _id: 'read-only-id', first_name: 'Read', last_name: 'Only', - email: 'read-only@sharelatex.com', + email: 'read-only@overleaf.com', }, privilegeLevel: 'readOnly', }, @@ -74,7 +74,7 @@ describe('ProjectEditorHandler', function () { _id: 'read-write-id', first_name: 'Read', last_name: 'Write', - email: 'read-write@sharelatex.com', + email: 'read-write@overleaf.com', }, privilegeLevel: 'readAndWrite', }, @@ -135,9 +135,9 @@ describe('ProjectEditorHandler', function () { it('should include the owner', function () { expect(this.result.owner).to.exist this.result.owner._id.should.equal('owner-id') - this.result.owner.email.should.equal('owner@sharelatex.com') + this.result.owner.email.should.equal('owner@overleaf.com') this.result.owner.first_name.should.equal('Owner') - this.result.owner.last_name.should.equal('ShareLaTeX') + this.result.owner.last_name.should.equal('Overleaf') this.result.owner.privileges.should.equal('owner') }) @@ -169,16 +169,14 @@ describe('ProjectEditorHandler', function () { findMember('read-only-id').privileges.should.equal('readOnly') findMember('read-only-id').first_name.should.equal('Read') findMember('read-only-id').last_name.should.equal('Only') - findMember('read-only-id').email.should.equal( - 'read-only@sharelatex.com' - ) + findMember('read-only-id').email.should.equal('read-only@overleaf.com') expect(findMember('read-write-id')).to.exist findMember('read-write-id').privileges.should.equal('readAndWrite') findMember('read-write-id').first_name.should.equal('Read') findMember('read-write-id').last_name.should.equal('Write') findMember('read-write-id').email.should.equal( - 'read-write@sharelatex.com' + 'read-write@overleaf.com' ) }) diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js index 9c60011a60..299abe345f 100644 --- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js +++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js @@ -106,7 +106,7 @@ describe('SubscriptionController', function () { subdomain: 'sl', }, }, - siteUrl: 'http://de.sharelatex.dev:3000', + siteUrl: 'http://de.overleaf.dev:3000', } this.AuthorizationManager = { promises: { diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js index d5f578c9ec..164d79ce0f 100644 --- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js +++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js @@ -58,7 +58,7 @@ describe('SubscriptionGroupHandler', function () { findOne: sinon.stub().yields(), } - this.settings = { siteUrl: 'http://www.sharelatex.com' } + this.settings = { siteUrl: 'http://www.overleaf.com' } this.readStub = sinon.stub() this.NotificationsBuilder = { diff --git a/services/web/test/unit/src/Templates/TemplatesManagerTests.js b/services/web/test/unit/src/Templates/TemplatesManagerTests.js index af9436f15c..930b550276 100644 --- a/services/web/test/unit/src/Templates/TemplatesManagerTests.js +++ b/services/web/test/unit/src/Templates/TemplatesManagerTests.js @@ -83,7 +83,7 @@ describe('TemplatesManager', function () { apis: { v1: { url: (this.v1Url = 'http://overleaf.com'), - user: 'sharelatex', + user: 'overleaf', pass: 'password', }, }, diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js index 41c83c7aa6..8511d05e94 100644 --- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js +++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js @@ -17,7 +17,7 @@ const projectName = 'project_name_here' const thirdPartyDataStoreApiUrl = 'http://third-party-json-store.herokuapp.com' const siteUrl = 'http://www.localhost:3000' -const filestoreUrl = 'filestore.sharelatex.com' +const filestoreUrl = 'filestore.overleaf.com' describe('TpdsUpdateSender', function () { beforeEach(function () { @@ -34,7 +34,7 @@ describe('TpdsUpdateSender', function () { getInvitedMemberIds: sinon.stub().resolves(this.memberIds), }, } - this.docstoreUrl = 'docstore.sharelatex.env' + this.docstoreUrl = 'docstore.overleaf.env' this.response = { ok: true, json: sinon.stub(), diff --git a/services/web/test/unit/src/User/UserControllerTests.js b/services/web/test/unit/src/User/UserControllerTests.js index 8409163aa1..8028f3fa6d 100644 --- a/services/web/test/unit/src/User/UserControllerTests.js +++ b/services/web/test/unit/src/User/UserControllerTests.js @@ -82,7 +82,7 @@ describe('UserController', function () { }, } - this.settings = { siteUrl: 'sharelatex.example.com' } + this.settings = { siteUrl: 'overleaf.example.com' } this.UserHandler = { promises: { populateTeamInvites: sinon.stub().resolves() }, diff --git a/services/web/test/unit/src/User/UserInfoControllerTests.js b/services/web/test/unit/src/User/UserInfoControllerTests.js index 48040a516b..89e1f65242 100644 --- a/services/web/test/unit/src/User/UserInfoControllerTests.js +++ b/services/web/test/unit/src/User/UserInfoControllerTests.js @@ -30,7 +30,7 @@ describe('UserInfoController', function () { }) describe('getPersonalInfo', function () { - describe('when the user exists with sharelatex id', function () { + describe('when the user exists with mongo id', function () { beforeEach(function () { this.user_id = new ObjectId().toString() this.user = { _id: new ObjectId(this.user_id) } @@ -107,7 +107,7 @@ describe('UserInfoController', function () { _id: new ObjectId(), first_name: 'Douglas', last_name: 'Adams', - email: 'doug@sharelatex.com', + email: 'doug@overleaf.com', } this.formattedInfo = { id: this.user._id.toString(), @@ -129,7 +129,7 @@ describe('UserInfoController', function () { _id: new ObjectId(), first_name: 'Douglas', last_name: 'Adams', - email: 'doug@sharelatex.com', + email: 'doug@overleaf.com', password: 'should-not-get-included', signUpDate: new Date(), role: 'student', diff --git a/services/web/test/unit/src/infrastructure/TranslationsTests.js b/services/web/test/unit/src/infrastructure/TranslationsTests.js index 66d13e750f..d957bd9885 100644 --- a/services/web/test/unit/src/infrastructure/TranslationsTests.js +++ b/services/web/test/unit/src/infrastructure/TranslationsTests.js @@ -18,9 +18,9 @@ describe('Translations', function () { i18n: { escapeHTMLInVars: false, subdomainLang: { - www: { lngCode: 'en', url: 'https://www.sharelatex.com' }, - fr: { lngCode: 'fr', url: 'https://fr.sharelatex.com' }, - da: { lngCode: 'da', url: 'https://da.sharelatex.com' }, + www: { lngCode: 'en', url: 'https://www.overleaf.com' }, + fr: { lngCode: 'fr', url: 'https://fr.overleaf.com' }, + da: { lngCode: 'da', url: 'https://da.overleaf.com' }, }, }, }, @@ -95,7 +95,7 @@ describe('Translations', function () { describe('setLangBasedOnDomainMiddleware', function () { it('should set the lang to french if the domain is fr', function (done) { - req.headers.host = 'fr.sharelatex.com' + req.headers.host = 'fr.overleaf.com' runMiddlewares(() => { expect(req.lng).to.equal('fr') done() @@ -105,7 +105,7 @@ describe('Translations', function () { describe('suggestedLanguageSubdomainConfig', function () { it('should set suggestedLanguageSubdomainConfig if the detected lang is different to subdomain lang', function (done) { req.headers['accept-language'] = 'da, en-gb;q=0.8, en;q=0.7' - req.headers.host = 'fr.sharelatex.com' + req.headers.host = 'fr.overleaf.com' runMiddlewares(() => { expect(res.locals.suggestedLanguageSubdomainConfig).to.exist expect(res.locals.suggestedLanguageSubdomainConfig.lngCode).to.equal( @@ -117,7 +117,7 @@ describe('Translations', function () { it('should not set suggestedLanguageSubdomainConfig if the detected lang is the same as subdomain lang', function (done) { req.headers['accept-language'] = 'da, en-gb;q=0.8, en;q=0.7' - req.headers.host = 'da.sharelatex.com' + req.headers.host = 'da.overleaf.com' runMiddlewares(() => { expect(res.locals.suggestedLanguageSubdomainConfig).to.not.exist done()