TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 05:37:34 +03:00
Code Issues Projects Releases Wiki Activity

Updated magic link flow to allow changing member's email (#161)

Browse Source 
refs https://github.com/TryGhost/members.js/issues/30

- Updates `sendMagicLink` middleware to allow adding old email address to payload. Checks for if new email address already exists in db before creating magic link, throws error in case of duplicate email.
- Updates magic link parsing for data to check if the intention is to update email address and update member's email to new email address in case its allowed.
- Return session data from magic link using the new email address
This commit is contained in:
Rishabh Garg 2020-05-28 19:37:03 +05:30 committed by GitHub
parent 730ddc2ae6
commit e9b7dacb2e
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ghost/members-api/index.js
View File

@ -96,13 +96,12 @@ module.exports = function MembersApi({
async function getMemberDataFromMagicLinkToken(token) {
const email = await magicLinkService.getUserFromToken(token);
const {labels = [], ip, name = ''} = await magicLinkService.getPayloadFromToken(token);
const {labels = [], ip, name = '', oldEmail} = await magicLinkService.getPayloadFromToken(token);
if (!email) {
return null;
}
const member = await getMemberIdentityData(email);
const member = oldEmail ? await getMemberIdentityData(oldEmail) : await getMemberIdentityData(email);
let geolocation;
if (ip && (!member || !member.geolocation)) {
try {
@ -116,9 +115,16 @@ module.exports = function MembersApi({
}
if (member) {
// user exists but doesn't have geolocation yet so update it
if (geolocation) {
member.geolocation = geolocation;
if (geolocation || oldEmail) {
// user exists but doesn't have geolocation yet so update it
if (geolocation) {
member.geolocation = geolocation;
}
// user exists but wants to change their email address
if (oldEmail) {
member.email = email;
}
await users.update(member, {id: member.id});
return getMemberIdentityData(email);
}
@ -149,7 +155,7 @@ module.exports = function MembersApi({
middleware.sendMagicLink.use(body.json(), async function (req, res) {
const {ip, body} = req;
const {email, emailType} = body;
const {email, emailType, oldEmail} = body;
const payload = {ip};
if (!email) {
@ -158,13 +164,22 @@ module.exports = function MembersApi({
}
try {
if (oldEmail) {
const existingMember = await users.get({email});
if (existingMember) {
throw new common.errors.BadRequestError({
message: 'This email is already associated with a member'
});
}
}
if (!allowSelfSignup) {
const member = await users.get({email});
if (member) {
Object.assign(payload, _.pick(body, ['oldEmail']));
await sendEmailWithMagicLink({email, requestedType: emailType, payload});
}
} else {
Object.assign(payload, _.pick(body, ['labels', 'name']));
Object.assign(payload, _.pick(body, ['labels', 'name', 'oldEmail']));
await sendEmailWithMagicLink({email, requestedType: emailType, payload});
}
res.writeHead(201);