awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring back try-catch for initGlobalFeatureSet

Browse Source
This commit is contained in:
Tuan Dang
2023-06-07 23:13:25 +01:00
parent 7cec42a7fb
commit c0563aff77
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
backend/src/ee/services/EELicenseService.ts
View File

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