IO-2782-Send-Promanager-Welcome-Email - Finalize cleanup

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/firebase/firebase-handler.js

@@ -7,9 +7,7 @@ const admin = require("firebase-admin");
 const logger = require("../utils/logger");
 const { sendProManagerWelcomeEmail } = require("../email/sendemail");
 const client = require("../graphql-client/graphql-client").client;
-
 const serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
-const adminEmail = require("../utils/adminEmail");
 const generateEmailTemplate = require("../email/generateTemplate");
 
 admin.initializeApp({
@@ -210,7 +208,36 @@ const getUser = (req, res) => {
     .auth()
     .getUser(req.body.uid)
     .then((userRecord) => {
-      res.json(userRecord);
+      return client
+        .request(
+          `
+          query GET_USER_BY_AUTHID($authid: String!) {
+            users(where: { authid: { _eq: $authid } }) {
+              email
+              displayName
+              validemail
+              associations {
+                id
+                shopid
+                bodyshop {
+                  id
+                  convenient_company
+                }
+              }
+            }
+          }
+          `,
+          { authid: req.body.uid }
+        )
+        .then((dbUserResult) => {
+          res.json({
+            ...userRecord,
+            db: {
+              validemail: dbUserResult?.users?.[0]?.validemail,
+              company: dbUserResult?.users?.[0]?.associations?.[0]?.bodyshop?.convenient_company
+            }
+          });
+        });
     })
     .catch((error) => {
       logger.log("admin-get-user-error", "ERROR", req.user.email, null, {