oauth2's turn

README.md

@@ -436,7 +436,7 @@ The following open source libraries, frameworks, and tools are used by GoToSocia
   - [superseriousbusiness/activity](https://codeberg.org/superseriousbusiness/activity) forked from [go-fed/activity](https://github.com/go-fed/activity); Golang ActivityPub/ActivityStreams library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html).
   - [superseriousbusiness/exif-terminator](https://code.superseriousbusiness.org/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html).
   - [superseriousbusiness/httpsig](https://code.superseriousbusiness.org/httpsig) forked from [go-fed/httpsig](https://github.com/go-fed/httpsig); secure HTTP signature library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html).
-  - [superseriousbusiness/oauth2](https://codeberg.org/superseriousbusiness/oauth2) forked from [go-oauth2/oauth2](https://github.com/go-oauth2/oauth2); OAuth server framework and token handling. [MIT License](https://spdx.org/licenses/MIT.html).
+  - [superseriousbusiness/oauth2](https://code.superseriousbusiness.org/oauth2) forked from [go-oauth2/oauth2](https://github.com/go-oauth2/oauth2); OAuth server framework and token handling. [MIT License](https://spdx.org/licenses/MIT.html).
 - [temoto/robotstxt](https://github.com/temoto/robotstxt); robots.txt parsing. [MIT License](https://spdx.org/licenses/MIT.html).
 - [tdewolff/minify](https://github.com/tdewolff/minify); HTML minification for Markdown-submitted posts. [MIT License](https://spdx.org/licenses/MIT.html).
 - [uber-go/automaxprocs](https://github.com/uber-go/automaxprocs); GOMAXPROCS automation. [MIT License](https://spdx.org/licenses/MIT.html).

go.mod

@@ -13,6 +13,7 @@ replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.0-concurre
 require (
 	code.superseriousbusiness.org/exif-terminator v0.11.0
 	code.superseriousbusiness.org/httpsig v1.4.0
+	code.superseriousbusiness.org/oauth2/v4 v4.8.0
 	codeberg.org/gruf/go-bytes v1.0.2
 	codeberg.org/gruf/go-bytesize v1.0.3
 	codeberg.org/gruf/go-byteutil v1.3.0
@@ -31,7 +32,6 @@ require (
 	codeberg.org/gruf/go-storage v0.2.0
 	codeberg.org/gruf/go-structr v0.9.6
 	codeberg.org/superseriousbusiness/activity v1.14.0
-	codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB
 	github.com/DmitriyVTitov/size v1.5.0
 	github.com/KimMachineGun/automemlimit v0.7.1
 	github.com/SherClockHolmes/webpush-go v1.4.0

go.sum

@@ -6,6 +6,8 @@ code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0 h1:I512jiIeXDC4//
 code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0/go.mod h1:SNHomXNW88o1pFfLHpD4KsCZLfcr4z5dm+xcX5SV10A=
 code.superseriousbusiness.org/httpsig v1.4.0 h1:g9+KQMoTG0oR0II5gYb5pVVdNjbc7CiiuqK8vcZjeQg=
 code.superseriousbusiness.org/httpsig v1.4.0/go.mod h1:i2AKpj/WbA/o/UTvia9TAREzt0jP1AH3T1Uxjyhdzlw=
+code.superseriousbusiness.org/oauth2/v4 v4.8.0 h1:4LVXoPJXKgmDfwDegzBQPNpsdleMaL6YmDgFi6UDgEE=
+code.superseriousbusiness.org/oauth2/v4 v4.8.0/go.mod h1:+RLRBXPkjP/VhIC/46dcZkx3t5IvBSJYOjVCPgeWors=
 codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo=
 codeberg.org/gruf/go-bytes v1.0.2/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg=
 codeberg.org/gruf/go-bytesize v1.0.3 h1:Tz8tCxhPLeyM5VryuBNjUHgKmLj4Bx9RbPaUSA3qg6g=
@@ -52,8 +54,6 @@ codeberg.org/superseriousbusiness/activity v1.14.0 h1:z+jBjAIane9+Oqu6vO+tNvvNoj
 codeberg.org/superseriousbusiness/activity v1.14.0/go.mod h1:enxU1Lva4OcK6b/NBXscoHSEgEMsKJvdHrQFifQxp4o=
 codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix h1:+JvBZqsQfdT+ROnk2DkvXsKQ9QBorKKKBk5fBqw62I8=
 codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po=
-codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB h1:UAFZKgUaeQEoHDmawh9DWXFopJnADfkiDo/CLAtWISc=
-codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB/go.mod h1:fAEs7S0vD9yB+h7zBUWfAqwdbVqF4n8FcTnXpJC//AM=
 github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=
 github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0=
 github.com/KimMachineGun/automemlimit v0.7.1 h1:QcG/0iCOLChjfUweIMC3YL5Xy9C3VBeNmCZHrZfJMBw=

internal/api/auth/revoke.go

@@ -20,7 +20,7 @@ package auth
 import (
 	"net/http"
 
-	oautherr "codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	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"

internal/api/util/auth.go

@@ -22,7 +22,7 @@ import (
 	"slices"
 	"strings"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"

internal/middleware/tokencheck.go

@@ -20,7 +20,7 @@ package middleware
 import (
 	"net/http"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/log"

internal/oauth/clientstore.go

@@ -20,8 +20,8 @@ package oauth
 import (
 	"context"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
 	"github.com/superseriousbusiness/gotosocial/internal/state"
 )
 

internal/oauth/errors.go

@@ -17,7 +17,7 @@
 
 package oauth
 
-import "codeberg.org/superseriousbusiness/oauth2/v4/errors"
+import "code.superseriousbusiness.org/oauth2/v4/errors"
 
 // ErrInvalidRequest is an oauth spec compliant 'invalid_request' error.
 var ErrInvalidRequest = errors.New("invalid_request")

internal/oauth/handlers/handlers.go

@@ -25,10 +25,10 @@ import (
 	"slices"
 	"strings"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	oautherr "codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	oautherr "code.superseriousbusiness.org/oauth2/v4/errors"
-	"codeberg.org/superseriousbusiness/oauth2/v4/manage"
+	"code.superseriousbusiness.org/oauth2/v4/manage"
-	"codeberg.org/superseriousbusiness/oauth2/v4/server"
+	"code.superseriousbusiness.org/oauth2/v4/server"
 	apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext"

internal/oauth/server.go

@@ -24,11 +24,11 @@ import (
 	"net/http"
 	"strings"
 
+	"code.superseriousbusiness.org/oauth2/v4"
+	oautherr "code.superseriousbusiness.org/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/manage"
+	"code.superseriousbusiness.org/oauth2/v4/server"
 	errorsv2 "codeberg.org/gruf/go-errors/v2"
-	"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/gtsmodel"

internal/oauth/tokenstore.go

@@ -22,9 +22,9 @@ import (
 	"errors"
 	"time"
 
+	"code.superseriousbusiness.org/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4/models"
 	"codeberg.org/gruf/go-mutexes"
-	"codeberg.org/superseriousbusiness/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/models"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"

internal/processing/oauth.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"net/http"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 )
 

internal/processing/user/create.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/config"

vendor/code.superseriousbusiness.org/oauth2/v4/doc.go

@@ -3,9 +3,9 @@
 //     package main
 //     import (
 //         "net/http"
-//         "codeberg.org/superseriousbusiness/oauth2/v4/manage"
+//         "code.superseriousbusiness.org/oauth2/v4/manage"
-//         "codeberg.org/superseriousbusiness/oauth2/v4/server"
+//         "code.superseriousbusiness.org/oauth2/v4/server"
-//         "codeberg.org/superseriousbusiness/oauth2/v4/store"
+//         "code.superseriousbusiness.org/oauth2/v4/store"
 //     )
 //     func main() {
 //         manager := manage.NewDefaultManager()

vendor/code.superseriousbusiness.org/oauth2/v4/generates/access.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/google/uuid"
 )
 

vendor/code.superseriousbusiness.org/oauth2/v4/generates/authorize.go

@@ -6,7 +6,7 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 	"github.com/google/uuid"
 )
 

vendor/code.superseriousbusiness.org/oauth2/v4/generates/jwt_access.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
 	"github.com/golang-jwt/jwt"
 	"github.com/google/uuid"
 )

vendor/code.superseriousbusiness.org/oauth2/v4/manage/manager.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
-	"codeberg.org/superseriousbusiness/oauth2/v4/generates"
+	"code.superseriousbusiness.org/oauth2/v4/generates"
-	"codeberg.org/superseriousbusiness/oauth2/v4/models"
+	"code.superseriousbusiness.org/oauth2/v4/models"
 )
 
 // NewDefaultManager create to default authorization management instance

vendor/code.superseriousbusiness.org/oauth2/v4/manage/util.go

@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"strings"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
 )
 
 type (

vendor/code.superseriousbusiness.org/oauth2/v4/models/token.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 )
 
 // NewToken create to token model instance

vendor/code.superseriousbusiness.org/oauth2/v4/server/config.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 )
 
 // Config configuration parameters

vendor/code.superseriousbusiness.org/oauth2/v4/server/handler.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
 )
 
 type (

vendor/code.superseriousbusiness.org/oauth2/v4/server/server.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
-	"codeberg.org/superseriousbusiness/oauth2/v4/errors"
+	"code.superseriousbusiness.org/oauth2/v4/errors"
 )
 
 // NewDefaultServer create a default authorization server

vendor/code.superseriousbusiness.org/oauth2/v4/server/server_config.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"codeberg.org/superseriousbusiness/oauth2/v4"
+	"code.superseriousbusiness.org/oauth2/v4"
 )
 
 // SetTokenType token type

vendor/modules.txt

@@ -10,6 +10,14 @@ code.superseriousbusiness.org/go-png-image-structure/v2
 # code.superseriousbusiness.org/httpsig v1.4.0
 ## explicit; go 1.21
 code.superseriousbusiness.org/httpsig
+# code.superseriousbusiness.org/oauth2/v4 v4.8.0
+## explicit; go 1.23.0
+code.superseriousbusiness.org/oauth2/v4
+code.superseriousbusiness.org/oauth2/v4/errors
+code.superseriousbusiness.org/oauth2/v4/generates
+code.superseriousbusiness.org/oauth2/v4/manage
+code.superseriousbusiness.org/oauth2/v4/models
+code.superseriousbusiness.org/oauth2/v4/server
 # codeberg.org/gruf/go-bytes v1.0.2
 ## explicit; go 1.14
 codeberg.org/gruf/go-bytes
@@ -275,14 +283,6 @@ codeberg.org/superseriousbusiness/activity/streams/values/rfc2045
 codeberg.org/superseriousbusiness/activity/streams/values/rfc5988
 codeberg.org/superseriousbusiness/activity/streams/values/string
 codeberg.org/superseriousbusiness/activity/streams/vocab
-# codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB
-## explicit; go 1.23.0
-codeberg.org/superseriousbusiness/oauth2/v4
-codeberg.org/superseriousbusiness/oauth2/v4/errors
-codeberg.org/superseriousbusiness/oauth2/v4/generates
-codeberg.org/superseriousbusiness/oauth2/v4/manage
-codeberg.org/superseriousbusiness/oauth2/v4/models
-codeberg.org/superseriousbusiness/oauth2/v4/server
 # github.com/DmitriyVTitov/size v1.5.0
 ## explicit; go 1.14
 github.com/DmitriyVTitov/size