Fixed Domain related bugs (#41)

mohammed786 · mohammed786 · commit 525959def84e · 2021-06-08T17:36:05.000+05:30
diff --git a/api/deployment.go b/api/deployment.go
@@ -3,6 +3,7 @@ package api
 import (
 	"encoding/json"
 	"errors"
+	"strings"
 
 	"net/http"
 	"time"
@@ -98,16 +99,22 @@ func GetPage() (*HostedPageResponse, error) {
 	return &resultResp, nil
 }
 
-func UpdateDomain(domains string) error {
+func UpdateDomain(domains []string) error {
 	var url string
+
 	body, _ := json.Marshal(map[string]string{
-		"domain":     "http://localhost",
-		"production": domains,
+		"domain":     domains[0],
+		"production": strings.Join(domains, ";"),
 		"staging":    "",
 	})
 
 	url = conf.AdminConsoleAPIDomain + "/deployment/sites?"
-	_, err := request.Rest(http.MethodPost, url, nil, string(body))
+	domainResp, err := request.Rest(http.MethodPost, url, nil, string(body))
+	if err != nil {
+		return err
+	}
+	var dInfo SitesReponse
+	err = json.Unmarshal(domainResp, &dInfo)
 	if err != nil {
 		return err
 	}
@@ -122,21 +129,22 @@ func UpdateDomain(domains string) error {
 	if err != nil {
 		return err
 	}
-	siteInfo.Callbackurl = domains
+	siteInfo.Devdomain = dInfo.Devdomain
+	siteInfo.Callbackurl = dInfo.Callbackurl
+	siteInfo.Domain = dInfo.Domain
 	sInfo, _ := json.Marshal(siteInfo)
 	_ = cmdutil.WriteFile("currentSite.json", sInfo)
 
 	return nil
 }
 
-func CurrentPlan() error {
+func CheckPlan() error {
 	sitesResp, err := GetSites()
 	if err != nil {
 		return err
 	}
 	if sitesResp.Productplan.Name == "free" {
-		return errors.New("Please switch to an app which enables this feature or upgrade your plan from Free Plan.")
-
+		return errors.New("Please switch to developer/developer pro app or upgrade your plan to enable this feature.")
 	}
 	return nil
 }
diff --git a/api/platformConfiguration.go b/api/platformConfiguration.go
@@ -3,7 +3,6 @@ package api
 import (
 	"encoding/json"
 	"net/http"
-	"strings"
 
 	"github.com/loginradius/lr-cli/config"
 	"github.com/loginradius/lr-cli/request"
@@ -129,15 +128,3 @@ func GetActiveProviders() (*ProviderList, error) {
 	}
 	return &R1, nil
 }
-func Verify(str string) (bool, error) {
-	var match = false
-	resp, err := GetSites()
-
-	res1 := strings.Split(resp.Callbackurl, ";")
-	for i := 0; i < len(res1); i++ {
-		if str == res1[i] {
-			match = true
-		}
-	}
-	return match, err
-}
diff --git a/cmd/add/domain/domain.go b/cmd/add/domain/domain.go
@@ -45,33 +45,27 @@ func NewdomainCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			s := strings.Split(p.Callbackurl, ";")
-			if len(s) < 3 {
-				return add(p.Callbackurl, opts.Domain)
+			if strings.Contains(p.Callbackurl, opts.Domain) {
+				return &cmdutil.FlagError{Err: errors.New("Entered Domain is already added")}
+			}
+			urls := strings.Split(p.Callbackurl, ";")
+			plan := p.Productplan.Name
+			if (plan == "free" && len(urls) < 3) || (plan == "developer" && len(urls) < 5) {
+				urls = append(urls, opts.Domain)
+				err := api.UpdateDomain(urls)
+				if err != nil {
+					return err
+				}
+				fmt.Println(opts.Domain, "is now whitelisted.")
+				return nil
 			} else {
-				return &cmdutil.FlagError{Err: errors.New("more than 3 domains cannot be added in free plan")}
+				return &cmdutil.FlagError{Err: errors.New("To add more domains, plan upgradation is required")}
 			}
 
 		},
 	}
-
 	fl := cmd.Flags()
-	fl.StringVarP(&opts.Domain, "domain", "d", "", "domain name")
+	fl.StringVarP(&opts.Domain, "domain", "d", "", "Enter Domain Value")
 
 	return cmd
 }
-
-func add(allDomains string, newDomain string) error {
-	domain := ""
-	if allDomains == "" {
-		domain = newDomain
-	} else {
-		domain = allDomains + ";" + newDomain
-	}
-	err := api.UpdateDomain(domain)
-	if err != nil {
-		return err
-	}
-	fmt.Println("Your Domain " + newDomain + " is now whitelisted")
-	return nil
-}
diff --git a/cmd/add/hooks/hooks.go b/cmd/add/hooks/hooks.go
@@ -36,7 +36,7 @@ func NewHooksCmd() *cobra.Command {
 }
 
 func addHooks() error {
-	err := api.CurrentPlan()
+	err := api.CheckPlan()
 	if err != nil {
 		return err
 	}
diff --git a/cmd/delete/domain/domain.go b/cmd/delete/domain/domain.go
@@ -41,38 +41,31 @@ func NewdomainCmd() *cobra.Command {
 				return err
 			}
 			urls := strings.Split(p.Callbackurl, ";")
+			if !strings.Contains(p.Callbackurl, opts.Domain) {
+				return &cmdutil.FlagError{Err: errors.New("Entered Domain not found")}
+			}
 			if len(urls) == 1 {
 				return &cmdutil.FlagError{Err: errors.New("Cannot delete the last domain")}
-
 			}
 			for index, url := range urls {
 				if url == opts.Domain {
 					urls = append(urls[:index], urls[index+1:]...)
 					break
 				}
 			}
-			newdomain := strings.Join(urls, ";")
-			return delete(opts.Domain, newdomain)
+			return delete(opts.Domain, urls)
 
 		},
 	}
 
 	fl := cmd.Flags()
-	fl.StringVarP(&opts.Domain, "domain", "d", "", "domain name")
+	fl.StringVarP(&opts.Domain, "domain", "d", "", "Enter Domain Value")
 
 	return cmd
 }
 
-func delete(remVal string, allDomain string) error {
-	Match, err := api.Verify(remVal)
-	if err != nil {
-		return err
-	}
-	if !Match {
-		fmt.Println("Please verify the domain you have entered")
-		return nil
-	}
-	err = api.UpdateDomain(allDomain)
+func delete(remVal string, allDomain []string) error {
+	err := api.UpdateDomain(allDomain)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/delete/hooks/hooks.go b/cmd/delete/hooks/hooks.go
@@ -48,7 +48,7 @@ func NewHooksCmd() *cobra.Command {
 }
 
 func deleteHooks() error {
-	err := api.CurrentPlan()
+	err := api.CheckPlan()
 	if err != nil {
 		return err
 	}
diff --git a/cmd/get/hooks/hooks.go b/cmd/get/hooks/hooks.go
@@ -31,7 +31,7 @@ func NewHooksCmd() *cobra.Command {
 }
 
 func getHooks() error {
-	err := api.CurrentPlan()
+	err := api.CheckPlan()
 	if err != nil {
 		return err
 	}
diff --git a/cmd/get/site/site.go b/cmd/get/site/site.go
@@ -90,4 +90,5 @@ func Output(AppInfo api.SitesReponse) {
 	fmt.Println("App Name: ", AppInfo.Appname)
 	fmt.Println("App ID: ", AppInfo.Appid)
 	fmt.Println("Domain: ", AppInfo.Domain)
+	fmt.Println("Plan: ", AppInfo.Productplan.Name)
 }
diff --git a/cmd/login/login.go b/cmd/login/login.go
@@ -112,7 +112,7 @@ func listSites() error {
 	}
 	fmt.Printf("Do you wish to start with a different site ?(Y/N): ")
 	fmt.Scanf("%s\n", &option)
-	if option != "Y" {
+	if option != "Y" && option != "y" {
 		return nil
 	}
 
diff --git a/cmd/set/domain/domain.go b/cmd/set/domain/domain.go
@@ -1,19 +1,13 @@
 package domain
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 	"strings"
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/loginradius/lr-cli/api"
-	"github.com/loginradius/lr-cli/request"
-
 	"github.com/loginradius/lr-cli/cmdutil"
-	"github.com/loginradius/lr-cli/config"
-
 	"github.com/spf13/cobra"
 )
 
@@ -39,80 +33,47 @@ func NewdomainCmd() *cobra.Command {
 		Use:   "domain",
 		Short: "set domain",
 		Long:  `This commmand sets domain`,
-		Example: heredoc.Doc(`$ lr set domain --domain <domain> --domainmod <domainmodified>
-		domain successfully updated
-		http://localhost;...
+		Example: heredoc.Doc(`$ lr set domain --domain <domain> --new-domain <new domain>
+		Domain successfully updated
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if opts.Domain == "" {
 				return &cmdutil.FlagError{Err: errors.New("`domain` is require argument")}
 			}
 
 			if opts.DomainMod == "" {
-				return &cmdutil.FlagError{Err: errors.New("`domainmod` is require argument")}
+				return &cmdutil.FlagError{Err: errors.New("`new-domain` is require argument")}
 			}
 
-			var p, err = get()
+			p, err := api.GetSites()
 			if err != nil {
 				return err
 			}
-			domain := strings.ReplaceAll(p.CallbackUrl, (";" + opts.Domain), (";" + opts.DomainMod))
+			if !strings.Contains(p.Callbackurl, opts.Domain) {
+				return &cmdutil.FlagError{Err: errors.New("Entered Domain Not Found")}
+			}
+			if opts.Domain == "http://localhost" || opts.Domain == "http://127.0.0.1" {
+				return &cmdutil.FlagError{Err: errors.New("Cannot Update Default Domains")}
+			}
+			domain := strings.ReplaceAll(p.Callbackurl, opts.Domain, opts.DomainMod)
 			return set(domain)
 
 		},
 	}
 
 	fl := cmd.Flags()
-	fl.StringVarP(&opts.Domain, "domain", "d", "", "domain name")
-	fl.StringVarP(&opts.DomainMod, "domainmod", "m", "", "domain modified name")
+	fl.StringVarP(&opts.Domain, "domain", "d", "", "Enter Old Domain Value")
+	fl.StringVarP(&opts.DomainMod, "new-domain", "n", "", "Enter New Domain Value")
 
 	return cmd
 }
 
-func get() (*domainManagement, error) {
-	conf := config.GetInstance()
-	var url string
-	url = conf.AdminConsoleAPIDomain + "/deployment/sites?"
-
-	var resultResp *domainManagement
-	resp, err := request.Rest(http.MethodGet, url, nil, "")
-	if err != nil {
-		return nil, err
-	}
-	err = json.Unmarshal(resp, &resultResp)
-	if err != nil {
-		return nil, err
-	}
-
-	return resultResp, nil
-}
-
 func set(domain string) error {
-	Match, err := api.Verify(domain)
-	if err != nil {
-		return err
-	}
-	if !Match {
-		fmt.Println("Please verify the domain you have entered")
-		return nil
-	}
-	var url string
-	body, _ := json.Marshal(map[string]string{
-		"domain":     "http://localhost",
-		"production": domain,
-		"staging":    "",
-	})
-	conf := config.GetInstance()
-
-	url = conf.AdminConsoleAPIDomain + "/deployment/sites?"
-
-	var resultResp Result
-	resp, err := request.Rest(http.MethodPost, url, nil, string(body))
-	err = json.Unmarshal(resp, &resultResp)
+	urls := strings.Split(domain, ";")
+	err := api.UpdateDomain(urls)
 	if err != nil {
 		return err
 	}
-	fmt.Println("domain successfully updated")
-	fmt.Println(resultResp.CallbackUrl)
+	fmt.Println("Domain Successfully Updated")
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func NewHooksCmd() *cobra.Command {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func addHooks() error {`
`39`		`- err := api.CurrentPlan()`
	`39`	`+ err := api.CheckPlan()`
`40`	`40`	`if err != nil {`
`41`	`41`	`return err`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func NewHooksCmd() *cobra.Command {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func deleteHooks() error {`
`51`		`- err := api.CurrentPlan()`
	`51`	`+ err := api.CheckPlan()`
`52`	`52`	`if err != nil {`
`53`	`53`	`return err`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func NewHooksCmd() *cobra.Command {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func getHooks() error {`
`34`		`- err := api.CurrentPlan()`
	`34`	`+ err := api.CheckPlan()`
`35`	`35`	`if err != nil {`
`36`	`36`	`return err`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,5 @@ func Output(AppInfo api.SitesReponse) {`
`90`	`90`	`fmt.Println("App Name: ", AppInfo.Appname)`
`91`	`91`	`fmt.Println("App ID: ", AppInfo.Appid)`
`92`	`92`	`fmt.Println("Domain: ", AppInfo.Domain)`
	`93`	`+ fmt.Println("Plan: ", AppInfo.Productplan.Name)`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func listSites() error {`
`112`	`112`	`}`
`113`	`113`	`fmt.Printf("Do you wish to start with a different site ?(Y/N): ")`
`114`	`114`	`fmt.Scanf("%s\n", &option)`
`115`		`- if option != "Y" {`
	`115`	`+ if option != "Y" && option != "y" {`
`116`	`116`	`return nil`
`117`	`117`	`}`
`118`	`118`