diff --git a/backend/src/middleware/email/emailMiddleware.js b/backend/src/middleware/email/emailMiddleware.js index 4096fa83a..f92da3368 100644 --- a/backend/src/middleware/email/emailMiddleware.js +++ b/backend/src/middleware/email/emailMiddleware.js @@ -60,7 +60,6 @@ const sendPasswordResetMail = async (resolve, root, args, context, resolveInfo) const sendEmailVerificationMail = async (resolve, root, args, context, resolveInfo) => { const response = await resolve(root, args, context, resolveInfo) - // TODO: return name in response const { email, nonce, name } = response await sendMail(emailVerificationTemplate({ email, nonce, name })) delete response.nonce diff --git a/backend/src/schema/resolvers/emails.js b/backend/src/schema/resolvers/emails.js index 2c6296627..84b5d7659 100644 --- a/backend/src/schema/resolvers/emails.js +++ b/backend/src/schema/resolvers/emails.js @@ -29,11 +29,14 @@ export default { MATCH (user:User {id: $userId}) MERGE (user)<-[:BELONGS_TO]-(email:EmailAddressRequest {email: $email, nonce: $nonce}) SET email.createdAt = toString(datetime()) - RETURN email + RETURN email, user `, { userId, email, nonce }, ) - return result.records.map(record => record.get('email').properties) + return result.records.map(record => ({ + name: record.get('user').properties.name, + ...record.get('email').properties, + })) }) try { const txResult = await writeTxResultPromise