From 3b0ebb3690c12ea742c62e2022fecba3bba05f33 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sun, 13 Mar 2022 15:58:34 +0500 Subject: [PATCH] :truck: Renamed module due project migration --- go.mod | 2 +- internal/auth/delivery/http/auth_http.go | 12 ++--- internal/auth/delivery/http/auth_http_test.go | 26 ++++----- internal/auth/usecase.go | 2 +- internal/auth/usecase/auth_ucase.go | 10 ++-- internal/client/delivery/http/client_http.go | 8 +-- .../client/delivery/http/client_http_test.go | 20 +++---- internal/client/repository.go | 2 +- .../client/repository/http/http_client.go | 6 +-- .../repository/http/http_client_test.go | 8 +-- .../client/repository/memory/memory_client.go | 4 +- .../repository/memory/memory_client_test.go | 4 +- internal/client/usecase.go | 2 +- internal/client/usecase/client_ucase.go | 4 +- internal/client/usecase/client_ucase_test.go | 6 +-- internal/domain/action_test.go | 2 +- internal/domain/client_id_test.go | 2 +- internal/domain/client_test.go | 2 +- internal/domain/code_challenge_method_test.go | 4 +- internal/domain/config_test.go | 2 +- internal/domain/email_test.go | 2 +- internal/domain/error_test.go | 2 +- internal/domain/grant_type_test.go | 2 +- internal/domain/me_test.go | 2 +- internal/domain/response_type_test.go | 2 +- internal/domain/scope_test.go | 2 +- internal/domain/session.go | 2 +- internal/domain/token.go | 2 +- internal/domain/token_test.go | 2 +- internal/domain/url_test.go | 2 +- internal/health/delivery/http/health_http.go | 2 +- .../health/delivery/http/health_http_test.go | 4 +- .../metadata/delivery/http/metadata_http.go | 4 +- .../delivery/http/metadata_http_test.go | 6 +-- internal/metadata/repository.go | 2 +- .../metadata/repository/http/http_metadata.go | 6 +-- .../repository/memory/memory_metadata.go | 4 +- internal/profile/repository.go | 2 +- .../profile/repository/http/http_profile.go | 6 +-- .../repository/memory/memory_profile.go | 4 +- internal/profile/usecase.go | 2 +- internal/profile/usecase/profile_ucase.go | 4 +- internal/session/repository.go | 2 +- .../repository/memory/memory_session.go | 4 +- .../repository/sqlite3/sqlite3_session.go | 4 +- .../sqlite3/sqlite3_session_test.go | 6 +-- internal/session/usecase.go | 2 +- internal/session/usecase/session_ucase.go | 4 +- internal/ticket/delivery/http/ticket_http.go | 10 ++-- .../ticket/delivery/http/ticket_http_test.go | 14 ++--- internal/ticket/repository.go | 2 +- .../ticket/repository/memory/memory_ticket.go | 4 +- .../repository/memory/memory_ticket_test.go | 4 +- .../repository/sqlite3/sqlite3_ticket.go | 4 +- .../repository/sqlite3/sqlite3_ticket_test.go | 6 +-- internal/ticket/usecase.go | 2 +- internal/ticket/usecase/ticket_ucase.go | 8 +-- internal/ticket/usecase/ticket_ucase_test.go | 8 +-- internal/token/delivery/http/token_http.go | 8 +-- .../token/delivery/http/token_http_test.go | 28 +++++----- internal/token/repository.go | 2 +- .../token/repository/memory/memory_token.go | 4 +- .../repository/memory/memory_token_test.go | 6 +-- .../token/repository/sqlite3/sqlite3_token.go | 4 +- .../repository/sqlite3/sqlite3_token_test.go | 6 +-- internal/token/usecase.go | 2 +- internal/token/usecase/token_ucase.go | 19 ++++--- internal/token/usecase/token_ucase_test.go | 16 +++--- internal/user/delivery/http/user_http.go | 6 +-- internal/user/delivery/http/user_http_test.go | 20 +++---- internal/user/repository.go | 2 +- internal/user/repository/http/http_user.go | 6 +-- .../user/repository/http/http_user_test.go | 8 +-- .../user/repository/memory/memory_user.go | 4 +- .../repository/memory/memory_user_test.go | 4 +- internal/user/usecase.go | 2 +- internal/user/usecase/user_ucase.go | 4 +- internal/user/usecase/user_ucase_test.go | 6 +-- internal/util/http.go | 2 +- internal/util/http_test.go | 2 +- main.go | 54 +++++++++---------- web/authorize.qtpl | 2 +- web/authorize.qtpl.go | 2 +- web/baseof.qtpl | 2 +- web/baseof.qtpl.go | 2 +- web/callback.qtpl | 2 +- web/callback.qtpl.go | 2 +- web/error.qtpl | 2 +- web/error.qtpl.go | 2 +- web/home.qtpl | 2 +- web/home.qtpl.go | 2 +- 91 files changed, 256 insertions(+), 257 deletions(-) diff --git a/go.mod b/go.mod index e398203..5370380 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module source.toby3d.me/website/indieauth +module source.toby3d.me/toby3d/auth go 1.16 diff --git a/internal/auth/delivery/http/auth_http.go b/internal/auth/delivery/http/auth_http.go index 472c181..c71cdb1 100644 --- a/internal/auth/delivery/http/auth_http.go +++ b/internal/auth/delivery/http/auth_http.go @@ -15,12 +15,12 @@ import ( "source.toby3d.me/toby3d/form" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/auth" - "source.toby3d.me/website/indieauth/internal/client" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - "source.toby3d.me/website/indieauth/web" + "source.toby3d.me/toby3d/auth/internal/auth" + "source.toby3d.me/toby3d/auth/internal/client" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + "source.toby3d.me/toby3d/auth/web" ) type ( diff --git a/internal/auth/delivery/http/auth_http_test.go b/internal/auth/delivery/http/auth_http_test.go index c3e62a7..55fab55 100644 --- a/internal/auth/delivery/http/auth_http_test.go +++ b/internal/auth/delivery/http/auth_http_test.go @@ -11,19 +11,19 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - "source.toby3d.me/website/indieauth/internal/auth" - delivery "source.toby3d.me/website/indieauth/internal/auth/delivery/http" - ucase "source.toby3d.me/website/indieauth/internal/auth/usecase" - "source.toby3d.me/website/indieauth/internal/client" - clientrepo "source.toby3d.me/website/indieauth/internal/client/repository/memory" - clientucase "source.toby3d.me/website/indieauth/internal/client/usecase" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - profilerepo "source.toby3d.me/website/indieauth/internal/profile/repository/memory" - "source.toby3d.me/website/indieauth/internal/session" - sessionrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - userrepo "source.toby3d.me/website/indieauth/internal/user/repository/memory" + "source.toby3d.me/toby3d/auth/internal/auth" + delivery "source.toby3d.me/toby3d/auth/internal/auth/delivery/http" + ucase "source.toby3d.me/toby3d/auth/internal/auth/usecase" + "source.toby3d.me/toby3d/auth/internal/client" + clientrepo "source.toby3d.me/toby3d/auth/internal/client/repository/memory" + clientucase "source.toby3d.me/toby3d/auth/internal/client/usecase" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + profilerepo "source.toby3d.me/toby3d/auth/internal/profile/repository/memory" + "source.toby3d.me/toby3d/auth/internal/session" + sessionrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + userrepo "source.toby3d.me/toby3d/auth/internal/user/repository/memory" ) type Dependencies struct { diff --git a/internal/auth/usecase.go b/internal/auth/usecase.go index 99782e9..166e6c5 100644 --- a/internal/auth/usecase.go +++ b/internal/auth/usecase.go @@ -3,7 +3,7 @@ package auth import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type ( diff --git a/internal/auth/usecase/auth_ucase.go b/internal/auth/usecase/auth_ucase.go index 6a5b857..89a97dc 100644 --- a/internal/auth/usecase/auth_ucase.go +++ b/internal/auth/usecase/auth_ucase.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "source.toby3d.me/website/indieauth/internal/auth" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - "source.toby3d.me/website/indieauth/internal/random" - "source.toby3d.me/website/indieauth/internal/session" + "source.toby3d.me/toby3d/auth/internal/auth" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + "source.toby3d.me/toby3d/auth/internal/random" + "source.toby3d.me/toby3d/auth/internal/session" ) type authUseCase struct { diff --git a/internal/client/delivery/http/client_http.go b/internal/client/delivery/http/client_http.go index fe42dda..1b37615 100644 --- a/internal/client/delivery/http/client_http.go +++ b/internal/client/delivery/http/client_http.go @@ -9,12 +9,12 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/token" + "source.toby3d.me/toby3d/auth/web" "source.toby3d.me/toby3d/form" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/token" - "source.toby3d.me/website/indieauth/web" ) type ( diff --git a/internal/client/delivery/http/client_http_test.go b/internal/client/delivery/http/client_http_test.go index cf2fdf8..12a4c6f 100644 --- a/internal/client/delivery/http/client_http_test.go +++ b/internal/client/delivery/http/client_http_test.go @@ -9,16 +9,16 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - delivery "source.toby3d.me/website/indieauth/internal/client/delivery/http" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - profilerepo "source.toby3d.me/website/indieauth/internal/profile/repository/memory" - "source.toby3d.me/website/indieauth/internal/session" - sessionrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - "source.toby3d.me/website/indieauth/internal/token" - tokenrepo "source.toby3d.me/website/indieauth/internal/token/repository/memory" - tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" + delivery "source.toby3d.me/toby3d/auth/internal/client/delivery/http" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + profilerepo "source.toby3d.me/toby3d/auth/internal/profile/repository/memory" + "source.toby3d.me/toby3d/auth/internal/session" + sessionrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + "source.toby3d.me/toby3d/auth/internal/token" + tokenrepo "source.toby3d.me/toby3d/auth/internal/token/repository/memory" + tokenucase "source.toby3d.me/toby3d/auth/internal/token/usecase" ) type Dependencies struct { diff --git a/internal/client/repository.go b/internal/client/repository.go index c786c0e..6aef5ad 100644 --- a/internal/client/repository.go +++ b/internal/client/repository.go @@ -3,7 +3,7 @@ package client import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/client/repository/http/http_client.go b/internal/client/repository/http/http_client.go index 22b593c..88ba3b7 100644 --- a/internal/client/repository/http/http_client.go +++ b/internal/client/repository/http/http_client.go @@ -6,9 +6,9 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/client" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/client" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/util" ) type httpClientRepository struct { diff --git a/internal/client/repository/http/http_client_test.go b/internal/client/repository/http/http_client_test.go index 2cd7837..1bbbded 100644 --- a/internal/client/repository/http/http_client_test.go +++ b/internal/client/repository/http/http_client_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" http "github.com/valyala/fasthttp" - repository "source.toby3d.me/website/indieauth/internal/client/repository/http" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/httptest" + repository "source.toby3d.me/toby3d/auth/internal/client/repository/http" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" ) const testBody string = ` diff --git a/internal/client/repository/memory/memory_client.go b/internal/client/repository/memory/memory_client.go index 6fc08e5..8f91db3 100644 --- a/internal/client/repository/memory/memory_client.go +++ b/internal/client/repository/memory/memory_client.go @@ -6,8 +6,8 @@ import ( "path" "sync" - "source.toby3d.me/website/indieauth/internal/client" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/client" + "source.toby3d.me/toby3d/auth/internal/domain" ) type memoryClientRepository struct { diff --git a/internal/client/repository/memory/memory_client_test.go b/internal/client/repository/memory/memory_client_test.go index 0efaaae..9bb8a06 100644 --- a/internal/client/repository/memory/memory_client_test.go +++ b/internal/client/repository/memory/memory_client_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - repository "source.toby3d.me/website/indieauth/internal/client/repository/memory" - "source.toby3d.me/website/indieauth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/client/repository/memory" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestGet(t *testing.T) { diff --git a/internal/client/usecase.go b/internal/client/usecase.go index b214624..ca3f655 100644 --- a/internal/client/usecase.go +++ b/internal/client/usecase.go @@ -3,7 +3,7 @@ package client import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type UseCase interface { diff --git a/internal/client/usecase/client_ucase.go b/internal/client/usecase/client_ucase.go index 8540c35..863b056 100644 --- a/internal/client/usecase/client_ucase.go +++ b/internal/client/usecase/client_ucase.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "source.toby3d.me/website/indieauth/internal/client" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/client" + "source.toby3d.me/toby3d/auth/internal/domain" ) type clientUseCase struct { diff --git a/internal/client/usecase/client_ucase_test.go b/internal/client/usecase/client_ucase_test.go index d0470b4..345c664 100644 --- a/internal/client/usecase/client_ucase_test.go +++ b/internal/client/usecase/client_ucase_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - repository "source.toby3d.me/website/indieauth/internal/client/repository/memory" - "source.toby3d.me/website/indieauth/internal/client/usecase" - "source.toby3d.me/website/indieauth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/client/repository/memory" + "source.toby3d.me/toby3d/auth/internal/client/usecase" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestDiscovery(t *testing.T) { diff --git a/internal/domain/action_test.go b/internal/domain/action_test.go index 9a605c6..150bd75 100644 --- a/internal/domain/action_test.go +++ b/internal/domain/action_test.go @@ -4,7 +4,7 @@ package domain_test import ( "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseAction(t *testing.T) { diff --git a/internal/domain/client_id_test.go b/internal/domain/client_id_test.go index 4fd94a0..d59a8b3 100644 --- a/internal/domain/client_id_test.go +++ b/internal/domain/client_id_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseClientID(t *testing.T) { diff --git a/internal/domain/client_test.go b/internal/domain/client_test.go index b17eb49..0699c53 100644 --- a/internal/domain/client_test.go +++ b/internal/domain/client_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestClient_ValidateRedirectURI(t *testing.T) { diff --git a/internal/domain/code_challenge_method_test.go b/internal/domain/code_challenge_method_test.go index a5cd1a1..4fb6782 100644 --- a/internal/domain/code_challenge_method_test.go +++ b/internal/domain/code_challenge_method_test.go @@ -12,8 +12,8 @@ import ( "github.com/brianvoe/gofakeit/v6" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/random" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/random" ) func TestParseCodeChallengeMethod(t *testing.T) { diff --git a/internal/domain/config_test.go b/internal/domain/config_test.go index 0f89f1a..0738d72 100644 --- a/internal/domain/config_test.go +++ b/internal/domain/config_test.go @@ -3,7 +3,7 @@ package domain_test import ( "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestConfigServer_GetAddress(t *testing.T) { diff --git a/internal/domain/email_test.go b/internal/domain/email_test.go index 3e0e30c..959e973 100644 --- a/internal/domain/email_test.go +++ b/internal/domain/email_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseEmail(t *testing.T) { diff --git a/internal/domain/error_test.go b/internal/domain/error_test.go index 3214940..f104f2e 100644 --- a/internal/domain/error_test.go +++ b/internal/domain/error_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func ExampleNewError() { diff --git a/internal/domain/grant_type_test.go b/internal/domain/grant_type_test.go index c0edd8e..8af2567 100644 --- a/internal/domain/grant_type_test.go +++ b/internal/domain/grant_type_test.go @@ -4,7 +4,7 @@ package domain_test import ( "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseGrantType(t *testing.T) { diff --git a/internal/domain/me_test.go b/internal/domain/me_test.go index bc58297..72c3e8b 100644 --- a/internal/domain/me_test.go +++ b/internal/domain/me_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseMe(t *testing.T) { diff --git a/internal/domain/response_type_test.go b/internal/domain/response_type_test.go index 38f5ea2..e0d3969 100644 --- a/internal/domain/response_type_test.go +++ b/internal/domain/response_type_test.go @@ -4,7 +4,7 @@ package domain_test import ( "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestResponseTypeType(t *testing.T) { diff --git a/internal/domain/scope_test.go b/internal/domain/scope_test.go index 30c5200..00f66c4 100644 --- a/internal/domain/scope_test.go +++ b/internal/domain/scope_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseScope(t *testing.T) { diff --git a/internal/domain/session.go b/internal/domain/session.go index 292f01b..c4036e3 100644 --- a/internal/domain/session.go +++ b/internal/domain/session.go @@ -3,7 +3,7 @@ package domain import ( "testing" - "source.toby3d.me/website/indieauth/internal/random" + "source.toby3d.me/toby3d/auth/internal/random" ) //nolint: tagliatelle diff --git a/internal/domain/token.go b/internal/domain/token.go index c18935b..9e3c011 100644 --- a/internal/domain/token.go +++ b/internal/domain/token.go @@ -9,7 +9,7 @@ import ( "github.com/lestrrat-go/jwx/jwt" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/random" + "source.toby3d.me/toby3d/auth/internal/random" ) type ( diff --git a/internal/domain/token_test.go b/internal/domain/token_test.go index a5b618b..1efc2b7 100644 --- a/internal/domain/token_test.go +++ b/internal/domain/token_test.go @@ -8,7 +8,7 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestNewToken(t *testing.T) { diff --git a/internal/domain/url_test.go b/internal/domain/url_test.go index 323d748..4efd24d 100644 --- a/internal/domain/url_test.go +++ b/internal/domain/url_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) func TestParseURL(t *testing.T) { diff --git a/internal/health/delivery/http/health_http.go b/internal/health/delivery/http/health_http.go index cf81a82..a0f4486 100644 --- a/internal/health/delivery/http/health_http.go +++ b/internal/health/delivery/http/health_http.go @@ -5,7 +5,7 @@ import ( http "github.com/valyala/fasthttp" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" + "source.toby3d.me/toby3d/auth/internal/common" ) type RequestHandler struct{} diff --git a/internal/health/delivery/http/health_http_test.go b/internal/health/delivery/http/health_http_test.go index 6c38905..81d8f93 100644 --- a/internal/health/delivery/http/health_http_test.go +++ b/internal/health/delivery/http/health_http_test.go @@ -6,8 +6,8 @@ import ( "github.com/fasthttp/router" http "github.com/valyala/fasthttp" - delivery "source.toby3d.me/website/indieauth/internal/health/delivery/http" - "source.toby3d.me/website/indieauth/internal/testing/httptest" + delivery "source.toby3d.me/toby3d/auth/internal/health/delivery/http" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" ) func TestRequestHandler(t *testing.T) { diff --git a/internal/metadata/delivery/http/metadata_http.go b/internal/metadata/delivery/http/metadata_http.go index 4a0fe3b..d49f74f 100644 --- a/internal/metadata/delivery/http/metadata_http.go +++ b/internal/metadata/delivery/http/metadata_http.go @@ -6,8 +6,8 @@ import ( http "github.com/valyala/fasthttp" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" ) type ( diff --git a/internal/metadata/delivery/http/metadata_http_test.go b/internal/metadata/delivery/http/metadata_http_test.go index 97777b0..c8e545f 100644 --- a/internal/metadata/delivery/http/metadata_http_test.go +++ b/internal/metadata/delivery/http/metadata_http_test.go @@ -7,9 +7,9 @@ import ( "github.com/goccy/go-json" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" - delivery "source.toby3d.me/website/indieauth/internal/metadata/delivery/http" - "source.toby3d.me/website/indieauth/internal/testing/httptest" + "source.toby3d.me/toby3d/auth/internal/domain" + delivery "source.toby3d.me/toby3d/auth/internal/metadata/delivery/http" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" ) func TestMetadata(t *testing.T) { diff --git a/internal/metadata/repository.go b/internal/metadata/repository.go index f558da5..0672df4 100644 --- a/internal/metadata/repository.go +++ b/internal/metadata/repository.go @@ -3,7 +3,7 @@ package metadata import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/metadata/repository/http/http_metadata.go b/internal/metadata/repository/http/http_metadata.go index 0f29e0e..082f64d 100644 --- a/internal/metadata/repository/http/http_metadata.go +++ b/internal/metadata/repository/http/http_metadata.go @@ -7,9 +7,9 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/metadata" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/metadata" + "source.toby3d.me/toby3d/auth/internal/util" ) type ( diff --git a/internal/metadata/repository/memory/memory_metadata.go b/internal/metadata/repository/memory/memory_metadata.go index 84ad8ce..cecb30a 100644 --- a/internal/metadata/repository/memory/memory_metadata.go +++ b/internal/metadata/repository/memory/memory_metadata.go @@ -5,8 +5,8 @@ import ( "path" "sync" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/metadata" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/metadata" ) type memoryMetadataRepository struct { diff --git a/internal/profile/repository.go b/internal/profile/repository.go index eb8da65..2070c68 100644 --- a/internal/profile/repository.go +++ b/internal/profile/repository.go @@ -3,7 +3,7 @@ package profile import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/profile/repository/http/http_profile.go b/internal/profile/repository/http/http_profile.go index e38af49..57a35ba 100644 --- a/internal/profile/repository/http/http_profile.go +++ b/internal/profile/repository/http/http_profile.go @@ -6,9 +6,9 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + "source.toby3d.me/toby3d/auth/internal/util" ) type httpProfileRepository struct { diff --git a/internal/profile/repository/memory/memory_profile.go b/internal/profile/repository/memory/memory_profile.go index 1968b21..0b77ba0 100644 --- a/internal/profile/repository/memory/memory_profile.go +++ b/internal/profile/repository/memory/memory_profile.go @@ -6,8 +6,8 @@ import ( "path" "sync" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" ) type memoryProfileRepository struct { diff --git a/internal/profile/usecase.go b/internal/profile/usecase.go index 84294d3..539fd40 100644 --- a/internal/profile/usecase.go +++ b/internal/profile/usecase.go @@ -3,7 +3,7 @@ package profile import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type UseCase interface { diff --git a/internal/profile/usecase/profile_ucase.go b/internal/profile/usecase/profile_ucase.go index 963492f..0b71ca4 100644 --- a/internal/profile/usecase/profile_ucase.go +++ b/internal/profile/usecase/profile_ucase.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" ) type profileUseCase struct { diff --git a/internal/session/repository.go b/internal/session/repository.go index adb885e..3b5a10f 100644 --- a/internal/session/repository.go +++ b/internal/session/repository.go @@ -3,7 +3,7 @@ package session import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/session/repository/memory/memory_session.go b/internal/session/repository/memory/memory_session.go index 2e0e650..dde76c3 100644 --- a/internal/session/repository/memory/memory_session.go +++ b/internal/session/repository/memory/memory_session.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/session" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/session" ) type ( diff --git a/internal/session/repository/sqlite3/sqlite3_session.go b/internal/session/repository/sqlite3/sqlite3_session.go index dbfd4f7..e342197 100644 --- a/internal/session/repository/sqlite3/sqlite3_session.go +++ b/internal/session/repository/sqlite3/sqlite3_session.go @@ -11,8 +11,8 @@ import ( "github.com/jmoiron/sqlx" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/session" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/session" ) type ( diff --git a/internal/session/repository/sqlite3/sqlite3_session_test.go b/internal/session/repository/sqlite3/sqlite3_session_test.go index b941699..72b2d64 100644 --- a/internal/session/repository/sqlite3/sqlite3_session_test.go +++ b/internal/session/repository/sqlite3/sqlite3_session_test.go @@ -7,9 +7,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "source.toby3d.me/website/indieauth/internal/domain" - repository "source.toby3d.me/website/indieauth/internal/session/repository/sqlite3" - "source.toby3d.me/website/indieauth/internal/testing/sqltest" + "source.toby3d.me/toby3d/auth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/session/repository/sqlite3" + "source.toby3d.me/toby3d/auth/internal/testing/sqltest" ) //nolint: gochecknoglobals // slices cannot be contants diff --git a/internal/session/usecase.go b/internal/session/usecase.go index bb92733..0e3c2ee 100644 --- a/internal/session/usecase.go +++ b/internal/session/usecase.go @@ -3,7 +3,7 @@ package session import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type UseCase interface { diff --git a/internal/session/usecase/session_ucase.go b/internal/session/usecase/session_ucase.go index acde5a2..e642cec 100644 --- a/internal/session/usecase/session_ucase.go +++ b/internal/session/usecase/session_ucase.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/session" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/session" ) type sessionUseCase struct { diff --git a/internal/ticket/delivery/http/ticket_http.go b/internal/ticket/delivery/http/ticket_http.go index 841e752..38956be 100644 --- a/internal/ticket/delivery/http/ticket_http.go +++ b/internal/ticket/delivery/http/ticket_http.go @@ -14,11 +14,11 @@ import ( "source.toby3d.me/toby3d/form" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/random" - "source.toby3d.me/website/indieauth/internal/ticket" - "source.toby3d.me/website/indieauth/web" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/random" + "source.toby3d.me/toby3d/auth/internal/ticket" + "source.toby3d.me/toby3d/auth/web" ) type ( diff --git a/internal/ticket/delivery/http/ticket_http_test.go b/internal/ticket/delivery/http/ticket_http_test.go index 6634641..bd07de5 100644 --- a/internal/ticket/delivery/http/ticket_http_test.go +++ b/internal/ticket/delivery/http/ticket_http_test.go @@ -9,13 +9,13 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - "source.toby3d.me/website/indieauth/internal/ticket" - delivery "source.toby3d.me/website/indieauth/internal/ticket/delivery/http" - ticketrepo "source.toby3d.me/website/indieauth/internal/ticket/repository/memory" - ucase "source.toby3d.me/website/indieauth/internal/ticket/usecase" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + "source.toby3d.me/toby3d/auth/internal/ticket" + delivery "source.toby3d.me/toby3d/auth/internal/ticket/delivery/http" + ticketrepo "source.toby3d.me/toby3d/auth/internal/ticket/repository/memory" + ucase "source.toby3d.me/toby3d/auth/internal/ticket/usecase" ) type Dependencies struct { diff --git a/internal/ticket/repository.go b/internal/ticket/repository.go index 83133ba..06e7eab 100644 --- a/internal/ticket/repository.go +++ b/internal/ticket/repository.go @@ -3,7 +3,7 @@ package ticket import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/ticket/repository/memory/memory_ticket.go b/internal/ticket/repository/memory/memory_ticket.go index aaf4af4..a7ad4c5 100644 --- a/internal/ticket/repository/memory/memory_ticket.go +++ b/internal/ticket/repository/memory/memory_ticket.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/ticket" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/ticket" ) type ( diff --git a/internal/ticket/repository/memory/memory_ticket_test.go b/internal/ticket/repository/memory/memory_ticket_test.go index 922712e..a2e384b 100644 --- a/internal/ticket/repository/memory/memory_ticket_test.go +++ b/internal/ticket/repository/memory/memory_ticket_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "source.toby3d.me/website/indieauth/internal/domain" - repository "source.toby3d.me/website/indieauth/internal/ticket/repository/memory" + "source.toby3d.me/toby3d/auth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/ticket/repository/memory" ) func TestCreate(t *testing.T) { diff --git a/internal/ticket/repository/sqlite3/sqlite3_ticket.go b/internal/ticket/repository/sqlite3/sqlite3_ticket.go index f574900..eefc823 100644 --- a/internal/ticket/repository/sqlite3/sqlite3_ticket.go +++ b/internal/ticket/repository/sqlite3/sqlite3_ticket.go @@ -9,8 +9,8 @@ import ( "github.com/jmoiron/sqlx" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/ticket" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/ticket" ) type ( diff --git a/internal/ticket/repository/sqlite3/sqlite3_ticket_test.go b/internal/ticket/repository/sqlite3/sqlite3_ticket_test.go index 7b067e4..2341e2e 100644 --- a/internal/ticket/repository/sqlite3/sqlite3_ticket_test.go +++ b/internal/ticket/repository/sqlite3/sqlite3_ticket_test.go @@ -7,9 +7,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/sqltest" - repository "source.toby3d.me/website/indieauth/internal/ticket/repository/sqlite3" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/sqltest" + repository "source.toby3d.me/toby3d/auth/internal/ticket/repository/sqlite3" ) //nolint: gochecknoglobals // slices cannot be contants diff --git a/internal/ticket/usecase.go b/internal/ticket/usecase.go index 5629469..c49f807 100644 --- a/internal/ticket/usecase.go +++ b/internal/ticket/usecase.go @@ -3,7 +3,7 @@ package ticket import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type UseCase interface { diff --git a/internal/ticket/usecase/ticket_ucase.go b/internal/ticket/usecase/ticket_ucase.go index fa7aec0..cf81ebd 100644 --- a/internal/ticket/usecase/ticket_ucase.go +++ b/internal/ticket/usecase/ticket_ucase.go @@ -8,10 +8,10 @@ import ( json "github.com/goccy/go-json" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/ticket" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/ticket" + "source.toby3d.me/toby3d/auth/internal/util" ) type ( diff --git a/internal/ticket/usecase/ticket_ucase_test.go b/internal/ticket/usecase/ticket_ucase_test.go index de7aa04..7bf1d0d 100644 --- a/internal/ticket/usecase/ticket_ucase_test.go +++ b/internal/ticket/usecase/ticket_ucase_test.go @@ -8,10 +8,10 @@ import ( "github.com/fasthttp/router" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - ucase "source.toby3d.me/website/indieauth/internal/ticket/usecase" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + ucase "source.toby3d.me/toby3d/auth/internal/ticket/usecase" ) func TestRedeem(t *testing.T) { diff --git a/internal/token/delivery/http/token_http.go b/internal/token/delivery/http/token_http.go index 02c795d..686f69c 100644 --- a/internal/token/delivery/http/token_http.go +++ b/internal/token/delivery/http/token_http.go @@ -11,10 +11,10 @@ import ( "source.toby3d.me/toby3d/form" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/ticket" - "source.toby3d.me/website/indieauth/internal/token" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/ticket" + "source.toby3d.me/toby3d/auth/internal/token" ) type ( diff --git a/internal/token/delivery/http/token_http_test.go b/internal/token/delivery/http/token_http_test.go index 5d9c51f..2874f54 100644 --- a/internal/token/delivery/http/token_http_test.go +++ b/internal/token/delivery/http/token_http_test.go @@ -10,20 +10,20 @@ import ( json "github.com/goccy/go-json" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - profilerepo "source.toby3d.me/website/indieauth/internal/profile/repository/memory" - "source.toby3d.me/website/indieauth/internal/session" - sessionrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - "source.toby3d.me/website/indieauth/internal/ticket" - ticketrepo "source.toby3d.me/website/indieauth/internal/ticket/repository/memory" - ticketucase "source.toby3d.me/website/indieauth/internal/ticket/usecase" - "source.toby3d.me/website/indieauth/internal/token" - delivery "source.toby3d.me/website/indieauth/internal/token/delivery/http" - tokenrepo "source.toby3d.me/website/indieauth/internal/token/repository/memory" - tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + profilerepo "source.toby3d.me/toby3d/auth/internal/profile/repository/memory" + "source.toby3d.me/toby3d/auth/internal/session" + sessionrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + "source.toby3d.me/toby3d/auth/internal/ticket" + ticketrepo "source.toby3d.me/toby3d/auth/internal/ticket/repository/memory" + ticketucase "source.toby3d.me/toby3d/auth/internal/ticket/usecase" + "source.toby3d.me/toby3d/auth/internal/token" + delivery "source.toby3d.me/toby3d/auth/internal/token/delivery/http" + tokenrepo "source.toby3d.me/toby3d/auth/internal/token/repository/memory" + tokenucase "source.toby3d.me/toby3d/auth/internal/token/usecase" ) type Dependencies struct { diff --git a/internal/token/repository.go b/internal/token/repository.go index 2051d1f..65b6896 100644 --- a/internal/token/repository.go +++ b/internal/token/repository.go @@ -3,7 +3,7 @@ package token import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/token/repository/memory/memory_token.go b/internal/token/repository/memory/memory_token.go index 908cdea..c858074 100644 --- a/internal/token/repository/memory/memory_token.go +++ b/internal/token/repository/memory/memory_token.go @@ -6,8 +6,8 @@ import ( "path" "sync" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/token" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/token" ) type memoryTokenRepository struct { diff --git a/internal/token/repository/memory/memory_token_test.go b/internal/token/repository/memory/memory_token_test.go index 069e8c3..f455706 100644 --- a/internal/token/repository/memory/memory_token_test.go +++ b/internal/token/repository/memory/memory_token_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/token" - repository "source.toby3d.me/website/indieauth/internal/token/repository/memory" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/token" + repository "source.toby3d.me/toby3d/auth/internal/token/repository/memory" ) func TestCreate(t *testing.T) { diff --git a/internal/token/repository/sqlite3/sqlite3_token.go b/internal/token/repository/sqlite3/sqlite3_token.go index 09a9ed2..28d7c5b 100644 --- a/internal/token/repository/sqlite3/sqlite3_token.go +++ b/internal/token/repository/sqlite3/sqlite3_token.go @@ -10,8 +10,8 @@ import ( "github.com/jmoiron/sqlx" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/token" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/token" ) type ( diff --git a/internal/token/repository/sqlite3/sqlite3_token_test.go b/internal/token/repository/sqlite3/sqlite3_token_test.go index 0d7a8b9..da208f7 100644 --- a/internal/token/repository/sqlite3/sqlite3_token_test.go +++ b/internal/token/repository/sqlite3/sqlite3_token_test.go @@ -7,9 +7,9 @@ import ( "github.com/DATA-DOG/go-sqlmock" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/sqltest" - repository "source.toby3d.me/website/indieauth/internal/token/repository/sqlite3" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/sqltest" + repository "source.toby3d.me/toby3d/auth/internal/token/repository/sqlite3" ) //nolint: gochecknoglobals // slices cannot be contants diff --git a/internal/token/usecase.go b/internal/token/usecase.go index fd2ae24..92bddbf 100644 --- a/internal/token/usecase.go +++ b/internal/token/usecase.go @@ -3,7 +3,7 @@ package token import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type ( diff --git a/internal/token/usecase/token_ucase.go b/internal/token/usecase/token_ucase.go index 8a02baf..3b6dd6f 100644 --- a/internal/token/usecase/token_ucase.go +++ b/internal/token/usecase/token_ucase.go @@ -8,10 +8,10 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwt" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - "source.toby3d.me/website/indieauth/internal/session" - "source.toby3d.me/website/indieauth/internal/token" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + "source.toby3d.me/toby3d/auth/internal/session" + "source.toby3d.me/toby3d/auth/internal/token" ) type ( @@ -91,13 +91,12 @@ func (uc *tokenUseCase) Exchange(ctx context.Context, opts token.ExchangeOptions } func (uc *tokenUseCase) Verify(ctx context.Context, accessToken string) (*domain.Token, *domain.Profile, error) { - find, err := uc.tokens.Get(ctx, accessToken) - if err != nil && !errors.Is(err, token.ErrNotExist) { - return nil, nil, fmt.Errorf("cannot check token in store: %w", err) - } + if _, err := uc.tokens.Get(ctx, accessToken); err != nil { + if errors.Is(err, token.ErrNotExist) { + return nil, nil, token.ErrRevoke + } - if find != nil { - return nil, nil, token.ErrRevoke + return nil, nil, fmt.Errorf("cannot check token in store: %w", err) } tkn, err := jwt.ParseString(accessToken, jwt.WithVerify(jwa.SignatureAlgorithm(uc.config.JWT.Algorithm), diff --git a/internal/token/usecase/token_ucase_test.go b/internal/token/usecase/token_ucase_test.go index 7c802f6..368db2d 100644 --- a/internal/token/usecase/token_ucase_test.go +++ b/internal/token/usecase/token_ucase_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/assert" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - profilerepo "source.toby3d.me/website/indieauth/internal/profile/repository/memory" - "source.toby3d.me/website/indieauth/internal/session" - sessionrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - "source.toby3d.me/website/indieauth/internal/token" - tokenrepo "source.toby3d.me/website/indieauth/internal/token/repository/memory" - usecase "source.toby3d.me/website/indieauth/internal/token/usecase" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + profilerepo "source.toby3d.me/toby3d/auth/internal/profile/repository/memory" + "source.toby3d.me/toby3d/auth/internal/session" + sessionrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + "source.toby3d.me/toby3d/auth/internal/token" + tokenrepo "source.toby3d.me/toby3d/auth/internal/token/repository/memory" + usecase "source.toby3d.me/toby3d/auth/internal/token/usecase" ) type Dependencies struct { diff --git a/internal/user/delivery/http/user_http.go b/internal/user/delivery/http/user_http.go index 5c04958..b08c7a9 100644 --- a/internal/user/delivery/http/user_http.go +++ b/internal/user/delivery/http/user_http.go @@ -9,9 +9,9 @@ import ( http "github.com/valyala/fasthttp" "source.toby3d.me/toby3d/middleware" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/token" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/token" ) type ( diff --git a/internal/user/delivery/http/user_http_test.go b/internal/user/delivery/http/user_http_test.go index f2d488c..088547e 100644 --- a/internal/user/delivery/http/user_http_test.go +++ b/internal/user/delivery/http/user_http_test.go @@ -9,16 +9,16 @@ import ( "github.com/goccy/go-json" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/profile" - profilerepo "source.toby3d.me/website/indieauth/internal/profile/repository/memory" - "source.toby3d.me/website/indieauth/internal/session" - sessionrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - "source.toby3d.me/website/indieauth/internal/token" - tokenrepo "source.toby3d.me/website/indieauth/internal/token/repository/memory" - tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" - delivery "source.toby3d.me/website/indieauth/internal/user/delivery/http" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/profile" + profilerepo "source.toby3d.me/toby3d/auth/internal/profile/repository/memory" + "source.toby3d.me/toby3d/auth/internal/session" + sessionrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + "source.toby3d.me/toby3d/auth/internal/token" + tokenrepo "source.toby3d.me/toby3d/auth/internal/token/repository/memory" + tokenucase "source.toby3d.me/toby3d/auth/internal/token/usecase" + delivery "source.toby3d.me/toby3d/auth/internal/user/delivery/http" ) type Dependencies struct { diff --git a/internal/user/repository.go b/internal/user/repository.go index e60d610..ec7edc1 100644 --- a/internal/user/repository.go +++ b/internal/user/repository.go @@ -3,7 +3,7 @@ package user import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type Repository interface { diff --git a/internal/user/repository/http/http_user.go b/internal/user/repository/http/http_user.go index c2a93b1..a9d19a6 100644 --- a/internal/user/repository/http/http_user.go +++ b/internal/user/repository/http/http_user.go @@ -6,9 +6,9 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/user" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/user" + "source.toby3d.me/toby3d/auth/internal/util" ) type httpUserRepository struct { diff --git a/internal/user/repository/http/http_user_test.go b/internal/user/repository/http/http_user_test.go index 63b9bc0..91922ce 100644 --- a/internal/user/repository/http/http_user_test.go +++ b/internal/user/repository/http/http_user_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/common" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/testing/httptest" - repository "source.toby3d.me/website/indieauth/internal/user/repository/http" + "source.toby3d.me/toby3d/auth/internal/common" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/testing/httptest" + repository "source.toby3d.me/toby3d/auth/internal/user/repository/http" ) const testBody string = ` diff --git a/internal/user/repository/memory/memory_user.go b/internal/user/repository/memory/memory_user.go index 28d9171..18d5385 100644 --- a/internal/user/repository/memory/memory_user.go +++ b/internal/user/repository/memory/memory_user.go @@ -5,8 +5,8 @@ import ( "path" "sync" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/user" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/user" ) type memoryUserRepository struct { diff --git a/internal/user/repository/memory/memory_user_test.go b/internal/user/repository/memory/memory_user_test.go index 730501a..1183b68 100644 --- a/internal/user/repository/memory/memory_user_test.go +++ b/internal/user/repository/memory/memory_user_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "source.toby3d.me/website/indieauth/internal/domain" - repository "source.toby3d.me/website/indieauth/internal/user/repository/memory" + "source.toby3d.me/toby3d/auth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/user/repository/memory" ) func TestGet(t *testing.T) { diff --git a/internal/user/usecase.go b/internal/user/usecase.go index 72aeb16..13829d1 100644 --- a/internal/user/usecase.go +++ b/internal/user/usecase.go @@ -3,7 +3,7 @@ package user import ( "context" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) type UseCase interface { diff --git a/internal/user/usecase/user_ucase.go b/internal/user/usecase/user_ucase.go index f0dcaf2..6fffb84 100644 --- a/internal/user/usecase/user_ucase.go +++ b/internal/user/usecase/user_ucase.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "source.toby3d.me/website/indieauth/internal/domain" - "source.toby3d.me/website/indieauth/internal/user" + "source.toby3d.me/toby3d/auth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/user" ) type userUseCase struct { diff --git a/internal/user/usecase/user_ucase_test.go b/internal/user/usecase/user_ucase_test.go index 48e1b9a..f35f184 100644 --- a/internal/user/usecase/user_ucase_test.go +++ b/internal/user/usecase/user_ucase_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "source.toby3d.me/website/indieauth/internal/domain" - repository "source.toby3d.me/website/indieauth/internal/user/repository/memory" - ucase "source.toby3d.me/website/indieauth/internal/user/usecase" + "source.toby3d.me/toby3d/auth/internal/domain" + repository "source.toby3d.me/toby3d/auth/internal/user/repository/memory" + ucase "source.toby3d.me/toby3d/auth/internal/user/usecase" ) func TestFetch(t *testing.T) { diff --git a/internal/util/http.go b/internal/util/http.go index eba5f75..a67be67 100644 --- a/internal/util/http.go +++ b/internal/util/http.go @@ -11,7 +11,7 @@ import ( http "github.com/valyala/fasthttp" "willnorris.com/go/microformats" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) var ErrEndpointNotExist = domain.NewError( diff --git a/internal/util/http_test.go b/internal/util/http_test.go index d46763f..ff7bcc0 100644 --- a/internal/util/http_test.go +++ b/internal/util/http_test.go @@ -5,7 +5,7 @@ import ( http "github.com/valyala/fasthttp" - "source.toby3d.me/website/indieauth/internal/util" + "source.toby3d.me/toby3d/auth/internal/util" ) const testBody = ` diff --git a/main.go b/main.go index 0943d4b..3178e8b 100644 --- a/main.go +++ b/main.go @@ -30,33 +30,33 @@ import ( "golang.org/x/text/message" _ "modernc.org/sqlite" - "source.toby3d.me/website/indieauth/internal/auth" - authhttpdelivery "source.toby3d.me/website/indieauth/internal/auth/delivery/http" - authucase "source.toby3d.me/website/indieauth/internal/auth/usecase" - "source.toby3d.me/website/indieauth/internal/client" - clienthttpdelivery "source.toby3d.me/website/indieauth/internal/client/delivery/http" - clienthttprepo "source.toby3d.me/website/indieauth/internal/client/repository/http" - clientucase "source.toby3d.me/website/indieauth/internal/client/usecase" - "source.toby3d.me/website/indieauth/internal/domain" - healthhttpdelivery "source.toby3d.me/website/indieauth/internal/health/delivery/http" - metadatahttpdelivery "source.toby3d.me/website/indieauth/internal/metadata/delivery/http" - "source.toby3d.me/website/indieauth/internal/profile" - profilehttprepo "source.toby3d.me/website/indieauth/internal/profile/repository/http" - "source.toby3d.me/website/indieauth/internal/session" - sessionmemoryrepo "source.toby3d.me/website/indieauth/internal/session/repository/memory" - sessionsqlite3repo "source.toby3d.me/website/indieauth/internal/session/repository/sqlite3" - sessionucase "source.toby3d.me/website/indieauth/internal/session/usecase" - "source.toby3d.me/website/indieauth/internal/ticket" - tickethttpdelivery "source.toby3d.me/website/indieauth/internal/ticket/delivery/http" - ticketmemoryrepo "source.toby3d.me/website/indieauth/internal/ticket/repository/memory" - ticketsqlite3repo "source.toby3d.me/website/indieauth/internal/ticket/repository/sqlite3" - ticketucase "source.toby3d.me/website/indieauth/internal/ticket/usecase" - "source.toby3d.me/website/indieauth/internal/token" - tokenhttpdelivery "source.toby3d.me/website/indieauth/internal/token/delivery/http" - tokenmemoryrepo "source.toby3d.me/website/indieauth/internal/token/repository/memory" - tokensqlite3repo "source.toby3d.me/website/indieauth/internal/token/repository/sqlite3" - tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" - userhttpdelivery "source.toby3d.me/website/indieauth/internal/user/delivery/http" + "source.toby3d.me/toby3d/auth/internal/auth" + authhttpdelivery "source.toby3d.me/toby3d/auth/internal/auth/delivery/http" + authucase "source.toby3d.me/toby3d/auth/internal/auth/usecase" + "source.toby3d.me/toby3d/auth/internal/client" + clienthttpdelivery "source.toby3d.me/toby3d/auth/internal/client/delivery/http" + clienthttprepo "source.toby3d.me/toby3d/auth/internal/client/repository/http" + clientucase "source.toby3d.me/toby3d/auth/internal/client/usecase" + "source.toby3d.me/toby3d/auth/internal/domain" + healthhttpdelivery "source.toby3d.me/toby3d/auth/internal/health/delivery/http" + metadatahttpdelivery "source.toby3d.me/toby3d/auth/internal/metadata/delivery/http" + "source.toby3d.me/toby3d/auth/internal/profile" + profilehttprepo "source.toby3d.me/toby3d/auth/internal/profile/repository/http" + "source.toby3d.me/toby3d/auth/internal/session" + sessionmemoryrepo "source.toby3d.me/toby3d/auth/internal/session/repository/memory" + sessionsqlite3repo "source.toby3d.me/toby3d/auth/internal/session/repository/sqlite3" + sessionucase "source.toby3d.me/toby3d/auth/internal/session/usecase" + "source.toby3d.me/toby3d/auth/internal/ticket" + tickethttpdelivery "source.toby3d.me/toby3d/auth/internal/ticket/delivery/http" + ticketmemoryrepo "source.toby3d.me/toby3d/auth/internal/ticket/repository/memory" + ticketsqlite3repo "source.toby3d.me/toby3d/auth/internal/ticket/repository/sqlite3" + ticketucase "source.toby3d.me/toby3d/auth/internal/ticket/usecase" + "source.toby3d.me/toby3d/auth/internal/token" + tokenhttpdelivery "source.toby3d.me/toby3d/auth/internal/token/delivery/http" + tokenmemoryrepo "source.toby3d.me/toby3d/auth/internal/token/repository/memory" + tokensqlite3repo "source.toby3d.me/toby3d/auth/internal/token/repository/sqlite3" + tokenucase "source.toby3d.me/toby3d/auth/internal/token/usecase" + userhttpdelivery "source.toby3d.me/toby3d/auth/internal/user/delivery/http" ) type ( diff --git a/web/authorize.qtpl b/web/authorize.qtpl index 2a3a5b8..6bc5f72 100644 --- a/web/authorize.qtpl +++ b/web/authorize.qtpl @@ -1,4 +1,4 @@ -{% import "source.toby3d.me/website/indieauth/internal/domain" %} +{% import "source.toby3d.me/toby3d/auth/internal/domain" %} {% code type AuthorizePage struct { BaseOf diff --git a/web/authorize.qtpl.go b/web/authorize.qtpl.go index b448eae..97527ef 100644 --- a/web/authorize.qtpl.go +++ b/web/authorize.qtpl.go @@ -5,7 +5,7 @@ package web //line web/authorize.qtpl:1 -import "source.toby3d.me/website/indieauth/internal/domain" +import "source.toby3d.me/toby3d/auth/internal/domain" //line web/authorize.qtpl:3 import ( diff --git a/web/baseof.qtpl b/web/baseof.qtpl index 4c981f8..0e026c9 100644 --- a/web/baseof.qtpl +++ b/web/baseof.qtpl @@ -2,7 +2,7 @@ "golang.org/x/text/language" "golang.org/x/text/message" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) %} {% interface Page { diff --git a/web/baseof.qtpl.go b/web/baseof.qtpl.go index 87969a1..737bac5 100644 --- a/web/baseof.qtpl.go +++ b/web/baseof.qtpl.go @@ -9,7 +9,7 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) //line web/baseof.qtpl:8 diff --git a/web/callback.qtpl b/web/callback.qtpl index d03f25c..9e5fad5 100644 --- a/web/callback.qtpl +++ b/web/callback.qtpl @@ -1,4 +1,4 @@ -{% import "source.toby3d.me/website/indieauth/internal/domain" %} +{% import "source.toby3d.me/toby3d/auth/internal/domain" %} {% code type CallbackPage struct { BaseOf diff --git a/web/callback.qtpl.go b/web/callback.qtpl.go index 7bfc26b..9480636 100644 --- a/web/callback.qtpl.go +++ b/web/callback.qtpl.go @@ -5,7 +5,7 @@ package web //line web/callback.qtpl:1 -import "source.toby3d.me/website/indieauth/internal/domain" +import "source.toby3d.me/toby3d/auth/internal/domain" //line web/callback.qtpl:3 import ( diff --git a/web/error.qtpl b/web/error.qtpl index 43a5cdd..da9de03 100644 --- a/web/error.qtpl +++ b/web/error.qtpl @@ -1,7 +1,7 @@ {% import ( "errors" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) %} {% code type ErrorPage struct { diff --git a/web/error.qtpl.go b/web/error.qtpl.go index 74013d9..ba08b29 100644 --- a/web/error.qtpl.go +++ b/web/error.qtpl.go @@ -8,7 +8,7 @@ package web import ( "errors" - "source.toby3d.me/website/indieauth/internal/domain" + "source.toby3d.me/toby3d/auth/internal/domain" ) //line web/error.qtpl:7 diff --git a/web/home.qtpl b/web/home.qtpl index 04adc14..30b202b 100644 --- a/web/home.qtpl +++ b/web/home.qtpl @@ -1,4 +1,4 @@ -{% import "source.toby3d.me/website/indieauth/internal/domain" %} +{% import "source.toby3d.me/toby3d/auth/internal/domain" %} {% code type HomePage struct { BaseOf diff --git a/web/home.qtpl.go b/web/home.qtpl.go index 28916d4..0dbabce 100644 --- a/web/home.qtpl.go +++ b/web/home.qtpl.go @@ -5,7 +5,7 @@ package web //line web/home.qtpl:1 -import "source.toby3d.me/website/indieauth/internal/domain" +import "source.toby3d.me/toby3d/auth/internal/domain" //line web/home.qtpl:3 import (