From 145cf7cc9367c9322c333b0dd897525579b6762f Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Thu, 19 Sep 2024 12:54:26 -0400 Subject: [PATCH] IO-2782-Send-Promanager-Welcome-Email - Finalize cleanup Signed-off-by: Dave Richer --- server/firebase/firebase-handler.js | 33 ++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js index 7223d89a8..e47eeffc1 100644 --- a/server/firebase/firebase-handler.js +++ b/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, {