Bug Fixes for CLI Testing Round 1

Author: RevanthTanneeru

cmd/add/domain/domain.go

@@ -60,11 +60,16 @@ func NewdomainCmd() *cobra.Command {
 }
 
 func add(allDomains string, newDomain string) error {
-	domain := allDomains + ";" + newDomain
+	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")
+	fmt.Println("Your Domain " + newDomain + " is now whitelisted")
 	return nil
 }

cmd/add/social/social.go

@@ -84,7 +84,6 @@ func add1(opts1 *socialProvider) error {
 	var requestBody socialProviderList
 	requestBody.Data = append(requestBody.Data, *opts1)
 	body, _ := json.Marshal(requestBody)
-	fmt.Println(string(body))
 	var resultResp socialProviderList
 	resp1, err := request.Rest(http.MethodPost, url1, nil, string(body))
 	if err != nil {
@@ -99,7 +98,6 @@ func add1(opts1 *socialProvider) error {
 	var requestBody2 socialProviderList2
 	requestBody2.Data = append(requestBody2.Data, *opts2)
 	body1, _ := json.Marshal(requestBody2)
-	fmt.Println(string(body1))
 
 	var resultResp2 socialProviderList2
 	resp, err1 := request.Rest(http.MethodPost, url2, nil, string(body1))

cmd/delete/domain/domain.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/loginradius/lr-cli/api"
-
 	"github.com/loginradius/lr-cli/cmdutil"
 
 	"github.com/spf13/cobra"
@@ -40,6 +39,10 @@ func NewdomainCmd() *cobra.Command {
 				return err
 			}
 			urls := strings.Split(p.Callbackurl, ";")
+			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:]...)

cmd/generateSott/generateSott.go

@@ -2,12 +2,10 @@ package generateSott
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 
 	"github.com/MakeNowJust/heredoc"
-	"github.com/loginradius/lr-cli/cmdutil"
 	"github.com/loginradius/lr-cli/config"
 	"github.com/loginradius/lr-cli/request"
 
@@ -39,16 +37,19 @@ func NewgenerateSottCmd() *cobra.Command {
 		Use:     "generate-sott",
 		Short:   "generates sott",
 		Long:    `This commmand generates sott`,
-		Example: heredoc.Doc(`$ lr generate sott`),
+		Example: heredoc.Doc(`$ lr generate-sott -f <FromDate(mm/dd/yyyy)> -t <ToDate(mm/dd/yyyy)> -c <technology>`),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if opts.FromDate == "" {
-				return &cmdutil.FlagError{Err: errors.New("`FromDate` is require argument")}
-			}
-			if opts.ToDate == "" {
-				return &cmdutil.FlagError{Err: errors.New("`ToDate` is require argument")}
-			}
-			if opts.Technology == "" {
-				return &cmdutil.FlagError{Err: errors.New("`technology` is require argument")}
+			if opts.FromDate == "" || opts.ToDate == "" || opts.Technology == "" {
+				if opts.FromDate == "" {
+					fmt.Println("FromDate (mm/dd/yyyy) is a required argument")
+				}
+				if opts.ToDate == "" {
+					fmt.Println("ToDate (mm/dd/yyyy) is a required argument")
+				}
+				if opts.Technology == "" {
+					fmt.Println("technology is a required argument")
+				}
+				return nil
 			}
 			return generate(opts)
 
@@ -81,7 +82,9 @@ func generate(opts *sott) error {
 		return err
 	}
 	fmt.Println("sott generated successfully")
-	fmt.Println("{AuthenticityToken, Comment, Sott, Technology}")
-	fmt.Println(resultResp)
+	fmt.Println("AunthenticityToken: " + resultResp.AuthenticityToken)
+	fmt.Println("Comment: " + resultResp.Comment)
+	fmt.Println("Sott: " + resultResp.Sott)
+	fmt.Println("Technology: " + resultResp.Technology)
 	return nil
 }

cmd/get/accountPassword/accountPassword.go

@@ -59,7 +59,7 @@ func get(UID string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("password hash for UID:" + UID + " is" + resultResp.PasswordHash)
+	fmt.Println("password hash for UID:" + UID + " is " + resultResp.PasswordHash)
 
 	return nil
 }

cmd/get/social/social.go

@@ -3,25 +3,33 @@ package social
 import (
 	"encoding/json"
 	"fmt"
-
 	"net/http"
 
+	"github.com/loginradius/lr-cli/api"
 	"github.com/loginradius/lr-cli/config"
 	"github.com/loginradius/lr-cli/request"
 	"github.com/spf13/cobra"
 )
 
-var fileName string
+var temp string
 
 type socialProvider struct {
-	Provider string `json:"Provider"`
+	HtmlFileName   string   `json:"HtmlFileName"`
+	Provider       string   `json:"Provider"`
+	ProviderId     int      `json:"ProviderId"`
+	ProviderKey    string   `json:"ProviderKey"`
+	ProviderSecret string   `json:"ProviderSecret"`
+	Scope          []string `json:"Scope"`
+	Status         bool     `json:"Status"`
 }
 
 type socialProviderList struct {
 	Data []socialProvider `json:"Data"`
 }
 
-var url string
+var Url string
+
+var arr = [5]string{"Facebook", "Google", "Twitter", "LinkedIn", "GitHub"}
 
 func NewsocialCmd() *cobra.Command {
 
@@ -31,32 +39,96 @@ func NewsocialCmd() *cobra.Command {
 		Long:    `This commmand lists social providers`,
 		Example: `$ lr get social`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-
+			fstatus, _ := cmd.Flags().GetBool("all")
+			if fstatus {
+				temp = "all"
+			}
+			fstatus1, _ := cmd.Flags().GetBool("active")
+			if fstatus1 {
+				temp = "active"
+			}
+			if !fstatus && !fstatus1 {
+				fmt.Println("Please use atleast one of the flags 'lr get social --all' or 'lr get social --active'")
+				return nil
+			}
 			return get()
 
 		},
 	}
+	fl := cmd.Flags()
+	fl.BoolP("all", "a", false, "option to get all providers")
+	fl.BoolP("active", "c", false, "option to get active providers")
 
 	return cmd
 }
 
 func get() error {
+	if temp == "all" {
+		res, err := api.GetSites()
+		if err != nil {
+			return err
+		}
+		if res.Productplan.Name == "free" {
+			for i := 0; i < 3; i++ {
+				fmt.Println(i+1, arr[i])
+			}
+			return nil
+		}
+		if res.Productplan.Name == "developer" {
+			for i := 0; i < len(arr); i++ {
+				fmt.Println(i+1, arr[i])
+			}
+			return nil
+		}
+	}
+	if temp == "active" {
+		resultResp, err := GetActiveProviders()
+		if err != nil {
+			return err
+		}
+		if len(resultResp.Data) == 0 {
+			fmt.Println("There is no social configuration")
+			return nil
+		}
+		var num int
+		for i := 0; i < len(resultResp.Data); i++ {
+			fmt.Print(fmt.Sprint(i+1) + ".")
+			fmt.Println(resultResp.Data[i].Provider)
+		}
+		// Taking input from user
+		fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(resultResp.Data)) + " :")
+		fmt.Scanln(&num)
+		for 1 > num || num > len(resultResp.Data) {
+			fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(resultResp.Data)) + " :")
+
+			fmt.Scanln(&num)
+		}
+		fmt.Println("HtmlFileName: " + resultResp.Data[num-1].HtmlFileName)
+		fmt.Println("Provider: ", resultResp.Data[num-1].Provider)
+		fmt.Println("ProviderId: ", resultResp.Data[num-1].ProviderId)
+		fmt.Println("ProviderKey: ", resultResp.Data[num-1].ProviderKey)
+		fmt.Println("ProviderSecret: ", resultResp.Data[num-1].ProviderSecret)
+		fmt.Println("Scope: ", resultResp.Data[num-1].Scope)
+		fmt.Println("Status: ", resultResp.Data[num-1].Status)
+	}
+
+	return nil
+}
+
+func GetActiveProviders() (*socialProviderList, error) {
 	conf := config.GetInstance()
+	Url = conf.AdminConsoleAPIDomain + "/platform-configuration/social-providers/options?"
 
-	url = conf.AdminConsoleAPIDomain + "/platform-configuration/social-providers/options?"
+	var R1 socialProviderList
+	resp, err := request.Rest(http.MethodGet, Url, nil, "")
 
-	var resultResp socialProviderList
-	resp, err := request.Rest(http.MethodGet, url, nil, "")
 	if err != nil {
-		return err
+		return nil, err
 	}
-	err = json.Unmarshal([]byte(resp), &resultResp)
+
+	err = json.Unmarshal(resp, &R1)
 	if err != nil {
-		return err
-	}
-	for i := 0; i < len(resultResp.Data); i++ {
-		fmt.Print(fmt.Sprint(i+1) + ".")
-		fmt.Println(resultResp.Data[i].Provider)
+		return nil, err
 	}
-	return nil
+	return &R1, nil
 }

