Refactored the Devlop branch and updated get social command

Author: mohammed786

api/platformConfiguration.go

@@ -20,7 +20,7 @@ type Provider struct {
 }
 
 type ProviderList struct {
-	Data1 []Provider `json:"Data"`
+	Data []Provider `json:"Data"`
 }
 type FieldTypeConfig struct {
 	Name                             string
@@ -29,37 +29,37 @@ type FieldTypeConfig struct {
 }
 
 var TypeMap = map[int]FieldTypeConfig{
-	1: FieldTypeConfig{
+	1: {
 		Name:                             "String",
 		ShouldDisplayValidaitonRuleInput: true,
 		ShouldShowOption:                 false,
 	},
-	2: FieldTypeConfig{
+	2: {
 		Name:                             "CheckBox",
 		ShouldDisplayValidaitonRuleInput: false,
 		ShouldShowOption:                 false,
 	},
-	3: FieldTypeConfig{
+	3: {
 		Name:                             "Option",
 		ShouldDisplayValidaitonRuleInput: false,
 		ShouldShowOption:                 true,
 	},
-	4: FieldTypeConfig{
+	4: {
 		Name:                             "Password",
 		ShouldDisplayValidaitonRuleInput: true,
 		ShouldShowOption:                 false,
 	},
-	5: FieldTypeConfig{
+	5: {
 		Name:                             "Hidden",
 		ShouldDisplayValidaitonRuleInput: true,
 		ShouldShowOption:                 false,
 	},
-	6: FieldTypeConfig{
+	6: {
 		Name:                             "Email",
 		ShouldDisplayValidaitonRuleInput: true,
 		ShouldShowOption:                 false,
 	},
-	7: FieldTypeConfig{
+	7: {
 		Name:                             "Text",
 		ShouldDisplayValidaitonRuleInput: true,
 		ShouldShowOption:                 false,

cmd/add/social/social.go

@@ -160,8 +160,8 @@ func add1(opts1 *socialProvider) error {
 func verify(str string) (bool, error) {
 	result, err := api.GetActiveProviders()
 	var match = false
-	for i := 0; i < len(result.Data1); i++ {
-		if str == result.Data1[i].Provider {
+	for i := 0; i < len(result.Data); i++ {
+		if str == result.Data[i].Provider {
 			match = true
 		}
 	}

cmd/get/social/social.go

@@ -11,8 +11,6 @@ var temp string
 
 var Url string
 
-var arr = [5]string{"Facebook", "Google", "Twitter", "LinkedIn", "GitHub"}
-
 func NewsocialCmd() *cobra.Command {
 
 	cmd := &cobra.Command{
@@ -21,78 +19,43 @@ 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
-		}
+
+	resultResp, err := api.GetActiveProviders()
+	if err != nil {
+		return err
 	}
-	if temp == "active" {
-		resultResp, err := api.GetActiveProviders()
-		if err != nil {
-			return err
-		}
-		if len(resultResp.Data1) == 0 {
-			fmt.Println("There is no social configuration")
-			return nil
-		}
-		var num int
-		for i := 0; i < len(resultResp.Data1); i++ {
-			fmt.Print(fmt.Sprint(i+1) + ".")
-			fmt.Println(resultResp.Data1[i].Provider)
-		}
-		// Taking input from user
-		fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(resultResp.Data1)) + " :")
-		fmt.Scanln(&num)
-		for 1 > num || num > len(resultResp.Data1) {
-			fmt.Print("Please select a number from 1 to " + fmt.Sprint(len(resultResp.Data1)) + " :")
+	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.Data1[num-1].HtmlFileName)
-		fmt.Println("Provider: ", resultResp.Data1[num-1].Provider)
-		fmt.Println("ProviderId: ", resultResp.Data1[num-1].ProviderId)
-		fmt.Println("ProviderKey: ", resultResp.Data1[num-1].ProviderKey)
-		fmt.Println("ProviderSecret: ", resultResp.Data1[num-1].ProviderSecret)
-		fmt.Println("Scope: ", resultResp.Data1[num-1].Scope)
-		fmt.Println("Status: ", resultResp.Data1[num-1].Status)
+		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
 }

cmd/set/theme/theme.go

@@ -24,7 +24,7 @@ type body struct {
 }
 type CustomJS struct {
 	Content  string `json:"Content"`
-	fileName string `json:"fileName"`
+	FileName string `json:"fileName"`
 }
 
 func NewThemeCmd() *cobra.Command {
@@ -159,7 +159,7 @@ func updateCalls() error {
 	var customJSProf body
 	cjs := CustomJS{
 		Content:  "options = {\n    \"language\": \"English\"\n}",
-		fileName: "lr-interface-options",
+		FileName: "lr-interface-options",
 	}
 	customJSAuth.CustomJS = append(customJSAuth.CustomJS, cjs)
 	customJSProf.CustomJS = append(customJSProf.CustomJS, cjs)