MG-2363 - Fix users with member relation being able to list things (#…

…2364) Signed-off-by: nyagamunene <[email protected]>
absmach · Jul 30, 2024 · 38386a3 · 38386a3
1 parent 06cb004
commit 38386a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/things/service.go b/things/service.go
@@ -179,8 +179,10 @@ func (svc service) ListClients(ctx context.Context, token, reqUserID string, pm
 		}
 	}
 
+	if len(ids) == 0 && pm.Domain == "" {
+		return mgclients.ClientsPage{}, nil
+	}
 	pm.IDs = ids
-
 	tp, err := svc.clients.SearchClients(ctx, pm)
 	if err != nil {
 		return mgclients.ClientsPage{}, errors.Wrap(svcerr.ErrViewEntity, err)

diff --git a/things/service_test.go b/things/service_test.go
@@ -668,6 +668,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:     &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse:    &magistrala.AuthorizeRes{Authorized: true},
@@ -703,6 +704,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:  &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse: &magistrala.AuthorizeRes{Authorized: false},
@@ -717,6 +719,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:     &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse:    &magistrala.AuthorizeRes{Authorized: true},
@@ -735,6 +738,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:     &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse:    &magistrala.AuthorizeRes{Authorized: true},
@@ -761,6 +765,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:     &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse:    &magistrala.AuthorizeRes{Authorized: true},
@@ -778,6 +783,7 @@ func TestListClients(t *testing.T) {
 				Offset:    0,
 				Limit:     100,
 				ListPerms: true,
+				Domain:    domainID,
 			},
 			identifyResponse:     &magistrala.IdentityRes{Id: nonAdminID, UserId: nonAdminID, DomainId: domainID},
 			authorizeResponse:    &magistrala.AuthorizeRes{Authorized: true},