MG-2404 - Use Policy CRUD wrapper to directly talk to SpiceDB (absmac…

…h#2405) Signed-off-by: 1998-felix <[email protected]> Signed-off-by: Dusan Borovcanin <[email protected]>
felixgateru · Oct 24, 2024 · 7fff29f · 7fff29f
1 parent 8598e71
commit 7fff29f
Show file tree

Hide file tree

Showing 11 changed files with 1,387 additions and 536 deletions.
diff --git a/bootstrap/service.go b/bootstrap/service.go
@@ -271,7 +271,7 @@ func (bs bootstrapService) listClientIDs(ctx context.Context, userID string) ([]
 	if err != nil {
 		return nil, errors.Wrap(svcerr.ErrNotFound, err)
 	}
-	return tids, nil
+	return tids.Policies, nil
 }
 
 func (bs bootstrapService) List(ctx context.Context, session mgauthn.Session, filter Filter, offset, limit uint64) (ConfigsPage, error) {

diff --git a/cmd/auth/main.go b/cmd/auth/main.go
@@ -24,6 +24,7 @@ import (
 	"github.com/absmach/magistrala/auth/jwt"
 	apostgres "github.com/absmach/magistrala/auth/postgres"
 	"github.com/absmach/magistrala/auth/tracing"
+	mgpolicy "github.com/absmach/magistrala/internal/policy"
 	mglog "github.com/absmach/magistrala/logger"
 	"github.com/absmach/magistrala/pkg/jaeger"
 	"github.com/absmach/magistrala/pkg/policies/spicedb"

diff --git a/internal/groups/service.go b/internal/groups/service.go
@@ -230,7 +230,7 @@ func (svc service) ListMembers(ctx context.Context, session authn.Session, group
 
 		members := []groups.Member{}
 
-		for _, id := range tids {
+		for _, id := range tids.Policies {
 			members = append(members, groups.Member{
 				ID:   id,
 				Type: policies.ThingType,
@@ -255,7 +255,7 @@ func (svc service) ListMembers(ctx context.Context, session authn.Session, group
 
 		members := []groups.Member{}
 
-		for _, id := range uids {
+		for _, id := range uids.Policies {
 			members = append(members, groups.Member{
 				ID:   id,
 				Type: policies.UserType,
@@ -533,7 +533,7 @@ func (svc service) listAllGroupsOfUserID(ctx context.Context, userID, permission
 	if err != nil {
 		return []string{}, err
 	}
-	return allowedIDs, nil
+	return allowedIDs.Policies, nil
 }
 
 func (svc service) changeGroupStatus(ctx context.Context, session authn.Session, group groups.Group) (groups.Group, error) {