Merge pull request #85 from appbaseio/fix/fatal_errors

fix: handle invalid ARC_ID

Author: lakhansamani

util/billing.go

@@ -50,6 +50,10 @@ var maxErrorTime int64 = 24 // in hrs
 // NodeCount is the current node count, defaults to 1
 var NodeCount = 1
 
+// isInvalidArcIDUsed flag is being used to determine that if the arc id is invalid.
+// If it is `true` then `Arc` will start throwing errors immediately with a status code of `400` instead of `402`
+var isInvalidArcIDUsed = false
+
 // ArcUsage struct is used to report time usage
 type ArcUsage struct {
 	ArcID          string `json:"arc_id"`
@@ -59,14 +63,18 @@ type ArcUsage struct {
 }
 
 type ClusterPlan struct {
-	Tier                *Plan  `json:"tier"`
-	FeatureCustomEvents bool   `json:"feature_custom_events"`
-	FeatureSuggestions  bool   `json:"feature_suggestions"`
-	Trial               bool   `json:"trial"`
-	TrialValidity       int64  `json:"trial_validity"`
-	TierValidity        int64  `json:"tier_validity"`
-	TimeValidity        int64  `json:"time_validity"`
-	SubscriptionID      string `json:"subscription_id"`
+	Tier                  *Plan  `json:"tier"`
+	FeatureCustomEvents   bool   `json:"feature_custom_events"`
+	FeatureSuggestions    bool   `json:"feature_suggestions"`
+	FeatureRules          bool   `json:"feature_rules"`
+	FeatureTemplates      bool   `json:"feature_templates"`
+	FeatureFunctions      bool   `json:"feature_functions"`
+	FeatureSearchSettings bool   `json:"feature_search_settings"`
+	Trial                 bool   `json:"trial"`
+	TrialValidity         int64  `json:"trial_validity"`
+	TierValidity          int64  `json:"tier_validity"`
+	TimeValidity          int64  `json:"time_validity"`
+	SubscriptionID        string `json:"subscription_id"`
 }
 
 // ArcUsageResponse stores the response from ACCAPI
@@ -121,6 +129,16 @@ func SetDefaultTier() {
 	SetTier(&plan)
 }
 
+// ValidateArcID validates the ARC_ID by checking the response returned from the ACCAPI
+func ValidateArcID(statusCode int) {
+	if statusCode == http.StatusBadRequest {
+		// Set the flag to `true` so `Arc` can start throwing errors immediately
+		isInvalidArcIDUsed = true
+	} else {
+		isInvalidArcIDUsed = false
+	}
+}
+
 func validateTimeValidity() bool {
 	if GetTimeValidity() > 0 { // Valid plan
 		return true
@@ -136,14 +154,21 @@ func validateTimeValidity() bool {
 func BillingMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Println("current time validity value: ", GetTimeValidity())
+
+		if isInvalidArcIDUsed {
+			// throw invalid ARC_ID usage error
+			WriteBackError(w, "Please make sure that you're using a valid ARC_ID. If the issue persists please contact support@appbase.io with your ARC_ID or registered e-mail address.", http.StatusBadRequest)
+			return
+		}
 		// Blacklist subscription routes
 		if strings.HasPrefix(r.RequestURI, "/arc/subscription") || strings.HasPrefix(r.RequestURI, "/arc/plan") {
 			next.ServeHTTP(w, r)
 		} else if validateTimeValidity() {
 			next.ServeHTTP(w, r)
 		} else {
 			// Write an error and stop the handler chain
-			http.Error(w, "payment required", http.StatusPaymentRequired)
+			WriteBackError(w, "Payment required", http.StatusPaymentRequired)
+			return
 		}
 	})
 }
@@ -167,6 +192,9 @@ func getArcInstance(arcID string) (ArcInstance, error) {
 		log.Errorln("error reading res body:", err)
 		return arcInstance, err
 	}
+	// Validate the ACCAPI response
+	ValidateArcID(res.StatusCode)
+
 	err = json.Unmarshal(body, &response)
 	if len(response.ArcInstances) != 0 {
 		arcInstanceByID := response.ArcInstances[0]
@@ -204,6 +232,9 @@ func getArcClusterInstance(clusterID string) (ArcInstance, error) {
 		return arcInstance, err
 	}
 	defer res.Body.Close()
+	// Validate the ACCAPI response
+	ValidateArcID(res.StatusCode)
+
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		log.Errorln("error reading res body:", err)
@@ -222,6 +253,10 @@ func getArcClusterInstance(clusterID string) (ArcInstance, error) {
 		SetTier(arcInstanceDetails.Tier)
 		SetFeatureSuggestions(arcInstanceDetails.FeatureSuggestions)
 		SetFeatureCustomEvents(arcInstanceDetails.FeatureCustomEvents)
+		SetFeatureRules(arcInstanceDetails.FeatureRules)
+		SetFeatureFunctions(arcInstanceDetails.FeatureFunctions)
+		SetFeatureSearchSettings(arcInstanceDetails.FeatureSearchSettings)
+		SetFeatureTemplates(arcInstanceDetails.FeatureTemplates)
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided CLUSTER_ID")
 	}
@@ -248,6 +283,9 @@ func getClusterPlan(clusterID string) (ClusterPlan, error) {
 		log.Errorln("error reading res body:", err)
 		return clusterPlan, err
 	}
+	// Validate the ACCAPI response
+	ValidateArcID(res.StatusCode)
+
 	err = json.Unmarshal(body, &response)
 
 	if err != nil {
@@ -263,6 +301,10 @@ func getClusterPlan(clusterID string) (ClusterPlan, error) {
 	SetTimeValidity(response.Plan.TimeValidity)
 	SetFeatureSuggestions(response.Plan.FeatureSuggestions)
 	SetFeatureCustomEvents(response.Plan.FeatureCustomEvents)
+	SetFeatureRules(response.Plan.FeatureRules)
+	SetFeatureFunctions(response.Plan.FeatureFunctions)
+	SetFeatureSearchSettings(response.Plan.FeatureSearchSettings)
+	SetFeatureTemplates(response.Plan.FeatureTemplates)
 
 	return clusterPlan, nil
 }