PenaSide/codeword
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change fetch users

Browse Source
This commit is contained in:
Pavel 2024-01-18 20:25:40 +03:00
parent 3b41a171d0
commit 4bd2d9e4dc
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployments/staging/docker-compose.yaml
View File

@ -16,8 +16,8 @@ services:
MONGO_PASSWORD: 'LFYFpTvqtxSzXDJV' MONGO_PASSWORD: 'LFYFpTvqtxSzXDJV'
MONGO_DB: 'auth' MONGO_DB: 'auth'
MONGO_AUTH: 'auth' MONGO_AUTH: 'auth'
PUBLIC_CURVE_KEY: '-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAEbnIvjIMle4rqVol6K2XUqOxHy1KJoNoZdKJrRUPKL4=\n-----END PUBLIC KEY-----' PUBLIC_CURVE_KEY: "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAEbnIvjIMle4rqVol6K2XUqOxHy1KJoNoZdKJrRUPKL4=\n-----END PUBLIC KEY-----"
PRIVATE_CURVE_KEY: '-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIKn0BKwF3vZvODgWAnUIwQhd8de5oZhY48gc23EWfrfs\n-----END PRIVATE KEY-----' PRIVATE_CURVE_KEY: "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIKn0BKwF3vZvODgWAnUIwQhd8de5oZhY48gc23EWfrfs\n-----END PRIVATE KEY-----"
SIGN_SECRET: 'pena-auth-microservice-group' SIGN_SECRET: 'pena-auth-microservice-group'
REDIS_ADDR: '10.6.0.23:6379' REDIS_ADDR: '10.6.0.23:6379'
REDIS_PASS: 'Redalert2' REDIS_PASS: 'Redalert2'

12
internal/controller/recovery/recovery_controller.go
View File

@ -49,13 +49,11 @@ func (r *RecoveryController) HandleRecoveryRequest(c *fiber.Ctx) error {
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"}) return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"})
} }
//key, err := r.service.GenerateKey() key, err := r.service.GenerateKey()
//if err != nil { if err != nil {
// r.logger.Error("Failed to generate key", zap.Error(err)) r.logger.Error("Failed to generate key", zap.Error(err))
// return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "Internal Server Error"}) return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "Internal Server Error"})
//} }
key := []byte("GSiyv5zBITGshqnvYLHKtXE3e4yZjKGvruOVFWuUuj9Nvaps28-Zt6RDq9n47eaNUlay1-nUVld61I3xoAAgCA==65a79d5d67734ab00b3c9463")
signUrl := redirectionURL + base64.URLEncoding.EncodeToString(key) signUrl := redirectionURL + base64.URLEncoding.EncodeToString(key)
sign := base64.URLEncoding.EncodeToString(key) sign := base64.URLEncoding.EncodeToString(key)

2
internal/server/http/http_server.go
View File

@ -65,12 +65,12 @@ func (s *Server) handleReadiness(c *fiber.Ctx) error {
s.Logger.Error("Failed to ping the database", zap.Error(err)) s.Logger.Error("Failed to ping the database", zap.Error(err))
return c.Status(fiber.StatusServiceUnavailable).SendString("DB ping failed") return c.Status(fiber.StatusServiceUnavailable).SendString("DB ping failed")
} }
duration := time.Since(startTime)
if err := s.RecoveryController.HandlePingRedis(c); err != nil { if err := s.RecoveryController.HandlePingRedis(c); err != nil {
s.Logger.Error("Failed to ping the redis", zap.Error(err)) s.Logger.Error("Failed to ping the redis", zap.Error(err))
return c.Status(fiber.StatusServiceUnavailable).SendString("redis ping failed") return c.Status(fiber.StatusServiceUnavailable).SendString("redis ping failed")
} }
duration := time.Since(startTime)
durationMillis := duration.Milliseconds() durationMillis := duration.Milliseconds()
responseMessage := fmt.Sprintf("DB ping success - Time taken: %d ms", durationMillis) responseMessage := fmt.Sprintf("DB ping success - Time taken: %d ms", durationMillis)