toby3d/auth
toby3d
/
auth
1
0
Fork 0
Code Actions Packages Releases Activity

🚚 Renamed util package to httputil

This commit is contained in:
Maxim Lebedev 2022-06-10 00:18:40 +05:00
parent 3266fb1e57
commit f97d0ba272
Signed by: toby3d
GPG Key ID: 1F14E25B7C119FC5
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/client/repository/http/http_client.go
View File

@ -8,7 +8,7 @@ import (
"source.toby3d.me/toby3d/auth/internal/client" "source.toby3d.me/toby3d/auth/internal/client"
"source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/domain"
"source.toby3d.me/toby3d/auth/internal/util" "source.toby3d.me/toby3d/auth/internal/httputil"
) )
type httpClientRepository struct { type httpClientRepository struct {
@ -64,20 +64,20 @@ func (repo *httpClientRepository) Get(ctx context.Context, cid *domain.ClientID)
//nolint: gocognit, cyclop //nolint: gocognit, cyclop
func extract(dst *domain.Client, src *http.Response) { func extract(dst *domain.Client, src *http.Response) {
for _, endpoint := range util.ExtractEndpoints(src, relRedirectURI) { for _, endpoint := range httputil.ExtractEndpoints(src, relRedirectURI) {
if !containsURL(dst.RedirectURI, endpoint) { if !containsURL(dst.RedirectURI, endpoint) {
dst.RedirectURI = append(dst.RedirectURI, endpoint) dst.RedirectURI = append(dst.RedirectURI, endpoint)
} }
} }
for _, itemType := range []string{hXApp, hApp} { for _, itemType := range []string{hXApp, hApp} {
for _, name := range util.ExtractProperty(src, itemType, propertyName) { for _, name := range httputil.ExtractProperty(src, itemType, propertyName) {
if n, ok := name.(string); ok && !containsString(dst.Name, n) { if n, ok := name.(string); ok && !containsString(dst.Name, n) {
dst.Name = append(dst.Name, n) dst.Name = append(dst.Name, n)
} }
} }
for _, logo := range util.ExtractProperty(src, itemType, propertyLogo) { for _, logo := range httputil.ExtractProperty(src, itemType, propertyLogo) {
var ( var (
uri *domain.URL uri *domain.URL
err error err error
@ -99,7 +99,7 @@ func extract(dst *domain.Client, src *http.Response) {
dst.Logo = append(dst.Logo, uri) dst.Logo = append(dst.Logo, uri)
} }
for _, property := range util.ExtractProperty(src, itemType, propertyURL) { for _, property := range httputil.ExtractProperty(src, itemType, propertyURL) {
prop, ok := property.(string) prop, ok := property.(string)
if !ok { if !ok {
continue continue

2
internal/util/http.go → internal/httputil/httputil.go
View File

@ -1,4 +1,4 @@
package util package httputil
import ( import (
"bytes" "bytes"

6
internal/util/http_test.go → internal/httputil/httputil_test.go
View File

@ -1,11 +1,11 @@
package util_test package httputil_test
import ( import (
"testing" "testing"
http "github.com/valyala/fasthttp" http "github.com/valyala/fasthttp"
"source.toby3d.me/toby3d/auth/internal/util" "source.toby3d.me/toby3d/auth/internal/httputil"
) )
const testBody = `<html> const testBody = `<html>
@ -23,7 +23,7 @@ func TestExtractProperty(t *testing.T) {
defer http.ReleaseResponse(resp) defer http.ReleaseResponse(resp)
resp.SetBodyString(testBody) resp.SetBodyString(testBody)
results := util.ExtractProperty(resp, "h-card", "name") results := httputil.ExtractProperty(resp, "h-card", "name")
if results == nil || results[0] != "Sample Name" { if results == nil || results[0] != "Sample Name" {
t.Errorf(`ExtractProperty(resp, "h-card", "name") = %+s, want %+s`, results, []string{"Sample Name"}) t.Errorf(`ExtractProperty(resp, "h-card", "name") = %+s, want %+s`, results, []string{"Sample Name"})
} }

4
internal/metadata/repository/http/http_metadata.go
View File

@ -8,8 +8,8 @@ import (
http "github.com/valyala/fasthttp" http "github.com/valyala/fasthttp"
"source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/domain"
"source.toby3d.me/toby3d/auth/internal/httputil"
"source.toby3d.me/toby3d/auth/internal/metadata" "source.toby3d.me/toby3d/auth/internal/metadata"
"source.toby3d.me/toby3d/auth/internal/util"
) )
type ( type (
@ -57,7 +57,7 @@ func (repo *httpMetadataRepository) Get(ctx context.Context, me *domain.Me) (*do
return nil, fmt.Errorf("failed to make a request to the client: %w", err) return nil, fmt.Errorf("failed to make a request to the client: %w", err)
} }
endpoints := util.ExtractEndpoints(resp, "indieauth-metadata") endpoints := httputil.ExtractEndpoints(resp, "indieauth-metadata")
if len(endpoints) == 0 { if len(endpoints) == 0 {
return nil, metadata.ErrNotExist return nil, metadata.ErrNotExist
} }

10
internal/profile/repository/http/http_profile.go
View File

@ -7,8 +7,8 @@ import (
http "github.com/valyala/fasthttp" http "github.com/valyala/fasthttp"
"source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/domain"
"source.toby3d.me/toby3d/auth/internal/httputil"
"source.toby3d.me/toby3d/auth/internal/profile" "source.toby3d.me/toby3d/auth/internal/profile"
"source.toby3d.me/toby3d/auth/internal/util"
) )
type httpProfileRepository struct { type httpProfileRepository struct {
@ -48,13 +48,13 @@ func (repo *httpProfileRepository) Get(ctx context.Context, me *domain.Me) (*dom
result := domain.NewProfile() result := domain.NewProfile()
for _, name := range util.ExtractProperty(resp, hCard, propertyName) { for _, name := range httputil.ExtractProperty(resp, hCard, propertyName) {
if n, ok := name.(string); ok { if n, ok := name.(string); ok {
result.Name = append(result.Name, n) result.Name = append(result.Name, n)
} }
} }
for _, rawEmail := range util.ExtractProperty(resp, hCard, propertyEmail) { for _, rawEmail := range httputil.ExtractProperty(resp, hCard, propertyEmail) {
email, ok := rawEmail.(string) email, ok := rawEmail.(string)
if !ok { if !ok {
continue continue
@ -65,7 +65,7 @@ func (repo *httpProfileRepository) Get(ctx context.Context, me *domain.Me) (*dom
} }
} }
for _, rawURL := range util.ExtractProperty(resp, hCard, propertyURL) { for _, rawURL := range httputil.ExtractProperty(resp, hCard, propertyURL) {
url, ok := rawURL.(string) url, ok := rawURL.(string)
if !ok { if !ok {
continue continue
@ -76,7 +76,7 @@ func (repo *httpProfileRepository) Get(ctx context.Context, me *domain.Me) (*dom
} }
} }
for _, rawPhoto := range util.ExtractProperty(resp, hCard, propertyPhoto) { for _, rawPhoto := range httputil.ExtractProperty(resp, hCard, propertyPhoto) {
photo, ok := rawPhoto.(string) photo, ok := rawPhoto.(string)
if !ok { if !ok {
continue continue

10
internal/ticket/usecase/ticket_ucase.go
View File

@ -10,8 +10,8 @@ import (
"source.toby3d.me/toby3d/auth/internal/common" "source.toby3d.me/toby3d/auth/internal/common"
"source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/domain"
"source.toby3d.me/toby3d/auth/internal/httputil"
"source.toby3d.me/toby3d/auth/internal/ticket" "source.toby3d.me/toby3d/auth/internal/ticket"
"source.toby3d.me/toby3d/auth/internal/util"
) )
type ( type (
@ -62,10 +62,10 @@ func (useCase *ticketUseCase) Generate(ctx context.Context, tkt *domain.Ticket)
var ticketEndpoint *domain.URL var ticketEndpoint *domain.URL
// NOTE(toby3d): find metadata first // NOTE(toby3d): find metadata first
if metadata, err := util.ExtractMetadata(resp, useCase.client); err == nil && metadata != nil { if metadata, err := httputil.ExtractMetadata(resp, useCase.client); err == nil && metadata != nil {
ticketEndpoint = metadata.TicketEndpoint ticketEndpoint = metadata.TicketEndpoint
} else { // NOTE(toby3d): fallback to old links searching } else { // NOTE(toby3d): fallback to old links searching
if endpoints := util.ExtractEndpoints(resp, "ticket_endpoint"); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(resp, "ticket_endpoint"); len(endpoints) > 0 {
ticketEndpoint = endpoints[len(endpoints)-1] ticketEndpoint = endpoints[len(endpoints)-1]
} }
} }
@ -110,10 +110,10 @@ func (useCase *ticketUseCase) Redeem(ctx context.Context, tkt *domain.Ticket) (*
var tokenEndpoint *domain.URL var tokenEndpoint *domain.URL
// NOTE(toby3d): find metadata first // NOTE(toby3d): find metadata first
if metadata, err := util.ExtractMetadata(resp, useCase.client); err == nil && metadata != nil { if metadata, err := httputil.ExtractMetadata(resp, useCase.client); err == nil && metadata != nil {
tokenEndpoint = metadata.TokenEndpoint tokenEndpoint = metadata.TokenEndpoint
} else { // NOTE(toby3d): fallback to old links searching } else { // NOTE(toby3d): fallback to old links searching
if endpoints := util.ExtractEndpoints(resp, "token_endpoint"); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(resp, "token_endpoint"); len(endpoints) > 0 {
tokenEndpoint = endpoints[len(endpoints)-1] tokenEndpoint = endpoints[len(endpoints)-1]
} }
} }

24
internal/user/repository/http/http_user.go
View File

@ -7,8 +7,8 @@ import (
http "github.com/valyala/fasthttp" http "github.com/valyala/fasthttp"
"source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/domain"
"source.toby3d.me/toby3d/auth/internal/httputil"
"source.toby3d.me/toby3d/auth/internal/user" "source.toby3d.me/toby3d/auth/internal/user"
"source.toby3d.me/toby3d/auth/internal/util"
) )
type httpUserRepository struct { type httpUserRepository struct {
@ -64,7 +64,7 @@ func (repo *httpUserRepository) Get(ctx context.Context, me *domain.Me) (*domain
TokenEndpoint: nil, TokenEndpoint: nil,
} }
if metadata, err := util.ExtractMetadata(resp, repo.client); err == nil { if metadata, err := httputil.ExtractMetadata(resp, repo.client); err == nil {
user.AuthorizationEndpoint = metadata.AuthorizationEndpoint user.AuthorizationEndpoint = metadata.AuthorizationEndpoint
user.Micropub = metadata.MicropubEndpoint user.Micropub = metadata.MicropubEndpoint
user.Microsub = metadata.MicrosubEndpoint user.Microsub = metadata.MicrosubEndpoint
@ -81,37 +81,37 @@ func (repo *httpUserRepository) Get(ctx context.Context, me *domain.Me) (*domain
//nolint: cyclop //nolint: cyclop
func extractUser(dst *domain.User, src *http.Response) { func extractUser(dst *domain.User, src *http.Response) {
if dst.IndieAuthMetadata != nil { if dst.IndieAuthMetadata != nil {
if endpoints := util.ExtractEndpoints(src, relIndieAuthMetadata); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relIndieAuthMetadata); len(endpoints) > 0 {
dst.IndieAuthMetadata = endpoints[len(endpoints)-1] dst.IndieAuthMetadata = endpoints[len(endpoints)-1]
} }
} }
if dst.AuthorizationEndpoint == nil { if dst.AuthorizationEndpoint == nil {
if endpoints := util.ExtractEndpoints(src, relAuthorizationEndpoint); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relAuthorizationEndpoint); len(endpoints) > 0 {
dst.AuthorizationEndpoint = endpoints[len(endpoints)-1] dst.AuthorizationEndpoint = endpoints[len(endpoints)-1]
} }
} }
if dst.Micropub == nil { if dst.Micropub == nil {
if endpoints := util.ExtractEndpoints(src, relMicropub); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relMicropub); len(endpoints) > 0 {
dst.Micropub = endpoints[len(endpoints)-1] dst.Micropub = endpoints[len(endpoints)-1]
} }
} }
if dst.Microsub == nil { if dst.Microsub == nil {
if endpoints := util.ExtractEndpoints(src, relMicrosub); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relMicrosub); len(endpoints) > 0 {
dst.Microsub = endpoints[len(endpoints)-1] dst.Microsub = endpoints[len(endpoints)-1]
} }
} }
if dst.TicketEndpoint == nil { if dst.TicketEndpoint == nil {
if endpoints := util.ExtractEndpoints(src, relTicketEndpoint); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relTicketEndpoint); len(endpoints) > 0 {
dst.TicketEndpoint = endpoints[len(endpoints)-1] dst.TicketEndpoint = endpoints[len(endpoints)-1]
} }
} }
if dst.TokenEndpoint == nil { if dst.TokenEndpoint == nil {
if endpoints := util.ExtractEndpoints(src, relTokenEndpoint); len(endpoints) > 0 { if endpoints := httputil.ExtractEndpoints(src, relTokenEndpoint); len(endpoints) > 0 {
dst.TokenEndpoint = endpoints[len(endpoints)-1] dst.TokenEndpoint = endpoints[len(endpoints)-1]
} }
} }
@ -119,13 +119,13 @@ func extractUser(dst *domain.User, src *http.Response) {
//nolint: cyclop //nolint: cyclop
func extractProfile(dst *domain.Profile, src *http.Response) { func extractProfile(dst *domain.Profile, src *http.Response) {
for _, name := range util.ExtractProperty(src, hCard, propertyName) { for _, name := range httputil.ExtractProperty(src, hCard, propertyName) {
if n, ok := name.(string); ok { if n, ok := name.(string); ok {
dst.Name = append(dst.Name, n) dst.Name = append(dst.Name, n)
} }
} }
for _, rawEmail := range util.ExtractProperty(src, hCard, propertyEmail) { for _, rawEmail := range httputil.ExtractProperty(src, hCard, propertyEmail) {
email, ok := rawEmail.(string) email, ok := rawEmail.(string)
if !ok { if !ok {
continue continue
@ -136,7 +136,7 @@ func extractProfile(dst *domain.Profile, src *http.Response) {
} }
} }
for _, rawURL := range util.ExtractProperty(src, hCard, propertyURL) { for _, rawURL := range httputil.ExtractProperty(src, hCard, propertyURL) {
url, ok := rawURL.(string) url, ok := rawURL.(string)
if !ok { if !ok {
continue continue
@ -147,7 +147,7 @@ func extractProfile(dst *domain.Profile, src *http.Response) {
} }
} }
for _, rawPhoto := range util.ExtractProperty(src, hCard, propertyPhoto) { for _, rawPhoto := range httputil.ExtractProperty(src, hCard, propertyPhoto) {
photo, ok := rawPhoto.(string) photo, ok := rawPhoto.(string)
if !ok { if !ok {
continue continue