diff options
Diffstat (limited to 'internal/api/auth')
| -rw-r--r-- | internal/api/auth/auth.go | 6 | ||||
| -rw-r--r-- | internal/api/auth/auth_test.go | 28 | ||||
| -rw-r--r-- | internal/api/auth/authorize.go | 10 | ||||
| -rw-r--r-- | internal/api/auth/authorize_test.go | 6 | ||||
| -rw-r--r-- | internal/api/auth/callback.go | 16 | ||||
| -rw-r--r-- | internal/api/auth/callback_test.go | 2 | ||||
| -rw-r--r-- | internal/api/auth/oob.go | 2 | ||||
| -rw-r--r-- | internal/api/auth/revoke.go | 4 | ||||
| -rw-r--r-- | internal/api/auth/revoke_test.go | 4 | ||||
| -rw-r--r-- | internal/api/auth/signin.go | 10 | ||||
| -rw-r--r-- | internal/api/auth/token.go | 6 | ||||
| -rw-r--r-- | internal/api/auth/token_test.go | 8 | ||||
| -rw-r--r-- | internal/api/auth/util.go | 8 |
13 files changed, 55 insertions, 55 deletions
diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 37c4e864a..a39da9fd5 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -20,10 +20,10 @@ package auth import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" ) const ( diff --git a/internal/api/auth/auth_test.go b/internal/api/auth/auth_test.go index af90de2d6..8082f4aed 100644 --- a/internal/api/auth/auth_test.go +++ b/internal/api/auth/auth_test.go @@ -22,24 +22,24 @@ import ( "fmt" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/auth" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/memstore" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/auth" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AuthStandardTestSuite struct { diff --git a/internal/api/auth/authorize.go b/internal/api/auth/authorize.go index 5b3e6ea3c..c6c648b01 100644 --- a/internal/api/auth/authorize.go +++ b/internal/api/auth/authorize.go @@ -22,14 +22,14 @@ import ( "net/url" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) // AuthorizeGETHandler should be served as diff --git a/internal/api/auth/authorize_test.go b/internal/api/auth/authorize_test.go index 54df4c5e5..b73f5e0e1 100644 --- a/internal/api/auth/authorize_test.go +++ b/internal/api/auth/authorize_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/auth" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-contrib/sessions" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/auth" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type AuthAuthorizeTestSuite struct { diff --git a/internal/api/auth/callback.go b/internal/api/auth/callback.go index 5003910e9..608ee1bd4 100644 --- a/internal/api/auth/callback.go +++ b/internal/api/auth/callback.go @@ -26,17 +26,17 @@ import ( "slices" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // extraInfo wraps a form-submitted username and transmitted name diff --git a/internal/api/auth/callback_test.go b/internal/api/auth/callback_test.go index 2624f3f3f..3151ecaa2 100644 --- a/internal/api/auth/callback_test.go +++ b/internal/api/auth/callback_test.go @@ -3,7 +3,7 @@ package auth import ( "testing" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/testrig" ) func TestAdminGroup(t *testing.T) { diff --git a/internal/api/auth/oob.go b/internal/api/auth/oob.go index c723a1cb5..49027940a 100644 --- a/internal/api/auth/oob.go +++ b/internal/api/auth/oob.go @@ -20,9 +20,9 @@ package auth import ( "errors" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // OOBTokenGETHandler parses the OAuth code from the query diff --git a/internal/api/auth/revoke.go b/internal/api/auth/revoke.go index 932e83dbc..c5167889c 100644 --- a/internal/api/auth/revoke.go +++ b/internal/api/auth/revoke.go @@ -20,10 +20,10 @@ package auth import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" oautherr "code.superseriousbusiness.org/oauth2/v4/errors" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // TokenRevokePOSTHandler swagger:operation POST /oauth/revoke oauthTokenRevoke diff --git a/internal/api/auth/revoke_test.go b/internal/api/auth/revoke_test.go index a654ceda5..e482c8aac 100644 --- a/internal/api/auth/revoke_test.go +++ b/internal/api/auth/revoke_test.go @@ -25,9 +25,9 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RevokeTestSuite struct { diff --git a/internal/api/auth/signin.go b/internal/api/auth/signin.go index 3503f37bb..845ea2594 100644 --- a/internal/api/auth/signin.go +++ b/internal/api/auth/signin.go @@ -25,15 +25,15 @@ import ( "slices" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "codeberg.org/gruf/go-byteutil" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/pquerna/otp/totp" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/api/auth/token.go b/internal/api/auth/token.go index d9f0d8154..95693dea6 100644 --- a/internal/api/auth/token.go +++ b/internal/api/auth/token.go @@ -21,9 +21,9 @@ import ( "net/http" "net/url" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-gonic/gin" ) diff --git a/internal/api/auth/token_test.go b/internal/api/auth/token_test.go index 1a12fe37e..e333a8867 100644 --- a/internal/api/auth/token_test.go +++ b/internal/api/auth/token_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TokenTestSuite struct { diff --git a/internal/api/auth/util.go b/internal/api/auth/util.go index f1aed0bc3..937de3d85 100644 --- a/internal/api/auth/util.go +++ b/internal/api/auth/util.go @@ -20,12 +20,12 @@ package auth import ( "errors" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) func (m *Module) mustClearSession(s sessions.Session) { |
