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

add rec url to env

Browse Source
This commit is contained in:
Pavel 2024-01-18 15:40:15 +03:00
parent 24ba370ccd
commit e7e249a2ba
5 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -38,6 +38,7 @@ SMTP_SENDER="noreply@mailing.pena.digital"
DEFAULT_REDIRECTION_URL = "def.url" DEFAULT_REDIRECTION_URL = "def.url"
AUTH_EXCHANGE_URL = "http://localhost:8000/auth/exchange" AUTH_EXCHANGE_URL = "http://localhost:8000/auth/exchange"
DISCOUNT_ADDRESS = "http://CHANGEME:1234" DISCOUNT_ADDRESS = "http://CHANGEME:1234"
RECOVERY_URL = "http://127.0.0.1:8080/recover/"
# Kafka settings # Kafka settings
KAFKA_BROKERS="localhost:9092" KAFKA_BROKERS="localhost:9092"

7
internal/adapters/client/mail.go
View File

@ -18,8 +18,7 @@ type RecoveryEmailSenderDeps struct {
ApiKey string ApiKey string
FiberClient *fiber.Client FiberClient *fiber.Client
Logger *zap.Logger Logger *zap.Logger
CodewordHost string RecoveryUrl string
CodewordPort string
} }
type RecoveryEmailSender struct { type RecoveryEmailSender struct {
@ -40,7 +39,7 @@ func (r *RecoveryEmailSender) SendRecoveryEmail(email string, signature string)
fmt.Println(email, signature) fmt.Println(email, signature)
message := fmt.Sprintf("http://"+r.deps.CodewordHost+":"+r.deps.CodewordPort+"/recover/%s", signature) message := r.deps.RecoveryUrl + signature
form := new(bytes.Buffer) form := new(bytes.Buffer)
writer := multipart.NewWriter(form) writer := multipart.NewWriter(form)
@ -48,7 +47,7 @@ func (r *RecoveryEmailSender) SendRecoveryEmail(email string, signature string)
fields := map[string]string{ fields := map[string]string{
"from": r.deps.SmtpSender, "from": r.deps.SmtpSender,
"to": "pashamullin202@gmail.com", "to": email,
"subject": "Восстановление доступа", "subject": "Восстановление доступа",
"html": message, "html": message,
} }

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

@ -58,7 +58,6 @@ func (r *RecoveryController) HandleRecoveryRequest(c *fiber.Ctx) error {
user, err := r.service.FindUserByEmail(c.Context(), req.Email) user, err := r.service.FindUserByEmail(c.Context(), req.Email)
if err != nil || user == nil { if err != nil || user == nil {
r.logger.Error("Failed to find user by email", zap.Error(err)) r.logger.Error("Failed to find user by email", zap.Error(err))
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"}) return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"})
} }

3
internal/initialize/clients.go
View File

@ -17,8 +17,7 @@ func RecoveryEmailSender(cfg Config, logger *zap.Logger) *client.RecoveryEmailSe
ApiKey: cfg.SmtpApiKey, ApiKey: cfg.SmtpApiKey,
FiberClient: &fiber.Client{}, FiberClient: &fiber.Client{},
Logger: logger, Logger: logger,
CodewordHost: cfg.HTTPHost, RecoveryUrl: cfg.RecoveryUrl,
CodewordPort: cfg.HTTPPort,
}) })
} }

1
internal/initialize/config.go
View File

@ -34,6 +34,7 @@ type Config struct {
KafkaBrokers string `env:"KAFKA_BROKERS"` KafkaBrokers string `env:"KAFKA_BROKERS"`
KafkaTopic string `env:"KAFKA_TOPIC_TARIFF"` KafkaTopic string `env:"KAFKA_TOPIC_TARIFF"`
DiscountServiceAddress string `env:"DISCOUNT_ADDRESS"` DiscountServiceAddress string `env:"DISCOUNT_ADDRESS"`
RecoveryUrl string `env:"RECOVERY_URL"`
} }
func LoadConfig() (*Config, error) { func LoadConfig() (*Config, error) {