cmd/set/email/email.go

@@ -29,19 +29,19 @@ func NewemailCmd() *cobra.Command {
 		Use:     "email",
 		Short:   "set email config",
 		Long:    `This commmand sets email config`,
-		Example: `$ lr set email`,
+		Example: `$ lr set email --link_expire <link_expire> --notif_count <notif_count> --notif_frequency <notif_frequency>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 
 			if opts.EmailLinkExpire == 0 {
-				return &cmdutil.FlagError{Err: errors.New("`email_link_expire` is require argument")}
+				return &cmdutil.FlagError{Err: errors.New("`link_expire` is require argument")}
 			}
 
 			if opts.EmailNotificationCount == 0 {
-				return &cmdutil.FlagError{Err: errors.New("`email_notif_count` is require argument")}
+				return &cmdutil.FlagError{Err: errors.New("`notif_count` is require argument")}
 			}
 
 			if opts.EmailNotificationFrequency == 0 {
-				return &cmdutil.FlagError{Err: errors.New("`email_notif_frequency` is require argument")}
+				return &cmdutil.FlagError{Err: errors.New("`notif_frequency` is require argument")}
 			}
 			fmt.Printf(string(rune(opts.EmailLinkExpire)))
 			return set(opts.EmailLinkExpire, opts.EmailNotificationCount, opts.EmailNotificationFrequency)
@@ -50,9 +50,9 @@ func NewemailCmd() *cobra.Command {
 	}
 	fl := cmd.Flags()
 
-	fl.IntVarP(&opts.EmailLinkExpire, "email_link_expire", "a", 0, "usage")
-	fl.IntVarP(&opts.EmailNotificationCount, "email_notif_count", "b", 0, "usage")
-	fl.IntVarP(&opts.EmailNotificationFrequency, "email_notif_frequency", "c", 0, "domain name")
+	fl.IntVarP(&opts.EmailLinkExpire, "link_expire", "a", 0, "email link expire")
+	fl.IntVarP(&opts.EmailNotificationCount, "notif_count", "b", 0, "number of email notifications")
+	fl.IntVarP(&opts.EmailNotificationFrequency, "notif_frequency", "c", 0, "frequency of email notification")
 
 	return cmd
 }
@@ -77,7 +77,9 @@ func set(a int, b int, c int) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("{EmailLinkExpire, EmailNotificationCount, EmailNotificationFrequency}\n")
-	fmt.Println(resultResp)
+	fmt.Println("successfully configured")
+	fmt.Println("EmailLinkExpire: ", resultResp.EmailLinkExpire)
+	fmt.Println("EmailNotificationCount: ", resultResp.EmailNotificationCount)
+	fmt.Println("EmailNotificationFrequency: ", resultResp.EmailNotificationFrequency)
 	return nil
 }