Nucrea/Hermes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements for notifyer microservice

Browse Source
This commit is contained in:
Sergey Chubaryan 2025-02-23 20:29:39 +03:00
parent 16260ecedb
commit 2e70087f63
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/notifyer/emailer.go
View File

@ -14,7 +14,7 @@ const MSG_TEXT = `
<body> <body>
<p>{{.Text}}</p> <p>{{.Text}}</p>
{{if .Link}} {{if .Link}}
<a href="{{.Link}}">Click</a>link</p> <a href="{{.Link}}">link</a>
{{end}} {{end}}
</body> </body>
</html> </html>
@ -34,7 +34,7 @@ func NewEmailer(conf ConfigSMTP) (*Emailer, error) {
} }
defer closer.Close() defer closer.Close()
htmlTemplate, err := template.New("verify-email").Parse(MSG_TEXT) htmlTemplate, err := template.New("email").Parse(MSG_TEXT)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -52,22 +52,23 @@ type Emailer struct {
dialer *gomail.Dialer dialer *gomail.Dialer
} }
func (e *Emailer) SendRestorePassword(email, token string) error { func (e *Emailer) SendRestorePassword(email, link string) error {
return e.sendEmail("Restore your password", email, MailContent{ return e.sendEmail("Restore your password", email, MailContent{
Text: "Token: " + token, Text: "You received this message do request of password change. Use this link to change your password:",
Link: link,
}) })
} }
func (e *Emailer) SendVerifyUser(email, link string) error { func (e *Emailer) SendVerifyUser(email, link string) error {
return e.sendEmail("Verify your email", email, MailContent{ return e.sendEmail("Verify your email", email, MailContent{
Text: "You recieved this message due to registration of account. Use this link to verify email:", Text: "You received this message due to registration of account. Use this link to verify email:",
Link: link, Link: link,
}) })
} }
func (e *Emailer) SendPasswordChanged(email string) error { func (e *Emailer) SendPasswordChanged(email string) error {
return e.sendEmail("Password changed", email, MailContent{ return e.sendEmail("Password changed", email, MailContent{
Text: "You recieved this message due to password change", Text: "Your password was successfully changed",
}) })
} }

3
cmd/notifyer/event_handler.go
View File

@ -78,7 +78,8 @@ func (e *EventHandler) handleEvent(ctx context.Context, msg kafka.Message) error
// TODO: add context somehow // TODO: add context somehow
switch string(msg.Key) { switch string(msg.Key) {
case "email_forgot_password": case "email_forgot_password":
return e.emailer.SendRestorePassword(event.Email, event.Token) link := fmt.Sprintf("%s/restore-password?token=%s", e.config.App.ServiceUrl, event.Token)
return e.emailer.SendRestorePassword(event.Email, link)
case "email_password_changed": case "email_password_changed":
return e.emailer.SendPasswordChanged(event.Email) return e.emailer.SendPasswordChanged(event.Email)
case "email_verify_user": case "email_verify_user":

2
internal/core/repos/event_repo.go
View File

@ -35,7 +35,7 @@ func (e *EventRepo) sendEmail(ctx context.Context, email, actionToken, eventType
return err return err
} }
return e.kafka.SendMessage(ctx, eventType, valueBytes) return e.kafka.PushMessage(ctx, eventType, valueBytes)
} }
func (e *EventRepo) SendEmailPasswordChanged(ctx context.Context, email string) error { func (e *EventRepo) SendEmailPasswordChanged(ctx context.Context, email string) error {

0
internal/http_server/wrapper.go → internal/http_server/gin_wrapper.go
View File

2
internal/integrations/kafka.go
View File

@ -26,7 +26,7 @@ func NewKafka(addr, topic string) *Kafka {
} }
} }
func (k *Kafka) SendMessage(ctx context.Context, key string, value []byte) error { func (k *Kafka) PushMessage(ctx context.Context, key string, value []byte) error {
return k.writer.WriteMessages( return k.writer.WriteMessages(
context.Background(), context.Background(),
kafka.Message{ kafka.Message{