fix auth interceptors in task and user services;
This commit is contained in:
@@ -142,6 +142,35 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
shm_size: 4mb
|
shm_size: 4mb
|
||||||
|
|
||||||
|
user:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Containerfile
|
||||||
|
args:
|
||||||
|
SERVICE: user
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
restart: false
|
||||||
|
condition: service_healthy
|
||||||
|
required: true
|
||||||
|
redis:
|
||||||
|
restart: false
|
||||||
|
condition: service_healthy
|
||||||
|
required: true
|
||||||
|
auth:
|
||||||
|
restart: false
|
||||||
|
condition: service_started
|
||||||
|
required: true
|
||||||
|
env_file:
|
||||||
|
- path: ./infrastructure/user/.env.template
|
||||||
|
required: true
|
||||||
|
- path: ./infrastructure/user/.env
|
||||||
|
required: false
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
restart: unless-stopped
|
||||||
|
shm_size: 4mb
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: docker.io/nginx:1.29-alpine
|
image: docker.io/nginx:1.29-alpine
|
||||||
configs:
|
configs:
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
_ "github.com/lib/pq"
|
_ "github.com/lib/pq"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
"google.golang.org/grpc/reflection"
|
"google.golang.org/grpc/reflection"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -46,6 +47,12 @@ func (s *Server) Start() error {
|
|||||||
}
|
}
|
||||||
s.db = db
|
s.db = db
|
||||||
|
|
||||||
|
authConn, err := grpc.Dial(s.config.AuthSvcAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to connect to auth service: %w", err)
|
||||||
|
}
|
||||||
|
s.authConn = authConn
|
||||||
|
|
||||||
if err := s.registerGRPCServices(); err != nil {
|
if err := s.registerGRPCServices(); err != nil {
|
||||||
return fmt.Errorf("failed to register gRPC services: %w", err)
|
return fmt.Errorf("failed to register gRPC services: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ type Config struct {
|
|||||||
DBPassword string
|
DBPassword string
|
||||||
DBName string
|
DBName string
|
||||||
JWTSecret string
|
JWTSecret string
|
||||||
|
AuthSvcAddr string
|
||||||
}
|
}
|
||||||
|
|
||||||
func Load() (*Config, error) {
|
func Load() (*Config, error) {
|
||||||
@@ -37,6 +38,7 @@ func Load() (*Config, error) {
|
|||||||
DBPassword: getEnv("POSTGRES_PASSWORD", "postgres"),
|
DBPassword: getEnv("POSTGRES_PASSWORD", "postgres"),
|
||||||
DBName: getEnv("POSTGRES_DATABASE", "postgres"),
|
DBName: getEnv("POSTGRES_DATABASE", "postgres"),
|
||||||
JWTSecret: getEnv("JWT_SECRET", "your-secret-key-change-in-production"),
|
JWTSecret: getEnv("JWT_SECRET", "your-secret-key-change-in-production"),
|
||||||
|
AuthSvcAddr: getEnv("AUTH_SVC_ADDR", "localhost:50051"),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,4 +75,4 @@ func (c Config) BuildPostgresConnStr() string {
|
|||||||
func (c Config) BuildPostgresDSN() string {
|
func (c Config) BuildPostgresDSN() string {
|
||||||
return fmt.Sprintf("postgresql://%s:%s@%s/%s?sslmode=disable",
|
return fmt.Sprintf("postgresql://%s:%s@%s/%s?sslmode=disable",
|
||||||
c.DBUser, c.DBPassword, net.JoinHostPort(c.DBHost, strconv.Itoa(c.DBPort)), c.DBName)
|
c.DBUser, c.DBPassword, net.JoinHostPort(c.DBHost, strconv.Itoa(c.DBPort)), c.DBName)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
_ "github.com/lib/pq"
|
_ "github.com/lib/pq"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
"google.golang.org/grpc/reflection"
|
"google.golang.org/grpc/reflection"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -46,6 +47,12 @@ func (s *Server) Start() error {
|
|||||||
}
|
}
|
||||||
s.db = db
|
s.db = db
|
||||||
|
|
||||||
|
authConn, err := grpc.Dial(s.config.AuthSvcAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to connect to auth service: %w", err)
|
||||||
|
}
|
||||||
|
s.authConn = authConn
|
||||||
|
|
||||||
if err := s.registerGRPCServices(); err != nil {
|
if err := s.registerGRPCServices(); err != nil {
|
||||||
return fmt.Errorf("failed to register gRPC services: %w", err)
|
return fmt.Errorf("failed to register gRPC services: %w", err)
|
||||||
}
|
}
|
||||||
@@ -100,5 +107,11 @@ func (s *Server) Stop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s.authConn != nil {
|
||||||
|
if err := s.authConn.Close(); err != nil {
|
||||||
|
log.Printf("failed to close auth connection: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
log.Println("user server stopped")
|
log.Println("user server stopped")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user