Dev to Develop merge (#80)

* Added the feature of setting access restriction type and email/domain whitelist blaklist

* Added the feature of smtp configuration

* Updated messages and docs

* resolved the delete command bug if one domain exist

* Updated content and all other changes

* resolved all conflicts

* resolved all the bugs in cli

---------

Co-authored-by: muskansoninmh <muskansoninmh1@gmail.com>

Author: VershaGupta

api/auth.go

@@ -131,7 +131,7 @@ func SitesBasic(tokens *SitesToken) error {
 	if err != nil {
 		return err
 	}
-	_, err = GetAppsInfo()
+	_,_, err = GetAppsInfo()
 	if err != nil {
 		return err
 	}
@@ -140,19 +140,20 @@ func SitesBasic(tokens *SitesToken) error {
 
 }
 
-func GetAppsInfo() (map[int64]SitesReponse, error) {
+func GetAppsInfo() (map[int64]SitesReponse,map[int64]SharedSitesReponse, error) {
 	var Apps CoreAppData
 
 		coreAppData := conf.AdminConsoleAPIDomain + "/auth/core-app-data?"
 		data, err := request.Rest(http.MethodGet, coreAppData, nil, "")
 		if err != nil {
-			return nil, err
+			return nil,nil, err
 		}
 		err = json.Unmarshal(data, &Apps)
 		if err != nil {
-			return nil, err
+			return nil,nil, err
 		}
-		return storeSiteInfo(Apps), nil
+		apps, sharedApps := storeSiteInfo(Apps) 
+		return apps,sharedApps, nil
 }
 
 func CurrentID() (int64, error) {
@@ -203,12 +204,17 @@ func IsPasswordLessEnabled(features FeatureSchema) bool {
 	return false
 }
 
-func storeSiteInfo(data CoreAppData) map[int64]SitesReponse {
+func storeSiteInfo(data CoreAppData) (map[int64]SitesReponse, map[int64]SharedSitesReponse) {
 	siteInfo := make(map[int64]SitesReponse, len(data.Apps.Data))
+	sharedsiteInfo := make(map[int64]SharedSitesReponse, len(data.Apps.Data))
 	for _, app := range data.Apps.Data {
 		siteInfo[app.Appid] = app
 	}
 	obj, _ := json.Marshal(siteInfo)
+	for _, app := range data.SharedApps.Data {
+		sharedsiteInfo[app.Appid] = app
+	}
+	obj, _ = json.Marshal(sharedsiteInfo)
 	cmdutil.WriteFile("siteInfo.json", obj)
 	currentId, err := CurrentID()
 	if err == nil {
@@ -218,7 +224,7 @@ func storeSiteInfo(data CoreAppData) map[int64]SitesReponse {
 			cmdutil.WriteFile("currentSite.json", obj)
 		}
 	}
-	return siteInfo
+	return siteInfo,sharedsiteInfo
 }
 
 func UpdatePhoneLogin(feature string, status bool) (*FeatureSchema, error) {

api/deployment.go

@@ -49,6 +49,28 @@ type SitesReponse struct {
 	} `json:"ProductPlan"`
 }
 
+type SharedSitesReponse struct {
+	Appname               string      `json:"AppName"`
+	Domain                string      `json:"Domain"`
+	Appid                 int64       `json:"AppId"`
+	AppKey           	  string      `json:"ApiKey"`
+	AppSecret             string      `json:"ApiSecret"`
+	Role                  []string    `json:"Role"`
+	AdditionalPermissions []string 	  `json:"AdditionalPermissions"`
+	Recurlyaccountcode    *string     `json:"RecurlyAccountCode"`
+	Userlimit             int         `json:"UserLimit"`
+	Domainlimit           int         `json:"DomainLimit"`
+	Apiversion            string      `json:"ApiVersion"`
+	Israasenabled         bool        `json:"IsRaasEnabled"`
+	Ownerid               string      `json:"OwnerId"`
+	Productplan           *struct {
+		Name         string      `json:"Name"`
+		Expirytime   time.Time   `json:"ExpiryTime"`
+		Billingcycle interface{} `json:"BillingCycle"`
+		Fromdate     interface{} `json:"FromDate"`
+	} `json:"ProductPlan"`
+}
+
 type HostedPageResponse struct {
 	Pages []struct {
 		Pagetype     string        `json:"PageType"`
@@ -81,6 +103,34 @@ type CoreAppData struct {
 	Apps struct {
 		Data []SitesReponse `json:"Data"`
 	} `json:"apps"`
+	SharedApps struct {
+		Data []SharedSitesReponse `json:"Data"`
+	} `json:"sharedApps"`
+}
+
+type SmtpConfigSchema struct {
+	FromEmailId     string		`json:"FromEmailId"`
+	FromName    	string		`json:"FromName"`
+	IsSsl   		bool        `json:"IsSsl"`
+	Key      		string      `json:"Key"`
+	Password 		string      `json:"Password"`
+	Provider    	string		`json:"provider"`
+	Secret     		string      `json:"Secret"`
+	SmtpHost     	string      `json:"SmtpHost"`
+	SmtpPort     	int         `json:"SmtpPort"`
+	UserName     	string      `json:"UserName"`
+}
+
+type VerifySmtpConfigSchema struct {
+	SmtpConfigSchema
+	EmailId 		string		`json:"emailId"`
+	Message 		string		`json:"message"`
+	Subject 		string		`json:"subject"`
+}
+
+type VerifySmtpConfigError struct {
+	Description 		string		`json:"description"`
+	Message 		string		`json:"message"`
 }
 
 func GetSites() (*SitesReponse, error) {
@@ -228,3 +278,61 @@ func CardPay() (bool, error) {
 	}
 	return true, nil
 }
+
+func GetSMTPConfiguration() (*SmtpConfigSchema, error) {
+	url := conf.AdminConsoleAPIDomain + "/deployment/smtp-settings/config?"
+	
+	var resultResp SmtpConfigSchema
+	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 AddSMTPConfiguration(data SmtpConfigSchema) (*SmtpConfigSchema, error) {
+	var url string
+	if strings.ToLower(data.Provider) == "mailazy"{
+		url = conf.AdminConsoleAPIDomain + "/deployment/smtp-settings/smtpprovider?"
+	} else {
+		url = conf.AdminConsoleAPIDomain + "/deployment/smtp-settings?"
+	}
+	body, _ := json.Marshal(data)
+	var resultResp SmtpConfigSchema
+	resp, err := request.Rest(http.MethodPost, url, nil, string(body))
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(resp, &resultResp)
+	if err != nil {
+		return nil, err
+	}
+	return &resultResp, nil
+}
+
+func VerifySMTPConfiguration(data VerifySmtpConfigSchema) error {
+	url := conf.AdminConsoleAPIDomain + "/deployment/smtp-settings/verifysmtpsettings?"
+	body, _ := json.Marshal(data)
+
+   _, err := request.Rest(http.MethodPost, url, nil, string(body))
+
+   if err != nil {
+	   return  err
+   }
+   return  nil
+}
+
+func DeleteSMTPConfiguration() error {
+	 url := conf.AdminConsoleAPIDomain + "/deployment/smtp-settings/reset?"
+	
+	_, err := request.Rest(http.MethodPost, url, nil, "")
+	if err != nil {
+		return  err
+	}
+	return  nil
+}

api/platformConfiguration.go

@@ -208,7 +208,11 @@ func GetRegistrationFields() (map[string]Schema, error) {
 	provMap := make(map[string]Schema, len(resultResp.Data))
 
 	for _ ,value := range resultResp.Data {
-		provMap[strings.ToLower(value.Name)] = value
+		if !strings.Contains(value.Name, "cf") {
+			provMap[strings.ToLower(value.Name)] = value
+		} else {
+			provMap[value.Name] = value
+		}
 	}
 	return provMap, nil
 }

api/securityConfiguration.go

@@ -14,6 +14,20 @@ type ResetResponse struct {
 	XToken string `json:"xtoken"`
 }
 
+type EmailResponse struct {
+	Domains []string `json:"Domains"`
+	ListType  string `json:"ListType"`
+	RegistrationType string `json:"RegistrationType"`
+}
+
+type RegistrationRestrictionTypeSchema struct {
+	SelectedRestrictionType string `json:"selectedRestrictionType"`
+}
+
+type EmailWhiteBLackListSchema struct {
+	Domains []string `json:"Domains"`
+}
+
 func ResetSecret() error {
 
 	// Restting the Secret
@@ -59,3 +73,40 @@ func ResetSecret() error {
 	return nil
 
 }
+
+func GetEmailWhiteListBlackList() (*EmailResponse, error) {
+	
+	url := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/config?"
+	resp, err := request.Rest(http.MethodGet, url, nil, "")
+	if err != nil {
+		return nil, err
+	}
+	var resObj EmailResponse
+	err = json.Unmarshal(resp, &resObj)
+	if err != nil {
+		return nil, err
+	}
+	return &resObj, nil
+
+}
+
+func AddEmailWhitelistBlacklist(restrictionType RegistrationRestrictionTypeSchema, data EmailWhiteBLackListSchema) error {
+	typeUrl := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/type?"
+	body, _ := json.Marshal(restrictionType)
+	_, err := request.Rest(http.MethodPut, typeUrl, nil, string(body))
+	
+	if err != nil {
+		return err
+	}
+
+	if restrictionType.SelectedRestrictionType != "none" {
+		domainUrl := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/config?"
+		body, _ := json.Marshal(data)
+		_, err := request.Rest(http.MethodPost, domainUrl, nil, string(body))
+		
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

cmd/add/accessRestriction/accessRestriction.go

@@ -0,0 +1,116 @@
+package accessRestriction
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/MakeNowJust/heredoc"
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/loginradius/lr-cli/api"
+
+	"github.com/loginradius/lr-cli/cmdutil"
+	"github.com/loginradius/lr-cli/prompt"
+
+
+	"github.com/spf13/cobra"
+)
+
+type domain struct {
+	Domain string `json:"domain"`
+}
+
+func NewaccessRestrictionCmd() *cobra.Command {
+
+	cmd := &cobra.Command{
+		Use:   "access-restriction",
+		Short: "Whitelist/Blacklist a Domain/Email",
+		Long:  `Use this command to Whitelist/Blacklist Domain/Email or to disable access restriction.`,
+		Example: heredoc.Doc(`
+		$ lr add access-restriction
+		? Select the Restriction Type: Whitelist
+		? Enter Domain/Email: <Domain>
+		? Adding Domain/Email to Whitelist will result in deletion of all Blacklist Domains/Emails. Are you sure you want to proceed?(Y/N):Yes 
+		
+		
+		 Whitelist Domain/email have been updated successfully
+		`),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return addAccessRestriction()
+		},
+	}
+
+	return cmd
+}
+
+func addAccessRestriction() error {
+	var restrictionType = []string {"None","WhiteList", "BlackList"}
+	var num int
+	var shouldAdd bool
+	err := prompt.SurveyAskOne(&survey.Select{
+		Message: "Select the Restriction Type:",
+		Options:  restrictionType,
+	}, &num)
+	if err != nil {
+		return err
+	}
+	var restrictType api.RegistrationRestrictionTypeSchema
+	restrictType.SelectedRestrictionType = strings.ToLower(restrictionType[num])
+	var AddEmail api.EmailWhiteBLackListSchema 
+	if restrictionType[num] != "None" {
+		resp, err := api.GetEmailWhiteListBlackList()
+			if err != nil {
+				if err.Error() != "No records found" {
+					return err
+				}
+			} else {
+				if strings.ToLower(resp.ListType) == strings.ToLower(restrictType.SelectedRestrictionType) {
+					AddEmail.Domains = resp.Domains 
+				}
+			}
+		var email string
+		prompt.SurveyAskOne(&survey.Input{
+			Message: "Enter Domain/Email:",
+		}, &email, survey.WithValidator(survey.Required))
+		if !cmdutil.AccessRestrictionDomain.MatchString(email)  {
+			return &cmdutil.FlagError{Err: errors.New("Entered Domain/Email field is invalid")}
+		}
+		for _, val := range AddEmail.Domains {
+			if val == email {
+				return &cmdutil.FlagError{Err: errors.New("Entered Domain/Email is already added")}
+			}
+		}
+		if  resp != nil && restrictionType[num] != resp.ListType {
+			
+			if err := prompt.Confirm("Adding Domain/Email to " + restrictionType[num] + "  will result in the deletion of all " + resp.ListType + " Domains/Emails. Are you sure you want to proceed?", 
+						&shouldAdd); err != nil {
+							return err
+			}
+		} else {
+			shouldAdd = true
+		}
+		
+		AddEmail.Domains = append(AddEmail.Domains, email)
+		
+	} else {
+		if err := prompt.Confirm("Disabling access restriction will result in the deletion of all Whitelist/Blacklist Domains/Emails. Are you sure you want to proceed?", 
+						&shouldAdd); err != nil {
+							return err
+			}
+	}
+	
+	if shouldAdd {
+		err = api.AddEmailWhitelistBlacklist(restrictType, AddEmail);
+		if err != nil {
+			return err
+		}
+		if restrictType.SelectedRestrictionType == "none" {
+			fmt.Println("Access restrictions have been disabled" )
+		} else {
+			fmt.Println(restrictionType[num] + " Domains/Emails have been updated successfully" )
+		}
+	}
+	
+	return nil
+
+}