From d872ba49fd4bc47964937ec90a02a7b80397adb4 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 22 Aug 2024 11:33:52 +0200
Subject: [PATCH] fix email search

---
 .../client/src/components/admin-panel/search.vue  | 15 +++++++++++----
 website/server/controllers/api-v4/admin.js        |  8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/website/client/src/components/admin-panel/search.vue b/website/client/src/components/admin-panel/search.vue
index 7b2baa92d0..6eb665314d 100644
--- a/website/client/src/components/admin-panel/search.vue
+++ b/website/client/src/components/admin-panel/search.vue
@@ -25,14 +25,14 @@
         </div>
         <p
           class="mb-1"
-          :class="{'font-weight-bold': matchValueToIdentifier(user.auth.local.username)}"
+          :class="{'highlighted-value': matchValueToIdentifier(user.auth.local.username)}"
         >
           @{{ user.auth.local.username }}</p>
         <p class="mb-0">
           <span
             v-for="email in userEmails(user)"
             :key="email"
-            :class="{'font-weigh-bold': matchValueToIdentifier(email)}"
+            :class="{'highlighted-value': matchValueToIdentifier(email)}"
           >
             {{ email }}
           </span>
@@ -42,6 +42,12 @@
   </div>
 </template>
 
+<style lang="scss" scoped>
+  .highlighted-value {
+    font-weight: bold;
+  }
+</style>
+
 <script>
 import VueRouter from 'vue-router';
 import { mapState } from '@/libs/store';
@@ -101,14 +107,15 @@ export default {
         const emails = user.auth.google.emails;
         allEmails.push(...this.findSocialEmails(emails));
       }
-      if (user.auth.apple && user.auth.apple.email) {
+      if (user.auth.apple && user.auth.apple.emails) {
         const emails = user.auth.apple.emails;
         allEmails.push(...this.findSocialEmails(emails));
       }
-      if (user.auth.facebook && user.auth.facebook.email) {
+      if (user.auth.facebook && user.auth.facebook.emails) {
         const emails = user.auth.facebook.emails;
         allEmails.push(...this.findSocialEmails(emails));
       }
+      console.log(allEmails);
       return allEmails;
     },
     findSocialEmails (emails) {
diff --git a/website/server/controllers/api-v4/admin.js b/website/server/controllers/api-v4/admin.js
index 29ca8c8aed..01b8e4b4f6 100644
--- a/website/server/controllers/api-v4/admin.js
+++ b/website/server/controllers/api-v4/admin.js
@@ -42,9 +42,9 @@ api.getHero = {
     } else if (validator.isEmail(userIdentifier)) {
       const emailFields = [
         'auth.local.email',
-        'auth.google.email',
-        'auth.apple.email',
-        'auth.facebook.email',
+        'auth.google.emails.value',
+        'auth.apple.emails.value',
+        'auth.facebook.emails.value',
       ];
       for (const field of emailFields) {
         const emailQuery = { [field]: userIdentifier };
@@ -53,7 +53,7 @@ api.getHero = {
           .select('contributor backer profile auth')
           .lean()
           .exec();
-        if (found && found.size >= 0) {
+        if (found) {
           users.push(found);
         }
       }