Skip to content

Commit a04b111

Browse files
committed
resolved all conflicts
1 parent c2ffcf5 commit a04b111

5 files changed

Lines changed: 64 additions & 0 deletions

File tree

api/securityConfiguration.go

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@ type ResetResponse struct {
1414
XToken string `json:"xtoken"`
1515
}
1616

17+
type EmailResponse struct {
18+
Domains []string `json:"Domains"`
19+
ListType string `json:"ListType"`
20+
RegistrationType string `json:"RegistrationType"`
21+
}
22+
23+
type RegistrationRestrictionTypeSchema struct {
24+
SelectedRestrictionType string `json:"selectedRestrictionType"`
25+
}
26+
27+
type EmailWhiteBLackListSchema struct {
28+
Domains []string `json:"Domains"`
29+
}
30+
1731
func ResetSecret() error {
1832

1933
// Restting the Secret
@@ -58,4 +72,41 @@ func ResetSecret() error {
5872
_ = cmdutil.WriteFile("token.json", lInfo)
5973
return nil
6074

75+
}
76+
77+
func GetEmailWhiteListBlackList() (*EmailResponse, error) {
78+
79+
url := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/config?"
80+
resp, err := request.Rest(http.MethodGet, url, nil, "")
81+
if err != nil {
82+
return nil, err
83+
}
84+
var resObj EmailResponse
85+
err = json.Unmarshal(resp, &resObj)
86+
if err != nil {
87+
return nil, err
88+
}
89+
return &resObj, nil
90+
91+
}
92+
93+
func AddEmailWhitelistBlacklist(restrictionType RegistrationRestrictionTypeSchema, data EmailWhiteBLackListSchema) error {
94+
typeUrl := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/type?"
95+
body, _ := json.Marshal(restrictionType)
96+
_, err := request.Rest(http.MethodPut, typeUrl, nil, string(body))
97+
98+
if err != nil {
99+
return err
100+
}
101+
102+
if restrictionType.SelectedRestrictionType != "none" {
103+
domainUrl := conf.AdminConsoleAPIDomain + "/security-configuration/restriction/config?"
104+
body, _ := json.Marshal(data)
105+
_, err := request.Rest(http.MethodPost, domainUrl, nil, string(body))
106+
107+
if err != nil {
108+
return err
109+
}
110+
}
111+
return nil
61112
}

cmd/add/add.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/loginradius/lr-cli/cmd/add/hooks"
1010
"github.com/loginradius/lr-cli/cmd/add/social"
11+
"github.com/loginradius/lr-cli/cmd/add/accessRestriction"
1112
"github.com/loginradius/lr-cli/cmd/add/smtpConfiguration"
1213

1314
"github.com/spf13/cobra"
@@ -45,6 +46,8 @@ func NewaddCmd() *cobra.Command {
4546
customFieldsCmd := customField.NewAddCFCmd()
4647
cmd.AddCommand(customFieldsCmd)
4748

49+
accessRestrictionCmd := accessRestriction.NewaccessRestrictionCmd()
50+
cmd.AddCommand(accessRestrictionCmd)
4851

4952
smtpConfigurationCmd := smtpConfiguration.NewsmtpConfigurationCmd()
5053
cmd.AddCommand(smtpConfigurationCmd)

cmd/delete/delete.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/loginradius/lr-cli/cmd/delete/sott"
99

1010
"github.com/loginradius/lr-cli/cmd/delete/social"
11+
"github.com/loginradius/lr-cli/cmd/delete/accessRestriction"
1112
"github.com/loginradius/lr-cli/cmd/delete/smtpConfiguration"
1213

1314
"github.com/spf13/cobra"
@@ -45,6 +46,8 @@ func NewdeleteCmd() *cobra.Command {
4546
customFieldsCmd := customField.NewDeleteCFCmd()
4647
cmd.AddCommand(customFieldsCmd)
4748

49+
accessRestrictionCmd := accessRestriction.NewaccessRestrictionCmd()
50+
cmd.AddCommand(accessRestrictionCmd)
4851

4952
smtpConfigurationCmd := smtpConfiguration.NewsmtpConfigurationCmd()
5053
cmd.AddCommand(smtpConfigurationCmd)

cmd/get/get.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/loginradius/lr-cli/cmd/get/serverInfo"
1616
"github.com/loginradius/lr-cli/cmd/get/social"
1717
"github.com/loginradius/lr-cli/cmd/get/theme"
18+
"github.com/loginradius/lr-cli/cmd/get/accessRestriction"
1819
"github.com/loginradius/lr-cli/cmd/get/smtpConfiguration"
1920

2021
"github.com/spf13/cobra"
@@ -67,6 +68,8 @@ func NewGetCmd() *cobra.Command {
6768
schemaCmd := schema.NewschemaCmd()
6869
cmd.AddCommand(schemaCmd)
6970

71+
accessRestrictionCmd := accessRestriction.NewaccessRestrictionCmd()
72+
cmd.AddCommand(accessRestrictionCmd)
7073

7174
smtpConfigurationCmd := smtpConfiguration.NewsmtpConfigurationCmd()
7275
cmd.AddCommand(smtpConfigurationCmd)

cmd/set/set.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/loginradius/lr-cli/cmd/set/schema"
77
"github.com/loginradius/lr-cli/cmd/set/social"
88
"github.com/loginradius/lr-cli/cmd/set/theme"
9+
"github.com/loginradius/lr-cli/cmd/set/accessRestriction"
910
"github.com/loginradius/lr-cli/cmd/set/smtpConfiguration"
1011

1112
"github.com/spf13/cobra"
@@ -37,6 +38,9 @@ func NewsetCmd() *cobra.Command {
3738
socialCmd := social.NewsocialCmd()
3839
cmd.AddCommand(socialCmd)
3940

41+
accessRestrictionCmd := accessRestriction.NewaccessRestrictionCmd()
42+
cmd.AddCommand(accessRestrictionCmd)
43+
4044
smtpConfigurationCmd := smtpConfiguration.NewsmtpConfigurationCmd()
4145
cmd.AddCommand(smtpConfigurationCmd)
4246

0 commit comments

Comments
 (0)