Implement registration schema commands in LoginRadius CLI

Co-authored-by: RevanthTanneeru <revanthtanneeru@LRIN-ENG-36.local>

Removed the Usage when error occurs in the cmd
Updated Doc Script

Author: RevanthTanneeru

README.md

@@ -25,6 +25,12 @@ $ brew tap loginradius/tap
 $ brew install lr
 ```
 
+### How to Upgrade the loginradius cli using Homebrew?
+
+```sh
+$ brew upgrade loginradius/tap/lr
+```
+
 ## Other Platforms
 
 Download packaged binaries from the [release page](https://github.com/loginradius/lr-cli/releases/latest).

api/deployment.go

@@ -36,7 +36,7 @@ type SitesReponse struct {
 	Privacypolicy         interface{} `json:"PrivacyPolicy"`
 	Termsofservice        interface{} `json:"TermsOfService"`
 	Ownerid               string      `json:"OwnerId"`
-	Productplan           struct {
+	Productplan           *struct {
 		Name         string      `json:"Name"`
 		Expirytime   time.Time   `json:"ExpiryTime"`
 		Billingcycle interface{} `json:"BillingCycle"`

cmd/add/add.go

@@ -3,6 +3,7 @@ package add
 import (
 	"github.com/loginradius/lr-cli/cmd/add/account"
 	"github.com/loginradius/lr-cli/cmd/add/domain"
+	"github.com/loginradius/lr-cli/cmd/add/schema"
 	"github.com/loginradius/lr-cli/cmd/add/site"
 	"github.com/loginradius/lr-cli/cmd/add/social"
 
@@ -29,5 +30,8 @@ func NewaddCmd() *cobra.Command {
 	accountCmd := account.NewaccountCmd()
 	cmd.AddCommand(accountCmd)
 
+	schemaCmd := schema.NewschemaCmd()
+	cmd.AddCommand(schemaCmd)
+
 	return cmd
 }

cmd/add/schema/schema.go

@@ -0,0 +1,145 @@
+package schema
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"os"
+
+	"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"
+)
+
+var temp int
+
+type Schema struct {
+	Display          string `json:"Display"`
+	Enabled          bool   `json:"Enabled"`
+	IsMandatory      bool   `json:"IsMandatory"`
+	Parent           string `json:"Parent"`
+	ParentDataSource string `json:"ParentDataSource"`
+	Permission       string `json:"Permission"`
+	Name             string `json:"name"`
+	Rules            string `json:"rules"`
+	Status           string `json:"status"`
+	Type             string `json:"type"`
+}
+type schemaStr struct {
+	Data []Schema `json:"Data"`
+}
+
+var urlall string
+var url1 string
+
+func NewschemaCmd() *cobra.Command {
+
+	cmd := &cobra.Command{
+		Use:     "schema",
+		Short:   "add schema config",
+		Long:    `This commmand adds schema config field`,
+		Example: heredoc.Doc(`$ lr add schema`),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if temp == 0 {
+				return &cmdutil.FlagError{Err: errors.New("`field` is required argument")}
+			}
+			return add(temp)
+
+		},
+	}
+	fl := cmd.Flags()
+	fl.IntVarP(&temp, "field", "f", 0, "field number")
+	return cmd
+}
+
+func add(temp int) error {
+
+	res, err := api.GetSites()
+	if err != nil {
+		return err
+	}
+
+	if res.Productplan.Name == "free" {
+		fmt.Println("Kindly Upgrade the plan to enable this command for your app")
+		return nil
+	}
+
+	conf := config.GetInstance()
+	urlall = conf.AdminConsoleAPIDomain + "/platform-configuration/platform-registration-fields?"
+
+	var resultResp schemaStr
+	resp, err := request.Rest(http.MethodGet, urlall, nil, "")
+
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(resp, &resultResp)
+	if err != nil {
+		return err
+	}
+	var temp1 []int
+	for i := 0; i < len(resultResp.Data); i++ {
+		if resultResp.Data[i].Parent == "" {
+			temp1 = append(temp1, i)
+		}
+	}
+	url1 = conf.AdminConsoleAPIDomain + "/platform-configuration/registration-form-settings?"
+	var resultResp1 schemaStr
+	resp, err = request.Rest(http.MethodGet, url1, nil, "")
+
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(resp, &resultResp1)
+	if err != nil {
+		return err
+	}
+	resultResp.Data[temp1[temp-1]].Enabled = true
+	var DisplayName string
+	var req string
+	fmt.Print("Enter the Display Name (" + resultResp.Data[temp1[temp-1]].Display + ") :")
+	scanner := bufio.NewScanner(os.Stdin)
+	scanner.Scan()
+	DisplayName = scanner.Text()
+	if DisplayName == "" {
+		DisplayName = resultResp.Data[temp1[temp-1]].Display
+	}
+	fmt.Print("Is Required (y/n):")
+	fmt.Scanln(&req)
+	for req != "Y" && req != "y" && req != "N" && req != "n" {
+		fmt.Print("Please enter (y/n):")
+		fmt.Scanln(&req)
+	}
+	if req == "Y" || req == "y" {
+		resultResp.Data[temp1[temp-1]].IsMandatory = true
+	} else if req == "N" || req == "n" {
+		resultResp.Data[temp1[temp-1]].IsMandatory = false
+	}
+	resultResp.Data[temp1[temp-1]].Display = DisplayName
+
+	resultResp1.Data = append(resultResp1.Data, resultResp.Data[temp1[temp-1]])
+	body, _ := json.Marshal(resultResp1)
+	url1 = conf.AdminConsoleAPIDomain + "/platform-configuration/default-fields?"
+	var resultResp2 schemaStr
+	resp, err = request.Rest(http.MethodPost, url1, nil, string(body))
+
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(resp, &resultResp2)
+	if err != nil {
+		return err
+	}
+	fmt.Println("Your field has been sucessfully added")
+
+	return nil
+}

cmd/cmd.go

@@ -1,18 +1,12 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/loginradius/lr-cli/cmd/root"
 )
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	rootCmd := root.NewRootCmd()
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
+	rootCmd.Execute()
 }

cmd/delete/delete.go

@@ -4,6 +4,7 @@ import (
 	"github.com/loginradius/lr-cli/cmd/delete/account"
 	"github.com/loginradius/lr-cli/cmd/delete/domain"
 	"github.com/loginradius/lr-cli/cmd/delete/schema"
+
 	"github.com/loginradius/lr-cli/cmd/delete/site"
 	"github.com/loginradius/lr-cli/cmd/delete/social"
 

cmd/delete/schema/schema.go

@@ -61,35 +61,44 @@ func NewschemaCmd() *cobra.Command {
 }
 
 func delete(Field string) error {
-	res, err2 := api.GetSites()
-	if (res.Productplan) != res.Productplan || res.Productplan.Name == "free" {
+	res, err := api.GetSites()
+	if err != nil {
+		return err
+	}
+	if res.Productplan.Name == "free" {
 		fmt.Println("Kindly Upgrade the plan to enable this command for your app")
 		return nil
 	}
-	if err2 != nil {
-		return err2
-	}
+
+
 	var url string
 	var url1 string
 	conf := config.GetInstance()
 
 	url1 = conf.AdminConsoleAPIDomain + "/platform-configuration/registration-form-settings?"
 	var resultResp1 Result
-	resp1, err1 := request.Rest(http.MethodGet, url1, nil, "")
-	err1 = json.Unmarshal(resp1, &resultResp1)
-	if err1 != nil {
-		return err1
+	resp, err := request.Rest(http.MethodGet, url1, nil, "")
+	err = json.Unmarshal(resp, &resultResp1)
+	if err != nil {
+		return err
 	}
+	var noMatch = true
 	for i := 0; i < len(resultResp1.Data); i++ {
 		if resultResp1.Data[i].Name == Field {
 			resultResp1.Data[i].Enabled = false
+			noMatch = false
 		}
 	}
+	if noMatch {
+		fmt.Println("Please enter the correct field name")
+		return nil
+	}
+
 	body, _ := json.Marshal(resultResp1)
 	url = conf.AdminConsoleAPIDomain + "/platform-configuration/default-fields?"
 
 	var resultResp Result
-	resp, err := request.Rest(http.MethodPost, url, nil, string(body))
+	resp, err = request.Rest(http.MethodPost, url, nil, string(body))
 	err = json.Unmarshal(resp, &resultResp)
 	if err != nil {
 		return err

cmd/get/schema/schema.go

@@ -62,20 +62,16 @@ func NewschemaCmd() *cobra.Command {
 }
 
 func get() error {
-	res, err1 := api.GetSites()
-	var re struct {
-		Name         string      "json:\"Name\""
-		Expirytime   time.Time   "json:\"ExpiryTime\""
-		Billingcycle interface{} "json:\"BillingCycle\""
-		Fromdate     interface{} "json:\"FromDate\""
+	res, err := api.GetSites()
+	if err != nil {
+		return err
 	}
-	if res.Productplan == re || res.Productplan.Name == "free" {
+	if res.Productplan.Name == "free" {
 		fmt.Println("Kindly Upgrade the plan to enable this command for your app")
 		return nil
 	}
-	if err1 != nil {
-		return err1
-	}
+
+
 	conf := config.GetInstance()
 	if temp == "active" {
 		url = conf.AdminConsoleAPIDomain + "/platform-configuration/registration-form-settings?"
@@ -109,9 +105,11 @@ func get() error {
 	var num int
 
 	// Taking input from user
+	fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(temp1)) + " :")
 	fmt.Scanln(&num)
 	for 1 > num || num > len(temp1) {
-		fmt.Println("Please select a number from 1 to " + fmt.Sprint(len(temp1)))
+		fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(temp1)) + " :")
+
 		fmt.Scanln(&num)
 	}
 	if resultResp.Data[temp1[num-1]].Parent == "" {

cmd/login/login.go

@@ -31,11 +31,11 @@ func NewLoginCmd() *cobra.Command {
 		Use:   "login",
 		Short: "Login to LR account",
 		Long: heredoc.Doc(`
-			This commmand logs user into the LR account.
+		This commmand logs user into the LR account.
 		`),
 		Example: heredoc.Doc(`
-		    # Opens Interactive Mode
-			$ lr login
+		# Opens Interactive Mode
+		$ lr login
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			isValid, err := validateLogin()

cmd/root/root.go

@@ -21,9 +21,10 @@ var cfgFile string
 func NewRootCmd() *cobra.Command {
 	// rootCmd represents the base command when called without any subcommands
 	rootCmd := &cobra.Command{
-		Use:   "lr",
-		Short: "LR CLI",
-		Long:  `LoginRadius CLI to support LoginRadius API's and workflow`,
+		Use:          "lr",
+		Short:        "LR CLI",
+		Long:         `LoginRadius CLI to support LoginRadius API's and workflow`,
+		SilenceUsage: true,
 	}
 
 	helpHelper := func(command *cobra.Command, args []string) {