Fixed bugs in add and delete site commands (#30)

Author: Akash-Patil

cmd/add/hooks/hooks.go

@@ -23,7 +23,7 @@ func NewHooksCmd() *cobra.Command {
 		This command adds webhooks which are configured to an App.
 		`),
 		Example: heredoc.Doc(`
-			$ lr adds hooks  
+			$ lr add hooks  
 
 			Webhook has been added.
  

cmd/add/site/site.go

@@ -2,11 +2,13 @@ package site
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/loginradius/lr-cli/api"
+	"github.com/loginradius/lr-cli/cmdutil"
 	"github.com/loginradius/lr-cli/config"
 	"github.com/loginradius/lr-cli/request"
 	"github.com/spf13/cobra"
@@ -16,6 +18,7 @@ var AppName string
 var Domain string
 var PlanName string
 var planOption string
+var option string
 var AppsInfo *api.CoreAppData
 
 type AddAppResponse struct {
@@ -49,6 +52,15 @@ func addSite() error {
 		fmt.Println("Please upgrade your plan to add more sites. ")
 		return nil
 	}
+
+	checkCard, err := cardDetails()
+	if err != nil {
+		return err
+	}
+	if !checkCard {
+		return nil
+	}
+
 	checkInput := input()
 	if !checkInput {
 		fmt.Println("Please enter the input paramaters properly.")
@@ -112,6 +124,29 @@ func plans() (bool, error) {
 	return false, nil
 }
 
+func cardDetails() (bool, error) {
+	conf := config.GetInstance()
+	paymentInfo, err := api.PaymentInfo()
+	if err != nil {
+		return false, err
+	}
+	paymentMethodId := paymentInfo.Data.Order[0].Paymentdetail.Stripepaymentmethodid
+	if paymentMethodId == "" {
+		fmt.Println("Adding more than one app requires valid payment information. Please update card details in dashboard via browser.")
+		fmt.Println("(Note: User must re-login after updating details in the browser)")
+		fmt.Printf("Press Y to open Browser window:")
+		fmt.Scanf("%s", &option)
+		if option != "Y" {
+			return false, errors.New("Action not possible without updating card details.")
+		}
+		cmdutil.Openbrowser(conf.DashboardDomain + "/apps")
+		fmt.Println("Please Re-Login via CLI.")
+		return false, nil
+	}
+	return true, nil
+
+}
+
 func add() error {
 	conf := config.GetInstance()
 	paymentInfo, err := api.PaymentInfo()

cmd/delete/site/site.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/loginradius/lr-cli/api"
+	"github.com/loginradius/lr-cli/cmdutil"
 	"github.com/loginradius/lr-cli/config"
 	"github.com/loginradius/lr-cli/request"
 	"github.com/spf13/cobra"
@@ -101,10 +102,20 @@ func delete(appInfo api.SitesReponse) (bool, error) {
 	}
 	var resObj Delete
 	err = json.Unmarshal(resp, &resObj)
+
 	if err != nil {
 		return false, err
 	}
+
 	if resObj.Isdeleted == true {
+		err := cmdutil.DeleteFile("siteInfo.json")
+		if err != nil {
+			return false, err
+		}
+		_, err = api.GetAppsInfo()
+		if err != nil {
+			return false, err
+		}
 		return true, nil
 	}
 	return false, nil

cmdutil/lrUtils.go

@@ -88,3 +88,13 @@ func DeleteFiles() error {
 	}
 	return nil
 }
+
+func DeleteFile(filename string) error {
+	user, _ := user.Current()
+	fileName := filepath.Join(user.HomeDir, ".lrcli", filename)
+	err := os.Remove(fileName)
+	if err != nil {
+		return err
+	}
+	return nil
+}