From 7ce833521294da9a58cd81d2f8ea4a6d03796b13 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sat, 29 Jan 2022 19:54:37 +0500 Subject: [PATCH] :truck: Renamed NewMe to ParseMe --- internal/domain/me.go | 8 ++++---- internal/domain/me_test.go | 4 ++-- internal/session/repository/sqlite3/sqlite3_session.go | 2 +- internal/ticket/delivery/http/ticket_http.go | 4 ++-- internal/ticket/repository/sqlite3/sqlite3_ticket.go | 2 +- internal/token/repository/sqlite3/sqlite3_token.go | 2 +- internal/token/usecase/token_ucase.go | 2 +- internal/user/repository/http/http_user.go | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/domain/me.go b/internal/domain/me.go index 9185ddf..deff435 100644 --- a/internal/domain/me.go +++ b/internal/domain/me.go @@ -19,7 +19,7 @@ type Me struct { } //nolint: funlen -func NewMe(raw string) (*Me, error) { +func ParseMe(raw string) (*Me, error) { me := http.AcquireURI() if err := me.Parse(nil, []byte(raw)); err != nil { return nil, Error{ @@ -104,7 +104,7 @@ func NewMe(raw string) (*Me, error) { func TestMe(tb testing.TB, src string) *Me { tb.Helper() - me, err := NewMe(src) + me, err := ParseMe(src) require.NoError(tb, err) return me @@ -112,7 +112,7 @@ func TestMe(tb testing.TB, src string) *Me { // UnmarshalForm parses the value of the form key into the Me domain. func (m *Me) UnmarshalForm(v []byte) error { - me, err := NewMe(string(v)) + me, err := ParseMe(string(v)) if err != nil { return fmt.Errorf("UnmarshalForm: %w", err) } @@ -128,7 +128,7 @@ func (m *Me) UnmarshalJSON(v []byte) error { return err } - me, err := NewMe(src) + me, err := ParseMe(src) if err != nil { return fmt.Errorf("UnmarshalForm: %w", err) } diff --git a/internal/domain/me_test.go b/internal/domain/me_test.go index 4f22dad..0e9f406 100644 --- a/internal/domain/me_test.go +++ b/internal/domain/me_test.go @@ -10,7 +10,7 @@ import ( ) //nolint: funlen -func TestNewMe(t *testing.T) { +func TestParseMe(t *testing.T) { t.Parallel() for _, testCase := range []struct { @@ -63,7 +63,7 @@ func TestNewMe(t *testing.T) { t.Run(testCase.name, func(t *testing.T) { t.Parallel() - result, err := domain.NewMe(testCase.input) + result, err := domain.ParseMe(testCase.input) if testCase.isValid { require.NoError(t, err) assert.Equal(t, testCase.input, result.String()) diff --git a/internal/session/repository/sqlite3/sqlite3_session.go b/internal/session/repository/sqlite3/sqlite3_session.go index cc91ac0..a899d71 100644 --- a/internal/session/repository/sqlite3/sqlite3_session.go +++ b/internal/session/repository/sqlite3/sqlite3_session.go @@ -130,7 +130,7 @@ func (t *Session) Populate(dst *domain.Session) { dst.Code = t.Code dst.CodeChallenge = t.CodeChallenge dst.CodeChallengeMethod, _ = domain.ParseCodeChallengeMethod(t.CodeChallengeMethod) - dst.Me, _ = domain.NewMe(t.Me) + dst.Me, _ = domain.ParseMe(t.Me) dst.RedirectURI, _ = domain.NewURL(t.RedirectURI) for _, scope := range strings.Fields(t.Scope) { diff --git a/internal/ticket/delivery/http/ticket_http.go b/internal/ticket/delivery/http/ticket_http.go index 100ddfe..01fcd2f 100644 --- a/internal/ticket/delivery/http/ticket_http.go +++ b/internal/ticket/delivery/http/ticket_http.go @@ -23,7 +23,7 @@ import ( type ( GenerateRequest struct { // The access token should be used when acting on behalf of this URL. - Subject *domain.URL `form:"subject"` + Subject *domain.Me `form:"subject"` // The access token will work at this URL. Resource *domain.URL `form:"resource"` @@ -34,7 +34,7 @@ type ( Ticket string `form:"ticket"` // The access token should be used when acting on behalf of this URL. - Subject *domain.URL `form:"subject"` + Subject *domain.Me `form:"subject"` // The access token will work at this URL. Resource *domain.URL `form:"resource"` diff --git a/internal/ticket/repository/sqlite3/sqlite3_ticket.go b/internal/ticket/repository/sqlite3/sqlite3_ticket.go index 6724195..18b0c36 100644 --- a/internal/ticket/repository/sqlite3/sqlite3_ticket.go +++ b/internal/ticket/repository/sqlite3/sqlite3_ticket.go @@ -114,6 +114,6 @@ func NewTicket(src *domain.Ticket) *Ticket { func (t *Ticket) Populate(dst *domain.Ticket) { dst.Ticket = t.Ticket - dst.Subject, _ = domain.NewURL(t.Subject) + dst.Subject, _ = domain.ParseMe(t.Subject) dst.Resource, _ = domain.NewURL(t.Resource) } diff --git a/internal/token/repository/sqlite3/sqlite3_token.go b/internal/token/repository/sqlite3/sqlite3_token.go index 83c8fc3..2e2e456 100644 --- a/internal/token/repository/sqlite3/sqlite3_token.go +++ b/internal/token/repository/sqlite3/sqlite3_token.go @@ -91,7 +91,7 @@ func NewToken(src *domain.Token) *Token { func (t *Token) Populate(dst *domain.Token) { dst.AccessToken = t.AccessToken dst.ClientID, _ = domain.ParseClientID(t.ClientID) - dst.Me, _ = domain.NewMe(t.Me) + dst.Me, _ = domain.ParseMe(t.Me) dst.Scope = make(domain.Scopes, 0) for _, scope := range strings.Fields(t.Scope) { diff --git a/internal/token/usecase/token_ucase.go b/internal/token/usecase/token_ucase.go index 1e2329d..f118fd4 100644 --- a/internal/token/usecase/token_ucase.go +++ b/internal/token/usecase/token_ucase.go @@ -107,7 +107,7 @@ func (useCase *tokenUseCase) Verify(ctx context.Context, accessToken string) (*d AccessToken: accessToken, } result.ClientID, _ = domain.ParseClientID(t.Issuer()) - result.Me, _ = domain.NewMe(t.Subject()) + result.Me, _ = domain.ParseMe(t.Subject()) if scope, ok := t.Get("scope"); ok { result.Scope, _ = scope.(domain.Scopes) diff --git a/internal/user/repository/http/http_user.go b/internal/user/repository/http/http_user.go index d6ba05c..fdf864a 100644 --- a/internal/user/repository/http/http_user.go +++ b/internal/user/repository/http/http_user.go @@ -53,7 +53,7 @@ func (repo *httpUserRepository) Get(ctx context.Context, me *domain.Me) (*domain } // TODO(toby3d): handle error here? - resolvedMe, _ := domain.NewMe(string(resp.Header.Peek(http.HeaderLocation))) + resolvedMe, _ := domain.ParseMe(string(resp.Header.Peek(http.HeaderLocation))) u := &domain.User{ Me: resolvedMe, Profile: &domain.Profile{