Merge pull request #73 from LoginRadius/develop

Merging to Main for 2.0.0-beta release

Author: VershaGupta

CONTRIBUTING.md

@@ -20,7 +20,7 @@ This project and everyone participating in it are governed by the [LoginRadius C
 ### Reporting Bugs
 
 * **Do not open up a GitHub issue if the bug is a security vulnerability
-  in LoginRadius CLI**, and instead to refer to our [security policy](https://www.loginradius.com/security-policy).
+  in LoginRadius CLI**, and instead refer to our [security policy](https://www.loginradius.com/security-policy).
 
 * **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/loginradius/lr-cli/issues).
 

README.md

@@ -1,6 +1,6 @@
 # LoginRadius CLI
 
-`lr` is LoginRadius on the command line. You can perform basic actions of your [LoginRadius Dashboard](https://dashboard.loginradius.com/dashboard) through command line. The actions includes **login, register, logout, email configuration, domain whitelisting etc**.
+`lr` is LoginRadius on the command line. You can perform basic actions of your [LoginRadius Admin Console](https://adminconsole.loginradius.com/dashboard) through command line. The actions includes **login, logout, email configuration, domain whitelisting etc**.
 
 ![](./cli_home.png)
 

api/auth.go

@@ -142,10 +142,9 @@ func SitesBasic(tokens *SitesToken) error {
 
 func GetAppsInfo() (map[int64]SitesReponse, error) {
 	var Apps CoreAppData
-	data, err := cmdutil.ReadFile("siteInfo.json")
-	if err != nil {
+
 		coreAppData := conf.AdminConsoleAPIDomain + "/auth/core-app-data?"
-		data, err = request.Rest(http.MethodGet, coreAppData, nil, "")
+		data, err := request.Rest(http.MethodGet, coreAppData, nil, "")
 		if err != nil {
 			return nil, err
 		}
@@ -154,10 +153,6 @@ func GetAppsInfo() (map[int64]SitesReponse, error) {
 			return nil, err
 		}
 		return storeSiteInfo(Apps), nil
-	}
-	var siteInfo map[int64]SitesReponse
-	err = json.Unmarshal(data, &siteInfo)
-	return siteInfo, nil
 }
 
 func CurrentID() (int64, error) {

api/deployment.go

@@ -3,12 +3,14 @@ package api
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"strings"
 
 	"net/http"
 	"time"
 
 	"github.com/loginradius/lr-cli/cmdutil"
+	"github.com/loginradius/lr-cli/prompt"
 	"github.com/loginradius/lr-cli/request"
 )
 
@@ -82,16 +84,19 @@ type CoreAppData struct {
 }
 
 func GetSites() (*SitesReponse, error) {
-
-	var siteInfo SitesReponse
-	data, err := cmdutil.ReadFile("currentSite.json")
+	var url string
+	url = conf.AdminConsoleAPIDomain + "/deployment/sites?ownerUid=&"
+	domainResp, err := request.Rest(http.MethodGet, url, nil, "" )
 	if err != nil {
-		return nil, errors.New("Please Login to execute this command")
+		return nil, err
 	}
-	err = json.Unmarshal(data, &siteInfo)
+	var siteInfo SitesReponse
+	err = json.Unmarshal(domainResp, &siteInfo)
 	if err != nil {
 		return nil, err
 	}
+	sInfo, _ := json.Marshal(siteInfo)
+	_ = cmdutil.WriteFile("currentSite.json", sInfo)
 	return &siteInfo, nil
 }
 
@@ -145,8 +150,8 @@ func CheckLoginMethod() error {
 	if err != nil {
 		return err
 	}
-	if res.Productplan.Name != "business" {
-		return errors.New("This command applies to Phone login and Passwordless login which are available only with the Developer Pro plan. Kindly upgrade your plan to use this feature.")
+	if res.Productplan != nil && res.Productplan.Name != "business" {
+		return errors.New("this command applies to Phone login and Passwordless login which are available only with the Developer Pro plan. Kindly upgrade your plan to use this feature")
 	}
 	return nil
 }
@@ -190,13 +195,36 @@ func UpdateDomain(domains []string) error {
 	return nil
 }
 
-func CheckPlan() error {
+func CheckTrial() (bool, error) { // returns false if trial period has expired.
 	sitesResp, err := GetSites()
 	if err != nil {
-		return err
+		return false, err
 	}
-	if sitesResp.Productplan.Name == "free" {
-		return errors.New("Please switch to developer/developer pro app or upgrade your plan to enable this feature.")
+	today := time.Now()
+	check := today.After(sitesResp.Productplan.Expirytime)
+	if check {
+		return false, nil
 	}
-	return nil
+	return true, nil
+}
+
+func CardPay() (bool, error) {
+	paymentInfo, err := PaymentInfo()
+	if err != nil {
+		return false, err
+	}
+	paymentMethodId := paymentInfo.Data.Order[0].Paymentdetail.Stripepaymentmethodid
+	if paymentMethodId == "" {
+		fmt.Println("Please upgrade services by adding card details in dashboard via browser. ") //trial expired.
+		fmt.Printf("Press Y to open Browser window:")
+		var option bool
+		prompt.Confirm("Do you want to open the browser?", &option)
+		if !option {
+			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
 }

api/platformConfiguration.go

@@ -3,21 +3,27 @@ package api
 import (
 	"encoding/json"
 	"net/http"
-
+	"strings"
 	"github.com/loginradius/lr-cli/request"
 )
 
 // Social Provider Schemas
 type ActiveProvider struct {
+	Provider       string   `json:"ProviderName"`
+	Status         bool     `json:"Status"`
+}
+
+type ProviderDetail struct {
 	HtmlFileName   string   `json:"HtmlFileName"`
 	Provider       string   `json:"Provider"`
-	ProviderId     int      `json:"ProviderId"`
+	ProviderId     string   `json:"ProviderId"`
 	ProviderKey    string   `json:"ProviderKey"`
 	ProviderSecret string   `json:"ProviderSecret"`
 	Scope          []string `json:"Scope"`
 	Status         bool     `json:"Status"`
 }
 
+
 type ProviderOptSchema struct {
 	Display  string `json:"display"`
 	Name     string `json:"name"`
@@ -42,6 +48,7 @@ type AddProviderObj struct {
 	ProviderSecret string   `json:"ProviderSecret"`
 	Scope          []string `json:"Scope"`
 	Status         bool     `json:"status"`
+	HtmlFileName   string   `json:"HtmlFileName"`
 }
 
 type AddProviderSchema struct {
@@ -101,39 +108,67 @@ type Schema struct {
 	Options []OptSchema `json:"Options"`
 	Rules   string      `json:"Rules"`
 	Type    string      `json:"Type"`
+	Permission string `json:"Permission"`
+	Parent string `json:"Parent"`
 }
 type OptSchema struct {
 	Value string `json:"value"`
 	Text  string `json:"text"`
 }
 
-type CustomFieldSchema struct {
+type CustomSchema struct {
 	Key     string `json:"Key"`
 	Display string `json:"Display"`
 }
 
-type FieldSchema struct {
-	CustomFields       []CustomFieldSchema `json:"customFields"`
-	RegistrationFields map[string]Schema   `json:"registrationFields"`
-}
 type RegistrationSchema struct {
-	Data FieldSchema `json:"data"`
+	Data []Schema `json:"data"`
+}
+
+type CustomFieldSchema struct {
+	Data []CustomSchema `json:"data"`
 }
+
 type AddCFRespSchema struct {
 	ResponseAddCustomField struct {
 		Data []CustomFieldSchema `json:"Data"`
+		ErrorCode int  `json:"errorCode"`
+		Message string  `json:"message"`
+		Description string  `json:"description"`
+
 	} `json:"responseAddCustomField"`
 }
 type UpdateRegFieldSchema struct {
-	Fields []Schema `json:"fields"`
+	Data []Schema `json:"data"`
 }
 
 type PasswordlessLogin struct {
 	Enabled bool `json:"isEnabled"`
 }
 
-func GetRegistrationFields() (*RegistrationSchema, error) {
-	url := conf.AdminConsoleAPIDomain + "/platform-configuration/registration-schema"
+type CustomFieldLimit struct {
+	Limit int `json:"CustomFieldLimit"`
+}
+
+
+func GetAllCustomFields() (*CustomFieldSchema, error) {
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/custom-fields?d="
+
+	var resultResp CustomFieldSchema
+	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 GetAllRegistrationFields() (map[string]Schema, error) {
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/platform-registration-fields?d="
 
 	var resultResp RegistrationSchema
 	resp, err := request.Rest(http.MethodGet, url, nil, "")
@@ -145,14 +180,59 @@ func GetRegistrationFields() (*RegistrationSchema, error) {
 	if err != nil {
 		return nil, err
 	}
+	provMap := make(map[string]Schema, len(resultResp.Data))
+
+	for _ ,value := range resultResp.Data {
+		if value.Parent == "" {
+			provMap[strings.ToLower(value.Name)] = value
+		}
+	}
 
+
+	return provMap, nil
+}
+
+
+func GetRegistrationFields() (map[string]Schema, error) {
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/registration-form-settings?d="
+
+	var resultResp RegistrationSchema
+	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
+	}
+	provMap := make(map[string]Schema, len(resultResp.Data))
+
+	for _ ,value := range resultResp.Data {
+		provMap[strings.ToLower(value.Name)] = value
+	}
+	return provMap, nil
+}
+
+func GetCustomFieldLimit() (*CustomFieldLimit, error) {
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/custom-fields-limit"
+	
+	var resultResp CustomFieldLimit
+	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 AddCustomField(customfield string) (*AddCFRespSchema, error) {
 	url := conf.AdminConsoleAPIDomain + "/platform-configuration/custom-field"
 	body, _ := json.Marshal(map[string]string{
-		"customField": customfield,
+		"customfield": customfield,
 	})
 	var resultResp AddCFRespSchema
 	resp, err := request.Rest(http.MethodPost, url, nil, string(body))
@@ -191,7 +271,7 @@ func DeleteCustomField(field string) (*bool, error) {
 }
 
 func UpdateRegField(data UpdateRegFieldSchema) (*RegistrationSchema, error) {
-	url := conf.AdminConsoleAPIDomain + "/platform-configuration/registration-schema"
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/default-fields?d="
 	body, _ := json.Marshal(data)
 	var resultResp RegistrationSchema
 	resp, err := request.Rest(http.MethodPost, url, nil, string(body))
@@ -247,7 +327,8 @@ func GetAllProviders() (map[string]ProviderSchema, error) {
 	return provMap, nil
 }
 
-func GetActiveProviders() (map[string]ActiveProvider, error) {
+
+func GetProvidersDetail() (map[string]ProviderDetail, error) {
 	url := conf.AdminConsoleAPIDomain + "/platform-configuration/social-providers/options"
 
 	resp, err := request.Rest(http.MethodGet, url, nil, "")
@@ -256,6 +337,33 @@ func GetActiveProviders() (map[string]ActiveProvider, error) {
 		return nil, err
 	}
 
+	type ProviderDetailList struct {
+		Data []ProviderDetail `json:"Data"`
+	}
+	var resultResp ProviderDetailList
+
+	err = json.Unmarshal(resp, &resultResp)
+	if err != nil {
+		return nil, err
+	}
+
+	provMap := make(map[string]ProviderDetail, len(resultResp.Data))
+	for _, val := range resultResp.Data {
+		provMap[strings.ToLower(val.Provider)] = val
+	}
+
+	return provMap , nil
+}
+
+func GetActiveProviders() (map[string]ActiveProvider, error) {
+	url := conf.AdminConsoleAPIDomain + "/platform-configuration/social-providers?v="
+
+	resp, err := request.Rest(http.MethodGet, url, nil, "")
+
+	if err != nil {
+		return nil, err
+	}
+
 	type ActiveProviderList struct {
 		Data []ActiveProvider `json:"Data"`
 	}
@@ -267,7 +375,7 @@ func GetActiveProviders() (map[string]ActiveProvider, error) {
 	}
 	provMap := make(map[string]ActiveProvider, len(resultResp.Data))
 	for _, val := range resultResp.Data {
-		provMap[val.Provider] = val
+		provMap[strings.ToLower(val.Provider)] = val
 	}
 
 	return provMap, nil

cli_home.png

@@ -91,7 +91,8 @@ func add(Account account) error {
 	}
 	fmt.Println("User Account successfully created, Please Check email to set the password")
 	fmt.Println("Please find the user details below:")
-	if *resultResp.FirstName != "" {
+
+	if Account.FirstName != "" {
 		fmt.Println("First name: " + *resultResp.FirstName)
 	}
 	fmt.Println("Email: " + resultResp.Email[0].Value)