MG-2524 - Fix domain disable and list things (#2525)

Signed-off-by: nyagamunene <[email protected]>
absmach · Nov 13, 2024 · 8b9ec40 · 8b9ec40
1 parent 6d30528
commit 8b9ec40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/auth/service.go b/auth/service.go
@@ -498,7 +498,7 @@ func (svc service) RetrieveDomain(ctx context.Context, token, id string) (Domain
 		return Domain{}, errors.Wrap(svcerr.ErrViewEntity, err)
 	}
 	if err = svc.Authorize(ctx, policies.Policy{
-		Subject:     res.Subject,
+		Subject:     EncodeDomainUserID(id, res.User),
 		SubjectType: policies.UserType,
 		SubjectKind: policies.UsersKind,
 		Object:      id,
@@ -545,7 +545,7 @@ func (svc service) UpdateDomain(ctx context.Context, token, id string, d DomainR
 		return Domain{}, err
 	}
 	if err := svc.Authorize(ctx, policies.Policy{
-		Subject:     key.User,
+		Subject:     EncodeDomainUserID(id, key.User),
 		SubjectType: policies.UserType,
 		SubjectKind: policies.UsersKind,
 		Object:      id,
@@ -568,7 +568,7 @@ func (svc service) ChangeDomainStatus(ctx context.Context, token, id string, d D
 		return Domain{}, errors.Wrap(svcerr.ErrAuthentication, err)
 	}
 	if err := svc.Authorize(ctx, policies.Policy{
-		Subject:     key.User,
+		Subject:     EncodeDomainUserID(id, key.User),
 		SubjectType: policies.UserType,
 		SubjectKind: policies.UsersKind,
 		Object:      id,

diff --git a/things/postgres/clients.go b/things/postgres/clients.go
@@ -252,7 +252,7 @@ func (repo *clientRepo) SearchClients(ctx context.Context, pm things.Page) (thin
 	tq := query
 	query = applyOrdering(query, pm)
 
-	q := fmt.Sprintf(`SELECT c.id, c.name, c.created_at, c.updated_at FROM clients c %s LIMIT :limit OFFSET :offset;`, query)
+	q := fmt.Sprintf(`SELECT c.id, c.name, c.tags, c.created_at, c.updated_at FROM clients c %s LIMIT :limit OFFSET :offset;`, query)
 
 	dbPage, err := ToDBClientsPage(pm)
 	if err != nil {