(#157) add a 'you signed up with your google account' email #343

ronaldblanco · 2017-12-07T15:49:27Z

Closes the Issue #157 add a 'you signed up with your google account' email.
All changes were locally tested and lint checked.

jspaine · 2017-12-10T21:52:25Z

Hi, it looks good! This one was a bit complicated though because I'm not sure the email needs to be editable, it should just say something like 'you appear to have signed up with google, try logging in with google. if you have any problems send us a message at [email protected]' and can just have default translations (when we get to that). Or what do you think?

Another part of this issue was that the server users password controller should just send a 200 regardless, and the client should show 'an email has been sent to email@address', so the route can't be used to figure out registered users email addresses. You don't have to do this too, I was a bit late for the discussion on the issue but thought it was worth mentioning.

ronaldblanco · 2017-12-11T14:25:44Z

Hello @jspaine; I do not understand what do you mean with: "can just have default translations (when we get to that). Or what do you think?" I did search in the other emails and I do not see any translations options implemented. It is something new do you want me to code?

jspaine · 2017-12-11T22:43:39Z

Hi, I just meant that this email is so simple it's not really worth being editable, and there could just be a standard one. But it makes the code a bit more complicated to make it not editable. I guess we shouldn't worry about it for now and leave it editable.

I'll leave some suggestions in the code, but the context of this is a user enters their email in the forgot password form but they signed up with google so don't have a password and the password reset email wouldn't be appropriate. So I don't think the place you're sending the email from is right, look for how the forgot password form is handled on the server.

common/constants.js

@@ -54,7 +54,8 @@ export const pageIdentifiers = {
  CUSTOMER_UPDATED: 'customer-update',
  DONATION_RECEIVED: 'donation-received',
  DONATION_RECEIPT: 'donation-receipt',
-  PASSWORD_RESET: 'password-reset'
+  PASSWORD_RESET: 'password-reset',
+  GOOGLE_SINGUP: 'google-singup'


server/lib/seed/seed-data.js

+  identifier: pageIdentifiers.GOOGLE_SINGUP,
+  title: 'Google Sined Up',
+  type: pageTypes.EMAIL,
+  subject: '<p>The User Sined Up with Google!</p>',


ronaldblanco · 2017-12-12T20:49:41Z

Hey @jspaine take a look at this.

ronaldblanco · 2017-12-12T21:34:46Z

Check now.
When you think everything it is right I will squash.

server/config/mailer.js

@@ -49,5 +49,7 @@ export default async function sendEmail(
    path: '/v3/mail/send',
    body: mail.toJSON()
  })
+  // console.log(toEmail + '->' + content)
+  // console.log(content)


server/controllers/users/password.js

@@ -29,6 +29,7 @@ export const forgot = async function(req, res) {
  if (!user) {
    throw new ValidationError({email: 'No account with that email has been found'})
  } else if (user.provider !== 'local') {
+    if (user.provider === 'google') await mailer.sendPasswordGoogle(user)


ronaldblanco · 2017-12-13T13:43:26Z

Check now, if it is ok I will clean the code and squash.

server/controllers/users/password.js

@@ -29,9 +29,10 @@ export const forgot = async function(req, res) {
  if (!user) {
    throw new ValidationError({email: 'No account with that email has been found'})


server/controllers/users/password.js

      message: 'It seems like you signed up using your ' + user.provider + ' account'
-    })
+    })*/
  } else {
    user.resetPasswordToken = token
    user.resetPasswordExpires = Date.now() + 3600000 // 1 hour


ronaldblanco · 2017-12-13T23:07:36Z

Check now!

jspaine · 2017-12-13T23:22:06Z

Try to think through it more, the if...else's can be made a bit simpler now. We only want to send an email if there's a user.

mailer.sendPasswordReset needs the password reset url too.

ronaldblanco · 2017-12-14T13:22:54Z

And now??

jspaine · 2017-12-14T18:12:50Z

Yeah that looks good.

ronaldblanco · 2017-12-14T19:00:03Z

It should be ready!
Let me know.

jspaine · 2017-12-16T00:53:07Z

Thanks, looks good!

jspaine reviewed Dec 11, 2017

View reviewed changes

jspaine reviewed Dec 12, 2017

View reviewed changes

jspaine reviewed Dec 13, 2017

View reviewed changes

(freeCodeCamp#157)add a 'you signed up with your google account' email

b25a9fa

ronaldblanco force-pushed the fix/157 branch from 44f3570 to b25a9fa Compare December 14, 2017 18:59

jspaine merged commit ca206e4 into freeCodeCamp:staging Dec 16, 2017

ronaldblanco deleted the fix/157 branch December 20, 2017 21:02

snyk-bot mentioned this pull request Apr 16, 2021

[Snyk] Security upgrade copy-webpack-plugin from 4.6.0 to 5.0.0 ik226/pantry-for-good#51

Open

snyk-bot mentioned this pull request Aug 18, 2021

[Snyk] Security upgrade copy-webpack-plugin from 4.6.0 to 5.0.0 ik226/pantry-for-good#57

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(#157) add a 'you signed up with your google account' email #343

(#157) add a 'you signed up with your google account' email #343

ronaldblanco commented Dec 7, 2017

jspaine commented Dec 10, 2017 •

edited

Loading

ronaldblanco commented Dec 11, 2017

jspaine commented Dec 11, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 12, 2017

ronaldblanco commented Dec 12, 2017 •

edited

Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 13, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 13, 2017

jspaine commented Dec 13, 2017

ronaldblanco commented Dec 14, 2017

jspaine commented Dec 14, 2017

ronaldblanco commented Dec 14, 2017

jspaine commented Dec 16, 2017

		@@ -29,9 +29,10 @@ export const forgot = async function(req, res) {
		if (!user) {
		throw new ValidationError({email: 'No account with that email has been found'})

(#157) add a 'you signed up with your google account' email #343

(#157) add a 'you signed up with your google account' email #343

Conversation

ronaldblanco commented Dec 7, 2017

jspaine commented Dec 10, 2017 • edited Loading

ronaldblanco commented Dec 11, 2017

jspaine commented Dec 11, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 12, 2017

ronaldblanco commented Dec 12, 2017 • edited Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 13, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Dec 13, 2017

jspaine commented Dec 13, 2017

ronaldblanco commented Dec 14, 2017

jspaine commented Dec 14, 2017

ronaldblanco commented Dec 14, 2017

jspaine commented Dec 16, 2017

jspaine commented Dec 10, 2017 •

edited

Loading

ronaldblanco commented Dec 12, 2017 •

edited

Loading