Made the params for the GetClientUserSessions and GetClientOfflineSes…

…sions variadic functions
Nerzal · Jul 14, 2023 · e32f4b7 · e32f4b7
1 parent c716606
commit e32f4b7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -280,8 +280,8 @@ type GoCloak interface {
  ClearUserCache(ctx context.Context, token, realm string) error
  ClearKeysCache(ctx context.Context, token, realm string) error
 
-GetClientUserSessions(ctx context.Context, token, realm, idOfClient string, params GetClientUserSessionsParams) ([]*UserSessionRepresentation, error)
-GetClientOfflineSessions(ctx context.Context, token, realm, idOfClient string, params GetClientUserSessionsParams) ([]*UserSessionRepresentation, error)
+GetClientUserSessions(ctx context.Context, token, realm, idOfClient string, params ...GetClientUserSessionsParams) ([]*UserSessionRepresentation, error)
+GetClientOfflineSessions(ctx context.Context, token, realm, idOfClient string, params ...GetClientUserSessionsParams) ([]*UserSessionRepresentation, error)
  GetUserSessions(ctx context.Context, token, realm, userID string) ([]*UserSessionRepresentation, error)
  GetUserOfflineSessionsForClient(ctx context.Context, token, realm, userID, idOfClient string) ([]*UserSessionRepresentation, error)
 

diff --git a/client.go b/client.go
@@ -1451,13 +1451,18 @@ func (g *GoCloak) RegenerateClientSecret(ctx context.Context, token, realm, idOf
 }
 
 // GetClientOfflineSessions returns offline sessions associated with the client
-func (g *GoCloak) GetClientOfflineSessions(ctx context.Context, token, realm, idOfClient string, params GetClientUserSessionsParams) ([]*UserSessionRepresentation, error) {
+func (g *GoCloak) GetClientOfflineSessions(ctx context.Context, token, realm, idOfClient string, params ...GetClientUserSessionsParams) ([]*UserSessionRepresentation, error) {
 	const errMessage = "could not get client offline sessions"
 	var res []*UserSessionRepresentation
 
-	queryParams, err := GetQueryParams(params)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
+	queryParams := map[string]string{}
+	if params != nil && len(params) > 0 {
+		var err error
+
+		queryParams, err = GetQueryParams(params[0])
+		if err != nil {
+			return nil, errors.Wrap(err, errMessage)
+		}
 	}
 
 	resp, err := g.GetRequestWithBearerAuth(ctx, token).
@@ -1473,13 +1478,18 @@ func (g *GoCloak) GetClientOfflineSessions(ctx context.Context, token, realm, id
 }
 
 // GetClientUserSessions returns user sessions associated with the client
-func (g *GoCloak) GetClientUserSessions(ctx context.Context, token, realm, idOfClient string, params GetClientUserSessionsParams) ([]*UserSessionRepresentation, error) {
+func (g *GoCloak) GetClientUserSessions(ctx context.Context, token, realm, idOfClient string, params ...GetClientUserSessionsParams) ([]*UserSessionRepresentation, error) {
 	const errMessage = "could not get client user sessions"
 	var res []*UserSessionRepresentation
 
-	queryParams, err := GetQueryParams(params)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
+	queryParams := map[string]string{}
+	if params != nil && len(params) > 0 {
+		var err error
+
+		queryParams, err = GetQueryParams(params[0])
+		if err != nil {
+			return nil, errors.Wrap(err, errMessage)
+		}
 	}
 
 	resp, err := g.GetRequestWithBearerAuth(ctx, token).

diff --git a/client_test.go b/client_test.go
@@ -3719,6 +3719,15 @@ func Test_GetClientUserSessions(t *testing.T) {
 	)
 	require.NoError(t, err, "Login failed")
 	token := GetAdminToken(t, client)
+	allSessionsWithoutParams, err := client.GetClientUserSessions(
+		context.Background(),
+		token.AccessToken,
+		cfg.GoCloak.Realm,
+		gocloakClientID,
+	)
+	require.NoError(t, err, "GetClientUserSessions failed")
+	require.NotEmpty(t, allSessionsWithoutParams, "GetClientUserSessions returned an empty list")
+
 	allSessions, err := client.GetClientUserSessions(
 		context.Background(),
 		token.AccessToken,
@@ -3728,6 +3737,8 @@ func Test_GetClientUserSessions(t *testing.T) {
 	)
 	require.NoError(t, err, "GetClientUserSessions failed")
 	require.NotEmpty(t, allSessions, "GetClientUserSessions returned an empty list")
+	require.Equal(t, allSessionsWithoutParams, allSessions,
+		"GetClientUserSessions with and without params are not the same")
 
 	sessions, err := client.GetClientUserSessions(
 		context.Background(),
@@ -3896,6 +3907,17 @@ func Test_GetClientOfflineSessions(t *testing.T) {
 	)
 	require.NoError(t, err, "GetClientOfflineSessions failed")
 	require.NotEmpty(t, sessions, "GetClientOfflineSessions returned an empty list")
+
+	sessionsWithoutParams, err := client.GetClientOfflineSessions(
+		context.Background(),
+		token.AccessToken,
+		cfg.GoCloak.Realm,
+		gocloakClientID,
+	)
+	require.NoError(t, err, "GetClientOfflineSessions failed")
+	require.NotEmpty(t, sessions, "GetClientOfflineSessions returned an empty list")
+	require.Equal(t, sessions, sessionsWithoutParams,
+		"GetClientOfflineSessions with and without params are not the same")
 }
 
 func Test_ClientSecret(t *testing.T) {