From 6751b41cf2880e8dd17e901305b8031496a48e74 Mon Sep 17 00:00:00 2001 From: Matthew Altman Date: Wed, 11 Dec 2019 10:39:10 -0700 Subject: [PATCH] modify clients to --- build.savant | 2 +- pkg/fusionauth/Client.go | 60 ++++------------------------ pkg/fusionauth/Domain.go | 85 ++++++++-------------------------------- 3 files changed, 25 insertions(+), 122 deletions(-) diff --git a/build.savant b/build.savant index 34eb71e..4c67f75 100644 --- a/build.savant +++ b/build.savant @@ -3,7 +3,7 @@ */ savantVersion = "1.0.0" -project(group: "io.fusionauth", name: "go-client", version: "1.13.0", licenses: ["ApacheV2_0"]) { +project(group: "io.fusionauth", name: "go-client", version: "1.12.1", licenses: ["ApacheV2_0"]) { workflow { standard() } diff --git a/pkg/fusionauth/Client.go b/pkg/fusionauth/Client.go index 3bedf92..ceb1e2f 100644 --- a/pkg/fusionauth/Client.go +++ b/pkg/fusionauth/Client.go @@ -680,36 +680,13 @@ func (c *FusionAuthClient) DeactivateUserAction(userActionId string) (*BaseHTTPR // DeactivateUsers // Deactivates the users with the given ids. // []string userIds The ids of the users to deactivate. -func (c *FusionAuthClient) DeactivateUsers(userIds []string) (*UserDeleteResponse, *Errors, error) { - var resp UserDeleteResponse +func (c *FusionAuthClient) DeactivateUsers(userIds []string) (*BaseHTTPResponse, *Errors, error) { + var resp BaseHTTPResponse var errors Errors restClient := c.Start(&resp, &errors) err := restClient.WithUri("/api/user/bulk"). WithParameter("userId", userIds). - WithParameter("dryRun", strconv.FormatBool(false)). - WithParameter("hardDelete", strconv.FormatBool(false)). - WithMethod(http.MethodDelete). - Do() - if restClient.ErrorRef == nil { - return &resp, nil, err - } - return &resp, &errors, err -} - -// DeactivateUsersByQuery -// Deactivates the users found with the given search query string. -// string queryString The search query string. -// bool dryRun Whether to preview or deactivate the users found by the queryString -func (c *FusionAuthClient) DeactivateUsersByQuery(queryString string, dryRun bool) (*UserDeleteResponse, *Errors, error) { - var resp UserDeleteResponse - var errors Errors - - restClient := c.Start(&resp, &errors) - err := restClient.WithUri("/api/user/bulk"). - WithParameter("queryString", queryString). - WithParameter("dryRun", strconv.FormatBool(dryRun)). - WithParameter("hardDelete", strconv.FormatBool(false)). WithMethod(http.MethodDelete). Do() if restClient.ErrorRef == nil { @@ -1003,12 +980,10 @@ func (c *FusionAuthClient) DeleteUserActionReason(userActionReasonId string) (*B } // DeleteUsers -// Deletes the users with the given ids, or users matching the provided queryString. -// If you provide both userIds and queryString, the userIds will be honored. This can be used to deactivate or hard-delete -// a user based on the hardDelete request body parameter. -// UserDeleteRequest request The UserDeleteRequest. -func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*UserDeleteResponse, *Errors, error) { - var resp UserDeleteResponse +// Deletes the users with the given ids. +// UserDeleteRequest request The ids of the users to delete. +func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*BaseHTTPResponse, *Errors, error) { + var resp BaseHTTPResponse var errors Errors restClient := c.Start(&resp, &errors) @@ -1022,27 +997,6 @@ func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*UserDeleteRe return &resp, &errors, err } -// DeleteUsersByQuery -// Delete the users found with the given search query string. -// string queryString The search query string. -// bool dryRun Whether to preview or delete the users found by the queryString -func (c *FusionAuthClient) DeleteUsersByQuery(queryString string, dryRun bool) (*UserDeleteResponse, *Errors, error) { - var resp UserDeleteResponse - var errors Errors - - restClient := c.Start(&resp, &errors) - err := restClient.WithUri("/api/user/bulk"). - WithParameter("queryString", queryString). - WithParameter("dryRun", strconv.FormatBool(dryRun)). - WithParameter("hardDelete", strconv.FormatBool(true)). - WithMethod(http.MethodDelete). - Do() - if restClient.ErrorRef == nil { - return &resp, nil, err - } - return &resp, &errors, err -} - // DeleteWebhook // Deletes the webhook for the given Id. // string webhookId The Id of the webhook to delete. @@ -1998,7 +1952,7 @@ func (c *FusionAuthClient) ResendRegistrationVerification(email string, applicat var resp VerifyRegistrationResponse var errors Errors - restClient := c.StartAnonymous(&resp, &errors) + restClient := c.Start(&resp, &errors) err := restClient.WithUri("/api/user/verify-registration"). WithParameter("email", email). WithParameter("applicationId", applicationId). diff --git a/pkg/fusionauth/Domain.go b/pkg/fusionauth/Domain.go index 44ebcc9..c452e3a 100644 --- a/pkg/fusionauth/Domain.go +++ b/pkg/fusionauth/Domain.go @@ -113,33 +113,23 @@ const ( * @author Seth Musselman */ type Application struct { - Active bool `json:"active,omitempty"` - AuthenticationTokenConfiguration AuthenticationTokenConfiguration `json:"authenticationTokenConfiguration,omitempty"` - CleanSpeakConfiguration CleanSpeakConfiguration `json:"cleanSpeakConfiguration,omitempty"` - Data map[string]interface{} `json:"data,omitempty"` - Id string `json:"id,omitempty"` - JwtConfiguration JWTConfiguration `json:"jwtConfiguration,omitempty"` - LambdaConfiguration LambdaConfiguration `json:"lambdaConfiguration,omitempty"` - LoginConfiguration LoginConfiguration `json:"loginConfiguration,omitempty"` - Name string `json:"name,omitempty"` - OauthConfiguration OAuth2Configuration `json:"oauthConfiguration,omitempty"` - PasswordlessConfiguration PasswordlessConfiguration `json:"passwordlessConfiguration,omitempty"` - RegistrationConfiguration RegistrationConfiguration `json:"registrationConfiguration,omitempty"` - RegistrationDeletePolicy ApplicationRegistrationDeletePolicy `json:"registrationDeletePolicy,omitempty"` - Roles []ApplicationRole `json:"roles,omitempty"` - Samlv2Configuration SAMLv2Configuration `json:"samlv2Configuration,omitempty"` - TenantId string `json:"tenantId,omitempty"` - VerificationEmailTemplateId string `json:"verificationEmailTemplateId,omitempty"` - VerifyRegistration bool `json:"verifyRegistration,omitempty"` -} - -/** - * A Application-level policy for deleting Users. - * - * @author Trevor Smith - */ -type ApplicationRegistrationDeletePolicy struct { - Unverified TimeBasedDeletePolicy `json:"unverified,omitempty"` + Active bool `json:"active,omitempty"` + AuthenticationTokenConfiguration AuthenticationTokenConfiguration `json:"authenticationTokenConfiguration,omitempty"` + CleanSpeakConfiguration CleanSpeakConfiguration `json:"cleanSpeakConfiguration,omitempty"` + Data map[string]interface{} `json:"data,omitempty"` + Id string `json:"id,omitempty"` + JwtConfiguration JWTConfiguration `json:"jwtConfiguration,omitempty"` + LambdaConfiguration LambdaConfiguration `json:"lambdaConfiguration,omitempty"` + LoginConfiguration LoginConfiguration `json:"loginConfiguration,omitempty"` + Name string `json:"name,omitempty"` + OauthConfiguration OAuth2Configuration `json:"oauthConfiguration,omitempty"` + PasswordlessConfiguration PasswordlessConfiguration `json:"passwordlessConfiguration,omitempty"` + RegistrationConfiguration RegistrationConfiguration `json:"registrationConfiguration,omitempty"` + Roles []ApplicationRole `json:"roles,omitempty"` + Samlv2Configuration SAMLv2Configuration `json:"samlv2Configuration,omitempty"` + TenantId string `json:"tenantId,omitempty"` + VerificationEmailTemplateId string `json:"verificationEmailTemplateId,omitempty"` + VerifyRegistration bool `json:"verifyRegistration,omitempty"` } /** @@ -2506,7 +2496,6 @@ type Tenant struct { PasswordEncryptionConfiguration PasswordEncryptionConfiguration `json:"passwordEncryptionConfiguration,omitempty"` PasswordValidationRules PasswordValidationRules `json:"passwordValidationRules,omitempty"` ThemeId string `json:"themeId,omitempty"` - UserDeletePolicy TenantUserDeletePolicy `json:"userDeletePolicy,omitempty"` } /** @@ -2535,15 +2524,6 @@ func (b *TenantResponse) SetStatus(status int) { b.StatusCode = status } -/** - * A Tenant-level policy for deleting Users. - * - * @author Trevor Smith - */ -type TenantUserDeletePolicy struct { - Unverified TimeBasedDeletePolicy `json:"unverified,omitempty"` -} - /** * @author Daniel DeGroff */ @@ -2592,16 +2572,6 @@ func (b *ThemeResponse) SetStatus(status int) { b.StatusCode = status } -/** - * A policy for deleting Users. - * - * @author Trevor Smith - */ -type TimeBasedDeletePolicy struct { - Enableable - NumberOfDaysToRetain int `json:"numberOfDaysToRetain,omitempty"` -} - /** *