Skip to content

Fixed: use code 400 for invalid phone number #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Fixed: use code 400 for invalid phone number #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/sms-gateway/handlers/3rdparty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ func (h *thirdPartyHandler) postMessage(user models.User, c *fiber.Ctx) error {
device := user.Devices[0]
state, err := h.messagesSvc.Enqeue(device, req)
if err != nil {
if errors.Is(err, services.ErrValidation) {
var err400 services.ErrValidation
if errors.As(err, &err400) {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}

Expand Down
15 changes: 10 additions & 5 deletions internal/sms-gateway/services/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package services
import (
"context"
"crypto/sha256"
"errors"
"fmt"
"log"
"time"
Expand All @@ -21,7 +20,11 @@ const (
ErrorTTLExpired = "TTL expired"
)

var ErrValidation error = errors.New("validation error")
type ErrValidation string

func (e ErrValidation) Error() string {
return string(e)
}

type MessagesService struct {
Messages *repositories.MessagesRepository
Expand Down Expand Up @@ -254,14 +257,16 @@ func modelToRecipientState(input models.MessageRecipient) smsgateway.RecipientSt
func cleanPhoneNumber(input string) (string, error) {
phone, err := phonenumbers.Parse(input, "RU")
if err != nil {
return input, fmt.Errorf("can't parse phone number: %w", err)
return input, ErrValidation(fmt.Sprintf("can't parse phone number: %s", err.Error()))
}

if !phonenumbers.IsValidNumber(phone) {
return input, fmt.Errorf("invalid phone number")
return input, ErrValidation("invalid phone number")
}

phoneNumberType := phonenumbers.GetNumberType(phone)
if phoneNumberType != phonenumbers.MOBILE && phoneNumberType != phonenumbers.FIXED_LINE_OR_MOBILE {
return input, fmt.Errorf("not mobile phone number")
return input, ErrValidation("not mobile phone number")
}

return phonenumbers.Format(phone, phonenumbers.E164), nil
Expand Down