From a378106851c454672708d9465b2fa5f256b7f801 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 2 Jul 2020 20:56:19 +0000
Subject: [PATCH] fix(script): better dupe matching

---
 scripts/gdpr-delete-users.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/gdpr-delete-users.js b/scripts/gdpr-delete-users.js
index c512a58416..25de6fd472 100644
--- a/scripts/gdpr-delete-users.js
+++ b/scripts/gdpr-delete-users.js
@@ -35,15 +35,14 @@ async function deleteAmplitudeData (userId, email) {
 
 async function deleteHabiticaData (user, email) {
   const truncatedEmail = email.slice(0, email.indexOf('@'));
+  const set = {
+    'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
+    'auth.local.passwordHashMethod': 'bcrypt',
+  };
+  if (!user.auth.local.email) set['auth.local.email'] = `${truncatedEmail}@example.com`;
   await User.update(
     { _id: user._id },
-    {
-      $set: {
-        'auth.local.email': user.auth.local.email ? email : `${truncatedEmail}@example.com`,
-        'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
-        'auth.local.passwordHashMethod': 'bcrypt',
-      },
-    },
+    { $set: set },
   );
   const response = await axios.delete(
     `${BASE_URL}/api/v3/user`,
@@ -78,6 +77,7 @@ async function processEmailAddress (email) {
 
   const socialUsers = await User.find(
     {
+      'auth.local.email': {$not: emailRegex},
       $or: [
         { 'auth.facebook.emails.value': email },
         { 'auth.google.emails.value': email },