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