ITQ/Datarush
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup some shit in auth service

Browse Source
This commit is contained in:
Timur Kh.
2025-12-16 21:07:29 +03:00
parent c9bdc488d7
commit 7499a14024
7 changed files with 10 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/auth/server/server.go
-73
View File
@@ -6,7 +6,6 @@ import (
"log"
"net"
"net/http"
"strings"
"time"
"datarush/internal/auth/config"
@@ -43,24 +42,16 @@ func New(cfg *config.Config) *Server {
}
func (s *Server) Start() error {
// Connect to database
db, err := sqlx.Connect("postgres", s.config.BuildPostgresConnStr())
if err != nil {
return fmt.Errorf("failed to connect to postgres: %w", err)
}
s.db = db
// Create tables
if err := s.createTables(); err != nil {
return fmt.Errorf("failed to create tables: %w", err)
}
// Register gRPC services
if err := s.registerGRPCServices(); err != nil {
return fmt.Errorf("failed to register gRPC services: %w", err)
}
// Start gRPC server in a goroutine
go func() {
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", s.config.GRPCPort))
if err != nil {
@@ -73,7 +64,6 @@ func (s *Server) Start() error {
}
}()
// Start HTTP server
if err := s.startHTTPServer(); err != nil {
return fmt.Errorf("failed to start HTTP server: %w", err)
}
@@ -84,17 +74,13 @@ func (s *Server) Start() error {
func (s *Server) registerGRPCServices() error {
s.grpcServer = grpc.NewServer()
// Create repositories
userRepo := authPostgresRepo.NewUserRepository(s.db)
// Create services
authService := service.NewAuthService(userRepo, s.config.JWTSecret)
// Create and register handlers
authHandler := grpcHandlers.NewAuthHandler(authService)
pb.RegisterAuthServiceServer(s.grpcServer, authHandler)
// Enable reflection if configured
if s.config.GRPCEnableReflection {
reflection.Register(s.grpcServer)
}
@@ -103,20 +89,14 @@ func (s *Server) registerGRPCServices() error {
}
func (s *Server) startHTTPServer() error {
// Create repositories
userRepo := authPostgresRepo.NewUserRepository(s.db)
// Create services
authService := service.NewAuthService(userRepo, s.config.JWTSecret)
// Create HTTP handlers
authHandler := httpHandlers.NewAuthHandler(authService)
userHandler := httpHandlers.NewUserHandler(authService)
// Create router
mux := http.NewServeMux()
// Register routes with middleware wrapper
mux.HandleFunc("/api/v1/sign-up", func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
@@ -133,41 +113,6 @@ func (s *Server) startHTTPServer() error {
authHandler.SignIn(w, r)
})
mux.HandleFunc("/api/v1/me", func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
userHandler.GetMe(w, r)
})
mux.HandleFunc("/api/v1/users/", func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
// Extract user_id from path /api/v1/users/:user_id
userID := strings.TrimPrefix(r.URL.Path, "/api/v1/users/")
r.Header.Set("X-User-ID", userID)
userHandler.GetUser(w, r)
})
mux.HandleFunc("/api/v1/me/stat", func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
userHandler.GetMyStat(w, r)
})
mux.HandleFunc("/api/v1/leaderboard", func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
userHandler.GetLeaderboard(w, r)
})
s.httpServer = &http.Server{
Addr: fmt.Sprintf(":%d", s.config.HTTPPort),
Handler: mux,
@@ -209,21 +154,3 @@ func (s *Server) Stop() {
log.Println("auth server stopped")
}
func (s *Server) createTables() error {
schema := `
CREATE TABLE IF NOT EXISTS users (
id UUID PRIMARY KEY,
email VARCHAR(255) UNIQUE NOT NULL,
username VARCHAR(255) NOT NULL,
password VARCHAR(255) NOT NULL,
created_at TIMESTAMP NOT NULL,
updated_at TIMESTAMP NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_users_email ON users(email);
`
_, err := s.db.Exec(schema)
return err
}