From d7f810809e0caa564aa16e9763fbefbab1ead934 Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Wed, 18 Dec 2024 11:10:38 +0100
Subject: [PATCH] feat(analytics): removed unnecessary keys import

---
 backend/cmd/analytics/main.go              |  1 +
 backend/pkg/analytics/api/handlers.go      | 11 +++++------
 backend/pkg/analytics/builder.go           | 10 ++++------
 backend/pkg/analytics/service/analytics.go |  1 +
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/backend/cmd/analytics/main.go b/backend/cmd/analytics/main.go
index 8ea792438..bd8c3a99c 100644
--- a/backend/cmd/analytics/main.go
+++ b/backend/cmd/analytics/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+
 	analyticsConfig "openreplay/backend/internal/config/analytics"
 	"openreplay/backend/pkg/analytics"
 	"openreplay/backend/pkg/db/postgres/pool"
diff --git a/backend/pkg/analytics/api/handlers.go b/backend/pkg/analytics/api/handlers.go
index 5dda6a998..89248c42e 100644
--- a/backend/pkg/analytics/api/handlers.go
+++ b/backend/pkg/analytics/api/handlers.go
@@ -2,15 +2,16 @@ package api
 
 import (
 	"fmt"
-	"github.com/gorilla/mux"
 	"net/http"
+	"strconv"
+
+	"github.com/gorilla/mux"
+
 	config "openreplay/backend/internal/config/analytics"
 	"openreplay/backend/pkg/analytics/service"
 	"openreplay/backend/pkg/logger"
 	"openreplay/backend/pkg/objectstorage"
 	"openreplay/backend/pkg/server/api"
-	"openreplay/backend/pkg/server/keys"
-	"strconv"
 )
 
 type handlersImpl struct {
@@ -18,7 +19,6 @@ type handlersImpl struct {
 	responser     *api.Responser
 	objStorage    objectstorage.ObjectStorage
 	jsonSizeLimit int64
-	keys          keys.Keys
 	service       service.Service
 }
 
@@ -39,13 +39,12 @@ func (e *handlersImpl) GetAll() []*api.Description {
 	}
 }
 
-func NewHandlers(log logger.Logger, cfg *config.Config, responser *api.Responser, objStore objectstorage.ObjectStorage, keys keys.Keys, service service.Service) (api.Handlers, error) {
+func NewHandlers(log logger.Logger, cfg *config.Config, responser *api.Responser, objStore objectstorage.ObjectStorage, service service.Service) (api.Handlers, error) {
 	return &handlersImpl{
 		log:           log,
 		responser:     responser,
 		objStorage:    objStore,
 		jsonSizeLimit: cfg.JsonSizeLimit,
-		keys:          keys,
 		service:       service,
 	}, nil
 }
diff --git a/backend/pkg/analytics/builder.go b/backend/pkg/analytics/builder.go
index 333921e0a..5b1dc0e51 100644
--- a/backend/pkg/analytics/builder.go
+++ b/backend/pkg/analytics/builder.go
@@ -1,8 +1,6 @@
 package analytics
 
 import (
-	"openreplay/backend/pkg/metrics/web"
-	"openreplay/backend/pkg/server/tracer"
 	"time"
 
 	"openreplay/backend/internal/config/analytics"
@@ -10,11 +8,12 @@ import (
 	"openreplay/backend/pkg/analytics/service"
 	"openreplay/backend/pkg/db/postgres/pool"
 	"openreplay/backend/pkg/logger"
+	"openreplay/backend/pkg/metrics/web"
 	"openreplay/backend/pkg/objectstorage/store"
 	"openreplay/backend/pkg/server/api"
 	"openreplay/backend/pkg/server/auth"
-	"openreplay/backend/pkg/server/keys"
 	"openreplay/backend/pkg/server/limiter"
+	"openreplay/backend/pkg/server/tracer"
 )
 
 type ServicesBuilder struct {
@@ -30,7 +29,6 @@ func NewServiceBuilder(log logger.Logger, cfg *analytics.Config, webMetrics web.
 		return nil, err
 	}
 
-	newKeys := keys.NewKeys(log, pgconn)
 	responser := api.NewResponser(webMetrics)
 
 	audiTrail, err := tracer.NewTracer(log, pgconn)
@@ -43,13 +41,13 @@ func NewServiceBuilder(log logger.Logger, cfg *analytics.Config, webMetrics web.
 		return nil, err
 	}
 
-	handlers, err := analyticsAPI.NewHandlers(log, cfg, responser, objStore, keys.NewKeys(log, pgconn), analyticsService)
+	handlers, err := analyticsAPI.NewHandlers(log, cfg, responser, objStore, analyticsService)
 	if err != nil {
 		return nil, err
 	}
 
 	return &ServicesBuilder{
-		Auth:         auth.NewAuth(log, cfg.JWTSecret, cfg.JWTSpotSecret, pgconn, newKeys),
+		Auth:         auth.NewAuth(log, cfg.JWTSecret, cfg.JWTSpotSecret, pgconn, nil),
 		RateLimiter:  limiter.NewUserRateLimiter(10, 30, 1*time.Minute, 5*time.Minute),
 		AuditTrail:   audiTrail,
 		AnalyticsAPI: handlers,
diff --git a/backend/pkg/analytics/service/analytics.go b/backend/pkg/analytics/service/analytics.go
index c705eb5cd..4c0faf13c 100644
--- a/backend/pkg/analytics/service/analytics.go
+++ b/backend/pkg/analytics/service/analytics.go
@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"errors"
+
 	"openreplay/backend/pkg/analytics/api/models"
 	"openreplay/backend/pkg/db/postgres/pool"
 	"openreplay/backend/pkg/logger"