Resolve conflicts

Signed-off-by: nyagamunene <[email protected]>
absmach · Nov 10, 2024 · f204e8c · f204e8c
1 parent 8e316f0
commit f204e8c
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 46 deletions.
diff --git a/auth/hasher/hasher.go b/auth/hasher/hasher.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/absmach/magistrala/pat"
+	"github.com/absmach/magistrala/auth"
 	"github.com/absmach/magistrala/pkg/errors"
 	"golang.org/x/crypto/scrypt"
 )
@@ -24,12 +24,12 @@ var (
 	errDecode           = errors.New("failed to decode")
 )
 
-var _ pat.Hasher = (*bcryptHasher)(nil)
+var _ auth.Hasher = (*bcryptHasher)(nil)
 
 type bcryptHasher struct{}
 
 // New instantiates a bcrypt-based hasher implementation.
-func New() pat.Hasher {
+func New() auth.Hasher {
 	return &bcryptHasher{}
 }
 

diff --git a/auth/mocks/pats.go b/auth/mocks/pats.go
diff --git a/auth/mocks/service.go b/auth/mocks/service.go
diff --git a/auth/pat.go b/auth/pat.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/errors"
 )
 
@@ -715,41 +714,41 @@ func (pat PAT) Expired() bool {
 }
 
 // PATS specifies function which are required for Personal access Token implementation.
-//go:generate mockery --name Service --output=./mocks --filename pats.go --quiet --note "Copyright (c) Abstract Machines"
+//go:generate mockery --name PATS --output=./mocks --filename pats.go --quiet --note "Copyright (c) Abstract Machines"
 
-type Service interface {
+type PATS interface {
 	// Create function creates new PAT for given valid inputs.
-	CreatePAT(ctx context.Context, session authn.Session, name, description string, duration time.Duration, scope Scope) (PAT, error)
+	CreatePAT(ctx context.Context, token, name, description string, duration time.Duration, scope Scope) (PAT, error)
 
 	// UpdateName function updates the name for the given PAT ID.
-	UpdatePATName(ctx context.Context, session authn.Session, patID, name string) (PAT, error)
+	UpdatePATName(ctx context.Context, token, patID, name string) (PAT, error)
 
 	// UpdateDescription function updates the description for the given PAT ID.
-	UpdatePATDescription(ctx context.Context, session authn.Session, patID, description string) (PAT, error)
+	UpdatePATDescription(ctx context.Context, token, patID, description string) (PAT, error)
 
 	// Retrieve function retrieves the PAT for given ID.
-	RetrievePAT(ctx context.Context, userID, patID string) (PAT, error)
+	RetrievePAT(ctx context.Context, userID string, patID string) (PAT, error)
 
 	// List function lists all the PATs for the user.
-	ListPATS(ctx context.Context, session authn.Session, pm PATSPageMeta) (PATSPage, error)
+	ListPATS(ctx context.Context, token string, pm PATSPageMeta) (PATSPage, error)
 
 	// Delete function deletes the PAT for given ID.
-	DeletePAT(ctx context.Context, session authn.Session, patID string) error
+	DeletePAT(ctx context.Context, token, patID string) error
 
 	// ResetSecret function reset the secret and creates new secret for the given ID.
-	ResetPATSecret(ctx context.Context, session authn.Session, patID string, duration time.Duration) (PAT, error)
+	ResetPATSecret(ctx context.Context, token, patID string, duration time.Duration) (PAT, error)
 
 	// RevokeSecret function revokes the secret for the given ID.
-	RevokePATSecret(ctx context.Context, session authn.Session, patID string) error
+	RevokePATSecret(ctx context.Context, token, patID string) error
 
 	// AddScope function adds a new scope entry.
-	AddPATScopeEntry(ctx context.Context, session authn.Session, patID string, platformEntityType PlatformEntityType, optionalDomainID string, optionalDomainEntityType DomainEntityType, operation OperationType, entityIDs ...string) (Scope, error)
+	AddPATScopeEntry(ctx context.Context, token, patID string, platformEntityType PlatformEntityType, optionalDomainID string, optionalDomainEntityType DomainEntityType, operation OperationType, entityIDs ...string) (Scope, error)
 
 	// RemoveScope function removes a scope entry.
-	RemovePATScopeEntry(ctx context.Context, session authn.Session, patID string, platformEntityType PlatformEntityType, optionalDomainID string, optionalDomainEntityType DomainEntityType, operation OperationType, entityIDs ...string) (Scope, error)
+	RemovePATScopeEntry(ctx context.Context, token, patID string, platformEntityType PlatformEntityType, optionalDomainID string, optionalDomainEntityType DomainEntityType, operation OperationType, entityIDs ...string) (Scope, error)
 
 	// ClearAllScope function removes all scope entry.
-	ClearPATAllScopeEntry(ctx context.Context, session authn.Session, patID string) error
+	ClearPATAllScopeEntry(ctx context.Context, token, patID string) error
 
 	// IdentifyPAT function will valid the secret.
 	IdentifyPAT(ctx context.Context, paToken string) (PAT, error)

diff --git a/internal/grpc/auth/v1/auth.pb.go b/internal/grpc/auth/v1/auth.pb.go
diff --git a/pkg/authz/mocks/authz.go b/pkg/authz/mocks/authz.go
diff --git a/things/middleware/authorization.go b/things/middleware/authorization.go
@@ -10,7 +10,6 @@ import (
 	"github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/authz"
 	mgauthz "github.com/absmach/magistrala/pkg/authz"
-	"github.com/absmach/magistrala/pkg/clients"
 	"github.com/absmach/magistrala/pkg/errors"
 	svcerr "github.com/absmach/magistrala/pkg/errors/service"
 	"github.com/absmach/magistrala/pkg/policies"