Mike пре 2 година
родитељ
комит
b2fd02c48d
2 измењених фајлова са 12 додато и 11 уклоњено
  1. 3 3
      cmd/main.go
  2. 9 8
      handler/auth.go

+ 3 - 3
cmd/main.go

@@ -40,7 +40,7 @@ func main() {
 	}()
 	go func(logger *slog.Logger) {
 		logger = logger.With("svc", "BOS")
-		authHandler := handler.NewAuthService(cfg, sessionManager, feedbagStore, feedbagStore, chatRegistry)
+		authHandler := handler.NewAuthService(cfg, sessionManager, sessionManager, feedbagStore, feedbagStore, chatRegistry)
 		buddyHandler := handler.NewBuddyService()
 		oserviceHandler := handler.NewOServiceService(cfg, sessionManager, feedbagStore)
 		oserviceBOSHandler := handler.NewOServiceServiceForBOS(*oserviceHandler, chatRegistry)
@@ -68,7 +68,7 @@ func main() {
 	}(logger)
 	go func(logger *slog.Logger) {
 		logger = logger.With("svc", "CHAT")
-		authHandler := handler.NewAuthService(cfg, sessionManager, feedbagStore, feedbagStore, chatRegistry)
+		authHandler := handler.NewAuthService(cfg, sessionManager, sessionManager, feedbagStore, feedbagStore, chatRegistry)
 		oserviceHandler := handler.NewOServiceService(cfg, sessionManager, feedbagStore)
 		chatHandler := handler.NewChatService(chatRegistry)
 		oserviceChatHandler := handler.NewOServiceServiceForChat(*oserviceHandler, chatRegistry)
@@ -86,7 +86,7 @@ func main() {
 	}(logger)
 	go func(logger *slog.Logger) {
 		logger = logger.With("svc", "AUTH")
-		authHandler := handler.NewAuthService(cfg, sessionManager, feedbagStore, feedbagStore, chatRegistry)
+		authHandler := handler.NewAuthService(cfg, sessionManager, nil, feedbagStore, feedbagStore, chatRegistry)
 
 		server.AuthService{
 			AuthHandler: authHandler,

+ 9 - 8
handler/auth.go

@@ -13,23 +13,24 @@ import (
 	"github.com/mkaminski/goaim/state"
 )
 
-func NewAuthService(cfg server.Config, sessionManager SessionManager, feedbagManager FeedbagManager, userManager UserManager, cchatRegistry *state.ChatRegistry) *AuthService {
+func NewAuthService(cfg server.Config, sessionManager SessionManager, messageRelayer MessageRelayer, feedbagManager FeedbagManager, userManager UserManager, cchatRegistry *state.ChatRegistry) *AuthService {
 	return &AuthService{
-		sessionManager: sessionManager,
-		feedbagManager: feedbagManager,
+		chatRegistry:   cchatRegistry,
 		config:         cfg,
+		feedbagManager: feedbagManager,
+		messageRelayer: messageRelayer,
+		sessionManager: sessionManager,
 		userManager:    userManager,
-		chatRegistry:   cchatRegistry,
 	}
 }
 
 type AuthService struct {
-	sessionManager SessionManager
-	messageRelayer MessageRelayer
+	chatRegistry   *state.ChatRegistry
+	config         server.Config
 	feedbagManager FeedbagManager
+	messageRelayer MessageRelayer
+	sessionManager SessionManager
 	userManager    UserManager
-	config         server.Config
-	chatRegistry   *state.ChatRegistry
 }
 
 func (s AuthService) RetrieveChatSession(ctx context.Context, chatID string, sessID string) (*state.Session, error) {