Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix red tests #491

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func makeURL(path ...string) string {
return strings.Join(path, urlSeparator)
}

// Compares the provided version against the current version of the Keycloak server.
// compareVersions compares the provided version against the current version of the Keycloak server.
// Current version is fetched from the serverinfo if not already set.
//
// Returns:
Expand All @@ -63,15 +63,15 @@ func makeURL(path ...string) string {
// 0 if the provided version is equal to the server version
//
// 1 if the provided version is higher than the server version
func (g *GoCloak) compareVersions(v, token string, ctx context.Context) (int, error) {
func (g *GoCloak) compareVersions(ctx context.Context, v, token string) (int, error) {
curVersion := g.Config.version
if curVersion == "" {
curV, err := g.getServerVersion(ctx, token)
if err != nil {
return 0, err
}

curVersion = curV
curVersion = curV //nolint
}

curVersion = "v" + g.Config.version
Expand Down Expand Up @@ -3590,7 +3590,7 @@ func (g *GoCloak) GetPolicies(ctx context.Context, token, realm, idOfClient stri
return nil, errors.Wrap(err, errMessage)
}

compResult, err := g.compareVersions("20.0.0", token, ctx)
compResult, err := g.compareVersions(ctx, "20.0.0", token)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -3622,7 +3622,7 @@ func (g *GoCloak) CreatePolicy(ctx context.Context, token, realm, idOfClient str
return nil, errors.New("type of a policy required")
}

compResult, err := g.compareVersions("20.0.0", token, ctx)
compResult, err := g.compareVersions(ctx, "20.0.0", token)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -3655,7 +3655,7 @@ func (g *GoCloak) UpdatePolicy(ctx context.Context, token, realm, idOfClient str
return errors.New("ID of a policy required")
}

compResult, err := g.compareVersions("20.0.0", token, ctx)
compResult, err := g.compareVersions(ctx, "20.0.0", token)
if err != nil {
return err
}
Expand Down
5 changes: 4 additions & 1 deletion client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3952,7 +3952,10 @@ func Test_GetClientOfflineSessions(t *testing.T) {
)
require.NoError(t, err, "GetClientOfflineSessions failed")
require.NotEmpty(t, sessions, "GetClientOfflineSessions returned an empty list")
require.Equal(t, sessions, sessionsWithoutParams,

require.Equal(t, len(sessions), len(sessionsWithoutParams), "Number of sessions did not match")

require.Equal(t, *sessions[0], *sessionsWithoutParams[0],
"GetClientOfflineSessions with and without params are the same")
}

Expand Down
1 change: 1 addition & 0 deletions models.go
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,7 @@ type RequiredActionProviderRepresentation struct {
ProviderID *string `json:"providerId,omitempty"`
}

// UnregisteredRequiredActionProviderRepresentation is a representation of unregistered required actions.
type UnregisteredRequiredActionProviderRepresentation struct {
Name *string `json:"name,omitempty"`
ProviderID *string `json:"providerId,omitempty"`
Expand Down
Loading