Skip to content

Commit

Permalink
modify clients to
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthew-altman
matthew-altman committed Dec 11, 2019
1 parent c9101f9 commit 6751b41
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 122 deletions.
2 changes: 1 addition & 1 deletion build.savant
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
60 changes: 7 additions & 53 deletions pkg/fusionauth/Client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand All @@ -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.
Expand Down Expand Up @@ -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).
Expand Down
85 changes: 17 additions & 68 deletions pkg/fusionauth/Domain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

/**
Expand Down Expand Up @@ -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"`
}

/**
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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"`
}

/**
* <ul>
* <li>Bearer Token type as defined by <a href="https://tools.ietf.org/html/rfc6750">RFC 6750</a>.</li>
Expand Down Expand Up @@ -3059,30 +3029,10 @@ type UserDeleteEvent struct {
* @author Daniel DeGroff
*/
type UserDeleteRequest struct {
DryRun bool `json:"dryRun,omitempty"`
HardDelete bool `json:"hardDelete,omitempty"`
Query string `json:"query,omitempty"`
QueryString string `json:"queryString,omitempty"`
UserIds []string `json:"userIds,omitempty"`
}

/**
* User API bulk response object.
*
* @author Trevor Smith
*/
type UserDeleteResponse struct {
BaseHTTPResponse
DryRun bool `json:"dryRun,omitempty"`
HardDelete bool `json:"hardDelete,omitempty"`
Total int `json:"total,omitempty"`
UserIds []string `json:"userIds,omitempty"`
}

func (b *UserDeleteResponse) SetStatus(status int) {
b.StatusCode = status
}

/**
* Models the User Email Verify Event (and can be converted to JSON).
*
Expand Down Expand Up @@ -3241,7 +3191,6 @@ type UserSearchCriteria struct {
FullName string `json:"fullName,omitempty"`
Id string `json:"id,omitempty"`
Ids []string `json:"ids,omitempty"`
Query string `json:"query,omitempty"`
QueryString string `json:"queryString,omitempty"`
SortFields []SortField `json:"sortFields,omitempty"`
Username string `json:"username,omitempty"`
Expand Down

0 comments on commit 6751b41

Please sign in to comment.