Skip to content

Commit 6751b41

Browse files
matthew-altmanmatthew-altman
committed
modify clients to
1 parent c9101f9 commit 6751b41

File tree

3 files changed

+25
-122
lines changed

3 files changed

+25
-122
lines changed

‎build.savant‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
savantVersion = "1.0.0"
55

6-
project(group: "io.fusionauth", name: "go-client", version: "1.13.0", licenses: ["ApacheV2_0"]) {
6+
project(group: "io.fusionauth", name: "go-client", version: "1.12.1", licenses: ["ApacheV2_0"]) {
77
workflow {
88
standard()
99
}

‎pkg/fusionauth/Client.go‎

Lines changed: 7 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -680,36 +680,13 @@ func (c *FusionAuthClient) DeactivateUserAction(userActionId string) (*BaseHTTPR
680680
// DeactivateUsers
681681
// Deactivates the users with the given ids.
682682
// []string userIds The ids of the users to deactivate.
683-
func (c *FusionAuthClient) DeactivateUsers(userIds []string) (*UserDeleteResponse, *Errors, error) {
684-
var resp UserDeleteResponse
683+
func (c *FusionAuthClient) DeactivateUsers(userIds []string) (*BaseHTTPResponse, *Errors, error) {
684+
var resp BaseHTTPResponse
685685
var errors Errors
686686

687687
restClient := c.Start(&resp, &errors)
688688
err := restClient.WithUri("/api/user/bulk").
689689
WithParameter("userId", userIds).
690-
WithParameter("dryRun", strconv.FormatBool(false)).
691-
WithParameter("hardDelete", strconv.FormatBool(false)).
692-
WithMethod(http.MethodDelete).
693-
Do()
694-
if restClient.ErrorRef == nil {
695-
return &resp, nil, err
696-
}
697-
return &resp, &errors, err
698-
}
699-
700-
// DeactivateUsersByQuery
701-
// Deactivates the users found with the given search query string.
702-
// string queryString The search query string.
703-
// bool dryRun Whether to preview or deactivate the users found by the queryString
704-
func (c *FusionAuthClient) DeactivateUsersByQuery(queryString string, dryRun bool) (*UserDeleteResponse, *Errors, error) {
705-
var resp UserDeleteResponse
706-
var errors Errors
707-
708-
restClient := c.Start(&resp, &errors)
709-
err := restClient.WithUri("/api/user/bulk").
710-
WithParameter("queryString", queryString).
711-
WithParameter("dryRun", strconv.FormatBool(dryRun)).
712-
WithParameter("hardDelete", strconv.FormatBool(false)).
713690
WithMethod(http.MethodDelete).
714691
Do()
715692
if restClient.ErrorRef == nil {
@@ -1003,12 +980,10 @@ func (c *FusionAuthClient) DeleteUserActionReason(userActionReasonId string) (*B
1003980
}
1004981

1005982
// DeleteUsers
1006-
// Deletes the users with the given ids, or users matching the provided queryString.
1007-
// If you provide both userIds and queryString, the userIds will be honored. This can be used to deactivate or hard-delete
1008-
// a user based on the hardDelete request body parameter.
1009-
// UserDeleteRequest request The UserDeleteRequest.
1010-
func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*UserDeleteResponse, *Errors, error) {
1011-
var resp UserDeleteResponse
983+
// Deletes the users with the given ids.
984+
// UserDeleteRequest request The ids of the users to delete.
985+
func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*BaseHTTPResponse, *Errors, error) {
986+
var resp BaseHTTPResponse
1012987
var errors Errors
1013988

1014989
restClient := c.Start(&resp, &errors)
@@ -1022,27 +997,6 @@ func (c *FusionAuthClient) DeleteUsers(request UserDeleteRequest) (*UserDeleteRe
1022997
return &resp, &errors, err
1023998
}
1024999

1025-
// DeleteUsersByQuery
1026-
// Delete the users found with the given search query string.
1027-
// string queryString The search query string.
1028-
// bool dryRun Whether to preview or delete the users found by the queryString
1029-
func (c *FusionAuthClient) DeleteUsersByQuery(queryString string, dryRun bool) (*UserDeleteResponse, *Errors, error) {
1030-
var resp UserDeleteResponse
1031-
var errors Errors
1032-
1033-
restClient := c.Start(&resp, &errors)
1034-
err := restClient.WithUri("/api/user/bulk").
1035-
WithParameter("queryString", queryString).
1036-
WithParameter("dryRun", strconv.FormatBool(dryRun)).
1037-
WithParameter("hardDelete", strconv.FormatBool(true)).
1038-
WithMethod(http.MethodDelete).
1039-
Do()
1040-
if restClient.ErrorRef == nil {
1041-
return &resp, nil, err
1042-
}
1043-
return &resp, &errors, err
1044-
}
1045-
10461000
// DeleteWebhook
10471001
// Deletes the webhook for the given Id.
10481002
// string webhookId The Id of the webhook to delete.
@@ -1998,7 +1952,7 @@ func (c *FusionAuthClient) ResendRegistrationVerification(email string, applicat
19981952
var resp VerifyRegistrationResponse
19991953
var errors Errors
20001954

2001-
restClient := c.StartAnonymous(&resp, &errors)
1955+
restClient := c.Start(&resp, &errors)
20021956
err := restClient.WithUri("/api/user/verify-registration").
20031957
WithParameter("email", email).
20041958
WithParameter("applicationId", applicationId).

‎pkg/fusionauth/Domain.go‎

Lines changed: 17 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -113,33 +113,23 @@ const (
113113
* @author Seth Musselman
114114
*/
115115
type Application struct {
116-
Active bool `json:"active,omitempty"`
117-
AuthenticationTokenConfiguration AuthenticationTokenConfiguration `json:"authenticationTokenConfiguration,omitempty"`
118-
CleanSpeakConfiguration CleanSpeakConfiguration `json:"cleanSpeakConfiguration,omitempty"`
119-
Data map[string]interface{} `json:"data,omitempty"`
120-
Id string `json:"id,omitempty"`
121-
JwtConfiguration JWTConfiguration `json:"jwtConfiguration,omitempty"`
122-
LambdaConfiguration LambdaConfiguration `json:"lambdaConfiguration,omitempty"`
123-
LoginConfiguration LoginConfiguration `json:"loginConfiguration,omitempty"`
124-
Name string `json:"name,omitempty"`
125-
OauthConfiguration OAuth2Configuration `json:"oauthConfiguration,omitempty"`
126-
PasswordlessConfiguration PasswordlessConfiguration `json:"passwordlessConfiguration,omitempty"`
127-
RegistrationConfiguration RegistrationConfiguration `json:"registrationConfiguration,omitempty"`
128-
RegistrationDeletePolicy ApplicationRegistrationDeletePolicy `json:"registrationDeletePolicy,omitempty"`
129-
Roles []ApplicationRole `json:"roles,omitempty"`
130-
Samlv2Configuration SAMLv2Configuration `json:"samlv2Configuration,omitempty"`
131-
TenantId string `json:"tenantId,omitempty"`
132-
VerificationEmailTemplateId string `json:"verificationEmailTemplateId,omitempty"`
133-
VerifyRegistration bool `json:"verifyRegistration,omitempty"`
134-
}
135-
136-
/**
137-
* A Application-level policy for deleting Users.
138-
*
139-
* @author Trevor Smith
140-
*/
141-
type ApplicationRegistrationDeletePolicy struct {
142-
Unverified TimeBasedDeletePolicy `json:"unverified,omitempty"`
116+
Active bool `json:"active,omitempty"`
117+
AuthenticationTokenConfiguration AuthenticationTokenConfiguration `json:"authenticationTokenConfiguration,omitempty"`
118+
CleanSpeakConfiguration CleanSpeakConfiguration `json:"cleanSpeakConfiguration,omitempty"`
119+
Data map[string]interface{} `json:"data,omitempty"`
120+
Id string `json:"id,omitempty"`
121+
JwtConfiguration JWTConfiguration `json:"jwtConfiguration,omitempty"`
122+
LambdaConfiguration LambdaConfiguration `json:"lambdaConfiguration,omitempty"`
123+
LoginConfiguration LoginConfiguration `json:"loginConfiguration,omitempty"`
124+
Name string `json:"name,omitempty"`
125+
OauthConfiguration OAuth2Configuration `json:"oauthConfiguration,omitempty"`
126+
PasswordlessConfiguration PasswordlessConfiguration `json:"passwordlessConfiguration,omitempty"`
127+
RegistrationConfiguration RegistrationConfiguration `json:"registrationConfiguration,omitempty"`
128+
Roles []ApplicationRole `json:"roles,omitempty"`
129+
Samlv2Configuration SAMLv2Configuration `json:"samlv2Configuration,omitempty"`
130+
TenantId string `json:"tenantId,omitempty"`
131+
VerificationEmailTemplateId string `json:"verificationEmailTemplateId,omitempty"`
132+
VerifyRegistration bool `json:"verifyRegistration,omitempty"`
143133
}
144134

145135
/**
@@ -2506,7 +2496,6 @@ type Tenant struct {
25062496
PasswordEncryptionConfiguration PasswordEncryptionConfiguration `json:"passwordEncryptionConfiguration,omitempty"`
25072497
PasswordValidationRules PasswordValidationRules `json:"passwordValidationRules,omitempty"`
25082498
ThemeId string `json:"themeId,omitempty"`
2509-
UserDeletePolicy TenantUserDeletePolicy `json:"userDeletePolicy,omitempty"`
25102499
}
25112500

25122501
/**
@@ -2535,15 +2524,6 @@ func (b *TenantResponse) SetStatus(status int) {
25352524
b.StatusCode = status
25362525
}
25372526

2538-
/**
2539-
* A Tenant-level policy for deleting Users.
2540-
*
2541-
* @author Trevor Smith
2542-
*/
2543-
type TenantUserDeletePolicy struct {
2544-
Unverified TimeBasedDeletePolicy `json:"unverified,omitempty"`
2545-
}
2546-
25472527
/**
25482528
* @author Daniel DeGroff
25492529
*/
@@ -2592,16 +2572,6 @@ func (b *ThemeResponse) SetStatus(status int) {
25922572
b.StatusCode = status
25932573
}
25942574

2595-
/**
2596-
* A policy for deleting Users.
2597-
*
2598-
* @author Trevor Smith
2599-
*/
2600-
type TimeBasedDeletePolicy struct {
2601-
Enableable
2602-
NumberOfDaysToRetain int `json:"numberOfDaysToRetain,omitempty"`
2603-
}
2604-
26052575
/**
26062576
* <ul>
26072577
* <li>Bearer Token type as defined by <a href="https://tools.ietf.org/html/rfc6750">RFC 6750</a>.</li>
@@ -3059,30 +3029,10 @@ type UserDeleteEvent struct {
30593029
* @author Daniel DeGroff
30603030
*/
30613031
type UserDeleteRequest struct {
3062-
DryRun bool `json:"dryRun,omitempty"`
3063-
HardDelete bool `json:"hardDelete,omitempty"`
3064-
Query string `json:"query,omitempty"`
3065-
QueryString string `json:"queryString,omitempty"`
3066-
UserIds []string `json:"userIds,omitempty"`
3067-
}
3068-
3069-
/**
3070-
* User API bulk response object.
3071-
*
3072-
* @author Trevor Smith
3073-
*/
3074-
type UserDeleteResponse struct {
3075-
BaseHTTPResponse
3076-
DryRun bool `json:"dryRun,omitempty"`
30773032
HardDelete bool `json:"hardDelete,omitempty"`
3078-
Total int `json:"total,omitempty"`
30793033
UserIds []string `json:"userIds,omitempty"`
30803034
}
30813035

3082-
func (b *UserDeleteResponse) SetStatus(status int) {
3083-
b.StatusCode = status
3084-
}
3085-
30863036
/**
30873037
* Models the User Email Verify Event (and can be converted to JSON).
30883038
*
@@ -3241,7 +3191,6 @@ type UserSearchCriteria struct {
32413191
FullName string `json:"fullName,omitempty"`
32423192
Id string `json:"id,omitempty"`
32433193
Ids []string `json:"ids,omitempty"`
3244-
Query string `json:"query,omitempty"`
32453194
QueryString string `json:"queryString,omitempty"`
32463195
SortFields []SortField `json:"sortFields,omitempty"`
32473196
Username string `json:"username,omitempty"`

0 commit comments

Comments
 (0)