From eaa6f105bbed494de72cea472043b825bee2e206 Mon Sep 17 00:00:00 2001
From: mirarifhasan <arif.ishan05@gmail.com>
Date: Wed, 17 Apr 2024 18:03:04 +0600
Subject: [PATCH] feat: isServiceConfigured modified

---
 .../src/infra-config/helper.ts                |  2 +-
 .../src/infra-config/infra-config.service.ts  | 24 ++++---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/hoppscotch-backend/src/infra-config/helper.ts b/packages/hoppscotch-backend/src/infra-config/helper.ts
index 9238788a6..c80045397 100644
--- a/packages/hoppscotch-backend/src/infra-config/helper.ts
+++ b/packages/hoppscotch-backend/src/infra-config/helper.ts
@@ -13,7 +13,7 @@ export enum ServiceStatus {
   DISABLE = 'DISABLE',
 }
 
-const AuthProviderConfigurations = {
+export const AuthProviderConfigurations = {
   [AuthProvider.GOOGLE]: [
     InfraConfigEnum.GOOGLE_CLIENT_ID,
     InfraConfigEnum.GOOGLE_CLIENT_SECRET,
diff --git a/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts b/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
index 4e2718e03..c392c562f 100644
--- a/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
+++ b/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
@@ -22,6 +22,7 @@ import {
 } from 'src/utils';
 import { ConfigService } from '@nestjs/config';
 import {
+  AuthProviderConfigurations,
   ServiceStatus,
   getDefaultInfraConfigs,
   getMissingInfraConfigEntries,
@@ -174,29 +175,12 @@ export class InfraConfigService implements OnModuleInit {
   ) {
     switch (service) {
       case AuthProvider.GOOGLE:
-        return (
-          configMap.GOOGLE_CLIENT_ID &&
-          configMap.GOOGLE_CLIENT_SECRET &&
-          configMap.GOOGLE_CALLBACK_URL &&
-          configMap.GOOGLE_SCOPE
-        );
       case AuthProvider.GITHUB:
-        return (
-          configMap.GITHUB_CLIENT_ID &&
-          configMap.GITHUB_CLIENT_SECRET &&
-          configMap.GITHUB_CALLBACK_URL &&
-          configMap.GITHUB_SCOPE
-        );
       case AuthProvider.MICROSOFT:
-        return (
-          configMap.MICROSOFT_CLIENT_ID &&
-          configMap.MICROSOFT_CLIENT_SECRET &&
-          configMap.MICROSOFT_CALLBACK_URL &&
-          configMap.MICROSOFT_SCOPE &&
-          configMap.MICROSOFT_TENANT
-        );
       case AuthProvider.EMAIL:
-        return configMap.MAILER_SMTP_URL && configMap.MAILER_ADDRESS_FROM;
+        const requiredConfigs = AuthProviderConfigurations[service];
+        if (!requiredConfigs) return false;
+        return requiredConfigs.every((config) => configMap[config]);
       default:
         return false;
     }