From 2cc1fa02e769d6aeba6de4746f4981f0a6a0f0a5 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sat, 29 Jan 2022 19:43:00 +0500 Subject: [PATCH] :truck: Renamed NewEmail to ParseEmail --- internal/domain/email.go | 7 ++++++- internal/domain/email_test.go | 4 ++-- internal/user/repository/http/http_user.go | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/domain/email.go b/internal/domain/email.go index 313b0fa..b646ba8 100644 --- a/internal/domain/email.go +++ b/internal/domain/email.go @@ -3,6 +3,8 @@ package domain import ( "strings" "testing" + + "golang.org/x/xerrors" ) type Email struct { @@ -13,9 +15,12 @@ type Email struct { var ErrEmailInvalid error = Error{ Code: ErrorCodeInvalidRequest, Description: "cannot parse email", + URI: "", + State: "", + frame: xerrors.Caller(1), } -func NewEmail(src string) (*Email, error) { +func ParseEmail(src string) (*Email, error) { parts := strings.Split(strings.TrimPrefix(src, "mailto:"), "@") if len(parts) != 2 { //nolint: gomnd return nil, ErrEmailInvalid diff --git a/internal/domain/email_test.go b/internal/domain/email_test.go index 82ee6fc..3f0b76f 100644 --- a/internal/domain/email_test.go +++ b/internal/domain/email_test.go @@ -8,7 +8,7 @@ import ( "source.toby3d.me/website/indieauth/internal/domain" ) -func TestNewEmail(t *testing.T) { +func TestParseEmail(t *testing.T) { t.Parallel() for _, testCase := range []struct { @@ -37,7 +37,7 @@ func TestNewEmail(t *testing.T) { t.Run(testCase.name, func(t *testing.T) { t.Parallel() - result, err := domain.NewEmail(testCase.input) + result, err := domain.ParseEmail(testCase.input) if testCase.expError { assert.Error(t, err) assert.Nil(t, result) diff --git a/internal/user/repository/http/http_user.go b/internal/user/repository/http/http_user.go index c6c02d8..d6ba05c 100644 --- a/internal/user/repository/http/http_user.go +++ b/internal/user/repository/http/http_user.go @@ -133,7 +133,7 @@ func extractProfile(dst *domain.Profile, src *http.Response) { continue } - e, err := domain.NewEmail(email) + e, err := domain.ParseEmail(email) if err != nil { continue }