From c0563aff77eb571ed2f9727f307660ea256fb4f1 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Wed, 7 Jun 2023 23:13:25 +0100
Subject: [PATCH] Bring back try-catch for initGlobalFeatureSet

---
 backend/src/ee/services/EELicenseService.ts | 45 ++++++++++++---------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/backend/src/ee/services/EELicenseService.ts b/backend/src/ee/services/EELicenseService.ts
index 5e39420e54..38f03f8bfb 100644
--- a/backend/src/ee/services/EELicenseService.ts
+++ b/backend/src/ee/services/EELicenseService.ts
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/node';
 import NodeCache from 'node-cache';
 import { 
     getLicenseKey,
@@ -97,29 +98,35 @@ class EELicenseService {
         const licenseServerKey = await getLicenseServerKey();
         const licenseKey = await getLicenseKey();
 
-        if (licenseServerKey) {
-            // license server key is present -> validate it
-            const token = await refreshLicenseServerKeyToken()
+        try {
+            if (licenseServerKey) {
+                // license server key is present -> validate it
+                const token = await refreshLicenseServerKeyToken()
+                    
+                if (token) {
+                    this.instanceType = 'cloud';
+                }
                 
-            if (token) {
-                this.instanceType = 'cloud';
+                return;
             }
             
-            return;
-        }
-        
-        if (licenseKey) {
-            // license key is present -> validate it
-            const token = await refreshLicenseKeyToken();
-                
-            if (token) {
-                const { data: { currentPlan } } = await licenseKeyRequest.get(
-                    `${await getLicenseServerUrl()}/api/license/v1/plan`
-                );
-                
-                this.globalFeatureSet = currentPlan;
-                this.instanceType = 'enterprise-self-hosted';
+            if (licenseKey) {
+                // license key is present -> validate it
+                const token = await refreshLicenseKeyToken();
+                    
+                if (token) {
+                    const { data: { currentPlan } } = await licenseKeyRequest.get(
+                        `${await getLicenseServerUrl()}/api/license/v1/plan`
+                    );
+                    
+                    this.globalFeatureSet = currentPlan;
+                    this.instanceType = 'enterprise-self-hosted';
+                }
             }
+        } catch (err) {
+            // case: self-hosted free
+            Sentry.setUser(null);
+            Sentry.captureException(err);
         }
     }