NOISSUE - Update auth in journal service (#2527)

Signed-off-by: Felix Gateru <felix.gateru@gmail.com>

journal/api/transport.go

@@ -15,6 +15,7 @@ import (
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/journal"
 	"github.com/absmach/magistrala/pkg/apiutil"
+	mgauthn "github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/errors"
 	"github.com/go-chi/chi/v5"
 	kithttp "github.com/go-kit/kit/transport/http"
@@ -33,19 +34,26 @@ const (
 )
 
 // MakeHandler returns a HTTP API handler with health check and metrics.
-func MakeHandler(svc journal.Service, logger *slog.Logger, svcName, instanceID string) http.Handler {
+func MakeHandler(svc journal.Service, authn mgauthn.Authentication, logger *slog.Logger, svcName, instanceID string) http.Handler {
 	opts := []kithttp.ServerOption{
 		kithttp.ServerErrorEncoder(apiutil.LoggingErrorEncoder(logger, api.EncodeError)),
 	}
 
 	mux := chi.NewRouter()
 
-	mux.Get("/journal/{entityType}/{entityID}", otelhttp.NewHandler(kithttp.NewServer(
+	mux.With(api.AuthenticateMiddleware(authn, false)).Get("/journal/user/{userID}", otelhttp.NewHandler(kithttp.NewServer(
 		retrieveJournalsEndpoint(svc),
-		decodeRetrieveJournalReq,
+		decodeRetrieveUserJournalReq,
 		api.EncodeResponse,
 		opts...,
-	), "list_journals").ServeHTTP)
+	), "list_user_journals").ServeHTTP)
+
+	mux.With(api.AuthenticateMiddleware(authn, true)).Get("/{domainID}/journal/{entityType}/{entityID}", otelhttp.NewHandler(kithttp.NewServer(
+		retrieveJournalsEndpoint(svc),
+		decodeRetrieveEntityJournalReq,
+		api.EncodeResponse,
+		opts...,
+	), "list__entity_journals").ServeHTTP)
 
 	mux.Get("/health", magistrala.Health(svcName, instanceID))
 	mux.Handle("/metrics", promhttp.Handler())
@@ -53,25 +61,65 @@ func MakeHandler(svc journal.Service, logger *slog.Logger, svcName, instanceID s
 	return mux
 }
 
-func decodeRetrieveJournalReq(_ context.Context, r *http.Request) (interface{}, error) {
-	offset, err := apiutil.ReadNumQuery[uint64](r, api.OffsetKey, api.DefOffset)
+func decodeRetrieveEntityJournalReq(_ context.Context, r *http.Request) (interface{}, error) {
+	page, err := decodePageQuery(r)
 	if err != nil {
 		return nil, errors.Wrap(apiutil.ErrValidation, err)
 	}
+	entityType, err := journal.ToEntityType(chi.URLParam(r, "entityType"))
+	if err != nil {
+		return nil, errors.Wrap(apiutil.ErrValidation, err)
+	}
+	page.EntityID = chi.URLParam(r, "entityID")
+	page.EntityType = entityType
+
+	if entityType == journal.ChannelEntity {
+		page.Operation = strings.ReplaceAll(page.Operation, "channel", "group")
+	}
+
+	req := retrieveJournalsReq{
+		token: apiutil.ExtractBearerToken(r),
+		page:  page,
+	}
+
+	return req, nil
+}
+
+func decodeRetrieveUserJournalReq(_ context.Context, r *http.Request) (interface{}, error) {
+	page, err := decodePageQuery(r)
+	if err != nil {
+		return nil, errors.Wrap(apiutil.ErrValidation, err)
+	}
+	page.EntityID = chi.URLParam(r, "userID")
+	page.EntityType = journal.UserEntity
+
+	req := retrieveJournalsReq{
+		token: apiutil.ExtractBearerToken(r),
+		page:  page,
+	}
+
+	return req, nil
+}
+
+func decodePageQuery(r *http.Request) (journal.Page, error) {
+	offset, err := apiutil.ReadNumQuery[uint64](r, api.OffsetKey, api.DefOffset)
+	if err != nil {
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
+	}
 	limit, err := apiutil.ReadNumQuery[uint64](r, api.LimitKey, api.DefLimit)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	operation, err := apiutil.ReadStringQuery(r, operationKey, "")
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	from, err := apiutil.ReadNumQuery[int64](r, fromKey, 0)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	if from > math.MaxInt32 {
-		return nil, errors.Wrap(apiutil.ErrValidation, apiutil.ErrInvalidTimeFormat)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, apiutil.ErrInvalidTimeFormat)
 	}
 	var fromTime time.Time
 	if from != 0 {
@@ -79,10 +127,10 @@ func decodeRetrieveJournalReq(_ context.Context, r *http.Request) (interface{},
 	}
 	to, err := apiutil.ReadNumQuery[int64](r, toKey, 0)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	if to > math.MaxInt32 {
-		return nil, errors.Wrap(apiutil.ErrValidation, apiutil.ErrInvalidTimeFormat)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, apiutil.ErrInvalidTimeFormat)
 	}
 	var toTime time.Time
 	if to != 0 {
@@ -90,40 +138,25 @@ func decodeRetrieveJournalReq(_ context.Context, r *http.Request) (interface{},
 	}
 	attributes, err := apiutil.ReadBoolQuery(r, attributesKey, false)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	metadata, err := apiutil.ReadBoolQuery(r, metadataKey, false)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 	dir, err := apiutil.ReadStringQuery(r, api.DirKey, api.DescDir)
 	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
+		return journal.Page{}, errors.Wrap(apiutil.ErrValidation, err)
 	}
 
-	entityType, err := journal.ToEntityType(chi.URLParam(r, "entityType"))
-	if err != nil {
-		return nil, errors.Wrap(apiutil.ErrValidation, err)
-	}
-	if entityType == journal.ChannelEntity {
-		operation = strings.ReplaceAll(operation, "channel", "group")
-	}
-
-	req := retrieveJournalsReq{
-		token: apiutil.ExtractBearerToken(r),
-		page: journal.Page{
-			Offset:         offset,
-			Limit:          limit,
-			Operation:      operation,
-			From:           fromTime,
-			To:             toTime,
-			WithAttributes: attributes,
-			WithMetadata:   metadata,
-			EntityID:       chi.URLParam(r, "entityID"),
-			EntityType:     entityType,
-			Direction:      dir,
-		},
-	}
-
-	return req, nil
+	return journal.Page{
+		Offset:         offset,
+		Limit:          limit,
+		Operation:      operation,
+		From:           fromTime,
+		To:             toTime,
+		WithAttributes: attributes,
+		WithMetadata:   metadata,
+		Direction:      dir,
+	}, nil
 }