From 5d0210925219c091ef6021976e082fd1c049c2fb Mon Sep 17 00:00:00 2001
From: the_aceix <aceixsmartx@gmail.com>
Date: Fri, 3 May 2024 12:52:37 +0000
Subject: [PATCH] fix(NET-1175): use default trial end date this "more recent"
 arbitrary date is needed for hubspot to consume exported data without
 throwing out of date range exeptions

---
 logic/serverconf.go |  4 +++-
 pro/trial.go        | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/logic/serverconf.go b/logic/serverconf.go
index de369c68..2655981c 100644
--- a/logic/serverconf.go
+++ b/logic/serverconf.go
@@ -21,9 +21,11 @@ var (
 	EgressesLimit = 1000000000
 	// FreeTier - specifies if free tier
 	FreeTier = false
+	// DefaultTrialEndDate - is a placeholder date for not applicable trial end dates
+	DefaultTrialEndDate, _ = time.Parse("2006-Jan-02", "2021-Apr-01")
 
 	GetTrialEndDate = func() (time.Time, error) {
-		return time.Time{}, nil
+		return DefaultTrialEndDate, nil
 	}
 )
 
diff --git a/pro/trial.go b/pro/trial.go
index be9b2333..4c1b77ab 100644
--- a/pro/trial.go
+++ b/pro/trial.go
@@ -124,37 +124,37 @@ func TrialLicenseHook() error {
 func getTrialEndDate() (time.Time, error) {
 	record, err := database.FetchRecord(trial_table_name, trial_data_key)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	var trialInfo TrialInfo
 	err = json.Unmarshal([]byte(record), &trialInfo)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	tel, err := logic.FetchTelemetryRecord()
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	telePrivKey, err := ncutils.ConvertBytesToKey(tel.TrafficKeyPriv)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	trialPubKey, err := ncutils.ConvertBytesToKey(trialInfo.PubKey)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	// decrypt secret
 	secretDecrypt, err := ncutils.BoxDecrypt(trialInfo.Secret, trialPubKey, telePrivKey)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	trialDates := TrialDates{}
 	err = json.Unmarshal(secretDecrypt, &trialDates)
 	if err != nil {
-		return time.Time{}, err
+		return logic.DefaultTrialEndDate, err
 	}
 	if trialDates.TrialEndsAt.IsZero() {
-		return time.Time{}, errors.New("invalid date")
+		return logic.DefaultTrialEndDate, errors.New("invalid date")
 	}
 	return trialDates.TrialEndsAt, nil