From 5a4b7401178cf89fd8d8d7537ba198b51d48363f Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Sun, 6 May 2018 14:11:13 +0200 Subject: [PATCH 1/4] Overriding the resetPassword URL instead of removing the included hash after the url was generated by meteor. --- server/lib/accounts.js | 9 ++++----- server/methods/sendForgotPasswordEmail.js | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/lib/accounts.js b/server/lib/accounts.js index 946b0b0f67c..82c8b3c4534 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -67,12 +67,11 @@ Accounts.emailTemplates.verifyEmail.html = function(user, url) { return verifyEmailHtml(user, url); }; -const resetPasswordHtml = Accounts.emailTemplates.resetPassword.text; +Accounts.urls.resetPassword = function(token) { + return Meteor.absoluteUrl('reset-password/' + token); +} -Accounts.emailTemplates.resetPassword.html = function(user, url) { - url = url.replace(/\/#\//, '/'); - return resetPasswordHtml(user, url); -}; +Accounts.emailTemplates.resetPassword.html = Accounts.emailTemplates.resetPassword.text; Accounts.emailTemplates.enrollAccount.subject = function(user = {}) { let subject; diff --git a/server/methods/sendForgotPasswordEmail.js b/server/methods/sendForgotPasswordEmail.js index 54b8f3acec2..07adcdc0dad 100644 --- a/server/methods/sendForgotPasswordEmail.js +++ b/server/methods/sendForgotPasswordEmail.js @@ -22,7 +22,6 @@ Meteor.methods({ }; Accounts.emailTemplates.resetPassword.html = function(userModel, url) { - url = url.replace('/#/', '/'); return html.replace(/\[Forgot_Password_Url]/g, url); }; } From 620c746bb61f9e388970217c88df0c519c1150b6 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 7 May 2018 18:16:17 +0200 Subject: [PATCH 2/4] Update accounts.js Fix lint errors --- server/lib/accounts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/lib/accounts.js b/server/lib/accounts.js index 82c8b3c4534..fc53ca0c886 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -68,8 +68,8 @@ Accounts.emailTemplates.verifyEmail.html = function(user, url) { }; Accounts.urls.resetPassword = function(token) { - return Meteor.absoluteUrl('reset-password/' + token); -} + return Meteor.absoluteUrl('reset-password/${token}'); +}; Accounts.emailTemplates.resetPassword.html = Accounts.emailTemplates.resetPassword.text; From cd9a4f2a097b96cd752334f20bd9dbf9aa2c73c4 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 7 May 2018 18:25:30 +0200 Subject: [PATCH 3/4] Fix lint errors --- server/lib/accounts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/accounts.js b/server/lib/accounts.js index fc53ca0c886..c37abf45e98 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -68,7 +68,7 @@ Accounts.emailTemplates.verifyEmail.html = function(user, url) { }; Accounts.urls.resetPassword = function(token) { - return Meteor.absoluteUrl('reset-password/${token}'); + return Meteor.absoluteUrl(`reset-password/${token}`); }; Accounts.emailTemplates.resetPassword.html = Accounts.emailTemplates.resetPassword.text; From 40717aab542c2de9a24edf80b2d55fb31298ed95 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 7 May 2018 18:32:45 +0200 Subject: [PATCH 4/4] =?UTF-8?q?I=20hope=20that=E2=80=99s=20the=20last=20li?= =?UTF-8?q?nt=20error=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/lib/accounts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/accounts.js b/server/lib/accounts.js index c37abf45e98..a55bb36ff37 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -68,7 +68,7 @@ Accounts.emailTemplates.verifyEmail.html = function(user, url) { }; Accounts.urls.resetPassword = function(token) { - return Meteor.absoluteUrl(`reset-password/${token}`); + return Meteor.absoluteUrl(`reset-password/${ token }`); }; Accounts.emailTemplates.resetPassword.html = Accounts.emailTemplates.resetPassword.text;