From bf79bf467e3d8306138da97821a79932c17dd7b9 Mon Sep 17 00:00:00 2001
From: petruki <31597636+petruki@users.noreply.github.com>
Date: Wed, 29 May 2024 22:45:53 -0700
Subject: [PATCH] chore: refactored domain resolver by Slack installation

---
 src/client/configuration-resolvers.js | 13 +++++--------
 src/external/switcher-api-facade.js   |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/client/configuration-resolvers.js b/src/client/configuration-resolvers.js
index 8cf0eb0..01e8508 100644
--- a/src/client/configuration-resolvers.js
+++ b/src/client/configuration-resolvers.js
@@ -37,17 +37,14 @@ async function resolveGroupByGroup(domainId, groupConfig, groupId) {
     return [];
 }
 
-async function resolveSlackInstallation(args) {
+async function resolveBySlackInstallation(args) {
     const featureFlag = await checkSlackMultiDomain(args.slack_team_id);
 
-    if (featureFlag.result) {
+    if (featureFlag?.result) {
         return getSlack({ team_id: args.slack_team_id, domain: args.domain });
     }
 
-    const slack = await getSlack({ team_id: args.slack_team_id });
-    if (slack) {
-        args.domain = slack.domain;
-    }
+    return getSlack({ team_id: args.slack_team_id });
 }
 
 export async function resolveConfiguration(args, context) {
@@ -56,7 +53,7 @@ export async function resolveConfiguration(args, context) {
     }
 
     if (args.slack_team_id) {
-        await resolveSlackInstallation(args);
+        args.domain = (await resolveBySlackInstallation(args))?.domain;
     }
 
     if (context.domain || args.domain) {
@@ -65,7 +62,7 @@ export async function resolveConfiguration(args, context) {
         if (args.key || args.config_id) {
             return resolveConfigByConfig(context.domain, args.key, args.config_id);
         }
-
+        
         return resolveGroupByGroup(context.domain, args.group, args.group_id);
     }
 }
diff --git a/src/external/switcher-api-facade.js b/src/external/switcher-api-facade.js
index b4574a6..884b055 100644
--- a/src/external/switcher-api-facade.js
+++ b/src/external/switcher-api-facade.js
@@ -173,7 +173,7 @@ export async function checkMetrics(config) {
 
 export async function checkHistory(domain) {
     if (process.env.SWITCHER_API_ENABLE != 'true') {
-        return true;
+        return { result: true };
     }
 
     const { owner } = await getDomainById(domain);
@@ -210,7 +210,7 @@ export async function checkSlackIntegration(value) {
 
 export async function checkSlackMultiDomain(value) {
     if (process.env.SWITCHER_API_ENABLE != 'true') {
-        return;
+        return { result: true };
     }
     
     return getFeatureFlag(SwitcherKeys.SLACK_MULTI_DOMAIN)
@@ -255,7 +255,7 @@ export async function getRateLimit(key, component) {
 
 export async function checkHttpsAgent(value) {
     if (process.env.SWITCHER_API_ENABLE != 'true') {
-        return;
+        return { result: true };
     }
 
     return getFeatureFlag(SwitcherKeys.HTTPS_AGENT)