diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/api/util/auth.go | 2 | ||||
| -rw-r--r-- | internal/middleware/tokencheck.go | 2 | ||||
| -rw-r--r-- | internal/oauth/clientstore.go | 4 | ||||
| -rw-r--r-- | internal/oauth/clientstore_test.go | 2 | ||||
| -rw-r--r-- | internal/oauth/errors.go | 2 | ||||
| -rw-r--r-- | internal/oauth/server.go | 8 | ||||
| -rw-r--r-- | internal/oauth/tokenstore.go | 6 | ||||
| -rw-r--r-- | internal/processing/oauth.go | 2 | ||||
| -rw-r--r-- | internal/processing/user/create.go | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/internal/api/util/auth.go b/internal/api/util/auth.go index 5c6afb306..fccdf38e1 100644 --- a/internal/api/util/auth.go +++ b/internal/api/util/auth.go @@ -22,11 +22,11 @@ import ( "slices" "strings" + "codeberg.org/superseriousbusiness/oauth2/v4" "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/oauth2/v4" ) // Auth wraps an authorized token, application, user, and account. diff --git a/internal/middleware/tokencheck.go b/internal/middleware/tokencheck.go index d2570c3f0..10c77541f 100644 --- a/internal/middleware/tokencheck.go +++ b/internal/middleware/tokencheck.go @@ -20,11 +20,11 @@ package middleware import ( "net/http" + "codeberg.org/superseriousbusiness/oauth2/v4" "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/oauth2/v4" ) // TokenCheck returns a new gin middleware for validating oauth tokens in requests. diff --git a/internal/oauth/clientstore.go b/internal/oauth/clientstore.go index bddb30b1b..af48edac3 100644 --- a/internal/oauth/clientstore.go +++ b/internal/oauth/clientstore.go @@ -20,10 +20,10 @@ package oauth import ( "context" + "codeberg.org/superseriousbusiness/oauth2/v4" + "codeberg.org/superseriousbusiness/oauth2/v4/models" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/oauth2/v4" - "github.com/superseriousbusiness/oauth2/v4/models" ) type clientStore struct { diff --git a/internal/oauth/clientstore_test.go b/internal/oauth/clientstore_test.go index 0ced34de6..59b0ec1d3 100644 --- a/internal/oauth/clientstore_test.go +++ b/internal/oauth/clientstore_test.go @@ -21,13 +21,13 @@ import ( "context" "testing" + "codeberg.org/superseriousbusiness/oauth2/v4/models" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/admin" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/oauth" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/testrig" - "github.com/superseriousbusiness/oauth2/v4/models" ) type PgClientStoreTestSuite struct { diff --git a/internal/oauth/errors.go b/internal/oauth/errors.go index b16143e5c..1ed9e838c 100644 --- a/internal/oauth/errors.go +++ b/internal/oauth/errors.go @@ -17,7 +17,7 @@ package oauth -import "github.com/superseriousbusiness/oauth2/v4/errors" +import "codeberg.org/superseriousbusiness/oauth2/v4/errors" // ErrInvalidRequest is an oauth spec compliant 'invalid_request' error. var ErrInvalidRequest = errors.New("invalid_request") diff --git a/internal/oauth/server.go b/internal/oauth/server.go index 4f2ed509b..8330ee179 100644 --- a/internal/oauth/server.go +++ b/internal/oauth/server.go @@ -24,13 +24,13 @@ import ( "net/http" "strings" + "codeberg.org/superseriousbusiness/oauth2/v4" + oautherr "codeberg.org/superseriousbusiness/oauth2/v4/errors" + "codeberg.org/superseriousbusiness/oauth2/v4/manage" + "codeberg.org/superseriousbusiness/oauth2/v4/server" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/oauth2/v4" - oautherr "github.com/superseriousbusiness/oauth2/v4/errors" - "github.com/superseriousbusiness/oauth2/v4/manage" - "github.com/superseriousbusiness/oauth2/v4/server" ) const ( diff --git a/internal/oauth/tokenstore.go b/internal/oauth/tokenstore.go index 14b91fa06..df2e419fe 100644 --- a/internal/oauth/tokenstore.go +++ b/internal/oauth/tokenstore.go @@ -22,12 +22,12 @@ import ( "errors" "time" + "codeberg.org/superseriousbusiness/oauth2/v4" + "codeberg.org/superseriousbusiness/oauth2/v4/models" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/oauth2/v4" - "github.com/superseriousbusiness/oauth2/v4/models" ) // tokenStore is an implementation of oauth2.TokenStore, which uses our db interface as a storage backend. @@ -90,7 +90,7 @@ func (ts *tokenStore) sweep(ctx context.Context) error { } // Create creates and store the new token information. -// For the original implementation, see https://github.com/superseriousbusiness/oauth2/blob/master/store/token.go#L34 +// For the original implementation, see https://codeberg.org/superseriousbusiness/oauth2/blob/master/store/token.go#L34 func (ts *tokenStore) Create(ctx context.Context, info oauth2.TokenInfo) error { t, ok := info.(*models.Token) if !ok { diff --git a/internal/processing/oauth.go b/internal/processing/oauth.go index ae511e949..6cd7e00cf 100644 --- a/internal/processing/oauth.go +++ b/internal/processing/oauth.go @@ -20,8 +20,8 @@ package processing import ( "net/http" + "codeberg.org/superseriousbusiness/oauth2/v4" "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/oauth2/v4" ) func (p *Processor) OAuthHandleAuthorizeRequest(w http.ResponseWriter, r *http.Request) gtserror.WithCode { diff --git a/internal/processing/user/create.go b/internal/processing/user/create.go index f878d8320..d2891ef0e 100644 --- a/internal/processing/user/create.go +++ b/internal/processing/user/create.go @@ -22,6 +22,7 @@ import ( "fmt" "time" + "codeberg.org/superseriousbusiness/oauth2/v4" "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/config" @@ -29,7 +30,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/oauth2/v4" ) // Create processes the given form for creating a new user+account. |