Merge pull request #2375 from Human-Connection/keep_dots_in_emails

Don't remove sub-addresses in emails

backend/src/schema/resolvers/emails.js

@@ -3,7 +3,7 @@ import Resolver from './helpers/Resolver'
 import existingEmailAddress from './helpers/existingEmailAddress'
 import { UserInputError } from 'apollo-server'
 import Validator from 'neode/build/Services/Validator.js'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 export default {
   Mutation: {

backend/src/schema/resolvers/helpers/createPasswordReset.js

@@ -1,4 +1,4 @@
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './normalizeEmail'
 
 export default async function createPasswordReset(options) {
   const { driver, nonce, email, issuedAt = new Date() } = options

backend/src/schema/resolvers/helpers/normalizeEmail.js

@@ -0,0 +1,11 @@
+import { normalizeEmail } from 'validator'
+
+export default email =>
+  normalizeEmail(email, {
+    // gmail_remove_dots: true, default
+    gmail_remove_subaddress: false,
+    // gmail_convert_googlemaildotcom: true, default
+    outlookdotcom_remove_subaddress: false,
+    yahoo_remove_subaddress: false,
+    icloud_remove_subaddress: false,
+  })

backend/src/schema/resolvers/registration.js

@@ -4,7 +4,7 @@ import fileUpload from './fileUpload'
 import encryptPassword from '../../helpers/encryptPassword'
 import generateNonce from './helpers/generateNonce'
 import existingEmailAddress from './helpers/existingEmailAddress'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 const instance = neode()
 

backend/src/schema/resolvers/user_management.js

@@ -2,7 +2,7 @@ import encode from '../../jwt/encode'
 import bcrypt from 'bcryptjs'
 import { AuthenticationError } from 'apollo-server'
 import { neode } from '../../bootstrap/neo4j'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 const instance = neode()
 

webapp/components/PasswordReset/Request.vue

@@ -46,7 +46,7 @@
 <script>
 import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   components: {

webapp/components/utils/NormalizeEmail.js

@@ -0,0 +1,11 @@
+import { normalizeEmail } from 'validator'
+
+export default email =>
+  normalizeEmail(email, {
+    // gmail_remove_dots: false, default
+    gmail_remove_subaddress: false,
+    // gmail_convert_googlemaildotcom: true, default
+    outlookdotcom_remove_subaddress: false,
+    yahoo_remove_subaddress: false,
+    icloud_remove_subaddress: false,
+  })

webapp/pages/admin/users.vue

@@ -67,7 +67,8 @@
 
 <script>
 import gql from 'graphql-tag'
-import { isEmail, normalizeEmail } from 'validator'
+import { isEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   data() {

webapp/pages/settings/my-email-address/index.vue

@@ -32,7 +32,7 @@
 import { mapGetters } from 'vuex'
 import { AddEmailAddressMutation } from '~/graphql/EmailAddress.js'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   components: {