adapt cache and handlers

cloudamqp · Nov 27, 2024 · ec03eba · ec03eba
1 parent d13cb95
commit ec03eba
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/src/lavinmq/amqp/connection_factory.cr b/src/lavinmq/amqp/connection_factory.cr
@@ -2,8 +2,8 @@ require "../version"
 require "../logger"
 require "./client"
 require "../client/connection_factory"
-require "../auth/basic_auth"
-require "../auth/oauth2"
+require "../auth/handlers/basic_auth"
+require "../auth/handlers/oauth2"
 
 module LavinMQ
   module AMQP

diff --git a/src/lavinmq/cache.cr → src/lavinmq/auth/auth_cache.cr b/src/lavinmq/cache.cr → src/lavinmq/auth/auth_cache.cr
diff --git a/src/lavinmq/auth/basic_auth.cr → src/lavinmq/auth/handlers/basic_auth.cr b/src/lavinmq/auth/basic_auth.cr → src/lavinmq/auth/handlers/basic_auth.cr
@@ -1,5 +1,5 @@
-require "./auth_handler"
-require "../server"
+require "../auth_handler"
+require "../../server"
 
 module LavinMQ
   class BasicAuthHandler < LavinMQ::AuthHandler

diff --git a/src/lavinmq/auth/http_auth.cr → src/lavinmq/auth/handlers/http_auth.cr b/src/lavinmq/auth/http_auth.cr → src/lavinmq/auth/handlers/http_auth.cr
diff --git a/src/lavinmq/auth/oauth2.cr → src/lavinmq/auth/handlers/oauth2.cr b/src/lavinmq/auth/oauth2.cr → src/lavinmq/auth/handlers/oauth2.cr
@@ -1,3 +1,5 @@
+require "../auth_handler"
+
 module LavinMQ
   class OAuth2Handler < LavinMQ::AuthHandler
     def authenticate(username : String, password : String)

diff --git a/src/lavinmq/server.cr b/src/lavinmq/server.cr
@@ -10,7 +10,6 @@ require "./exchange"
 require "./amqp/queue"
 require "./parameter"
 require "./config"
-require "./cache"
 require "./connection_info"
 require "./proxy_protocol"
 require "./client/client"