From 2594122fef329fb991f0e926920f4fcf3203b875 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Mon, 25 Jan 2021 13:08:04 +0100
Subject: [PATCH] Hotfix 2.5.2 (#831)

---
 .../hotfix/2.5.2/12_update_token_email.js     | 28 +++++++++++++++++++
 server-ce/hotfix/2.5.2/Dockerfile             |  8 ++++++
 .../2.5.2/create-token-lowercase-email.patch  | 11 ++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 server-ce/hotfix/2.5.2/12_update_token_email.js
 create mode 100644 server-ce/hotfix/2.5.2/Dockerfile
 create mode 100644 server-ce/hotfix/2.5.2/create-token-lowercase-email.patch

diff --git a/server-ce/hotfix/2.5.2/12_update_token_email.js b/server-ce/hotfix/2.5.2/12_update_token_email.js
new file mode 100644
index 0000000000..e4d6e32254
--- /dev/null
+++ b/server-ce/hotfix/2.5.2/12_update_token_email.js
@@ -0,0 +1,28 @@
+const Settings = require('settings-sharelatex')
+const mongojs = require('mongojs')
+const db = mongojs(Settings.mongo.url, ['tokens'])
+const async = require('async')
+
+exports.migrate = (client, done) => {
+  console.log(`>> Updating 'data.email' to lower case in tokens`)
+
+  db.tokens.find({}, { 'data.email': 1 }, (err, tokens) => {
+    if (err) {
+      return done(err)
+    }
+
+    async.eachSeries(
+      tokens,
+      (token, callback) => {
+        db.tokens.update(
+          { _id: token._id },
+          { $set: { 'data.email': token.data.email.toLowerCase() } },
+          callback
+        )
+      },
+      done
+    )
+  })
+}
+
+exports.rollback = (client, done) => done()
diff --git a/server-ce/hotfix/2.5.2/Dockerfile b/server-ce/hotfix/2.5.2/Dockerfile
new file mode 100644
index 0000000000..ddf596deea
--- /dev/null
+++ b/server-ce/hotfix/2.5.2/Dockerfile
@@ -0,0 +1,8 @@
+FROM sharelatex/sharelatex:2.5.1
+
+# Patch: fixes registration token creation
+COPY create-token-lowercase-email.patch ${baseDir}
+RUN cd ${baseDir} && patch -p0 < create-token-lowercase-email.patch
+
+# Migration for tokens with invalid email addresses
+ADD 12_update_token_email.js /var/www/sharelatex/migrations/12_update_token_email.js
diff --git a/server-ce/hotfix/2.5.2/create-token-lowercase-email.patch b/server-ce/hotfix/2.5.2/create-token-lowercase-email.patch
new file mode 100644
index 0000000000..23dfaa3a43
--- /dev/null
+++ b/server-ce/hotfix/2.5.2/create-token-lowercase-email.patch
@@ -0,0 +1,11 @@
+--- /var/www/sharelatex/web/app/src/Features/User/UserRegistrationHandler.js
++++ /var/www/sharelatex/web/app/src/Features/User/UserRegistrationHandler.js
+@@ -122,7 +122,7 @@ const UserRegistrationHandler = {
+         const ONE_WEEK = 7 * 24 * 60 * 60 // seconds
+         OneTimeTokenHandler.getNewToken(
+           'password',
+-          { user_id: user._id.toString(), email },
++          { user_id: user._id.toString(), email: user.email },
+           { expiresIn: ONE_WEEK },
+           (err, token) => {
+             if (err != null) {