feat: adjust to new fosite changes (#34)

Author: aeneasr

authorizationserver/oauth2.go

@@ -3,6 +3,7 @@ package authorizationserver
 import (
 	"crypto/rand"
 	"crypto/rsa"
+	"github.com/ory/fosite"
 	"net/http"
 	"time"
 
@@ -30,8 +31,9 @@ func RegisterHandlers() {
 // 4. privateKey - required for id/jwt token generation.
 var (
 	// Check the api documentation of `compose.Config` for further configuration options.
-	config = &compose.Config{
+	config = &fosite.Config{
 		AccessTokenLifespan: time.Minute * 30,
+		GlobalSecret:        secret,
 		// ...
 	}
 
@@ -74,7 +76,7 @@ var (
 )
 
 // Build a fosite instance with all OAuth2 and OpenID Connect handlers enabled, plugging in our configurations as specified above.
-var oauth2 = compose.ComposeAllEnabled(config, store, secret, privateKey)
+var oauth2 = compose.ComposeAllEnabled(config, store, privateKey)
 
 // A session is passed from the `/auth` to the `/token` endpoint. You probably want to store data like: "Who made the request",
 // "What organization does that person belong to" and so on.

authorizationserver/oauth2_auth.go

@@ -15,7 +15,7 @@ func authEndpoint(rw http.ResponseWriter, req *http.Request) {
 	ar, err := oauth2.NewAuthorizeRequest(ctx, req)
 	if err != nil {
 		log.Printf("Error occurred in NewAuthorizeRequest: %+v", err)
-		oauth2.WriteAuthorizeError(rw, ar, err)
+		oauth2.WriteAuthorizeError(ctx, rw, ar, err)
 		return
 	}
 	// You have now access to authorizeRequest, Code ResponseTypes, Scopes ...
@@ -85,10 +85,10 @@ func authEndpoint(rw http.ResponseWriter, req *http.Request) {
 	// * ...
 	if err != nil {
 		log.Printf("Error occurred in NewAuthorizeResponse: %+v", err)
-		oauth2.WriteAuthorizeError(rw, ar, err)
+		oauth2.WriteAuthorizeError(ctx, rw, ar, err)
 		return
 	}
 
 	// Last but not least, send the response!
-	oauth2.WriteAuthorizeResponse(rw, ar, response)
+	oauth2.WriteAuthorizeResponse(ctx, rw, ar, response)
 }

authorizationserver/oauth2_introspect.go

@@ -11,9 +11,9 @@ func introspectionEndpoint(rw http.ResponseWriter, req *http.Request) {
 	ir, err := oauth2.NewIntrospectionRequest(ctx, req, mySessionData)
 	if err != nil {
 		log.Printf("Error occurred in NewIntrospectionRequest: %+v", err)
-		oauth2.WriteIntrospectionError(rw, err)
+		oauth2.WriteIntrospectionError(ctx, rw, err)
 		return
 	}
 
-	oauth2.WriteIntrospectionResponse(rw, ir)
+	oauth2.WriteIntrospectionResponse(ctx, rw, ir)
 }

authorizationserver/oauth2_revoke.go

@@ -12,5 +12,5 @@ func revokeEndpoint(rw http.ResponseWriter, req *http.Request) {
 	err := oauth2.NewRevocationRequest(ctx, req)
 
 	// All done, send the response.
-	oauth2.WriteRevocationResponse(rw, err)
+	oauth2.WriteRevocationResponse(ctx, rw, err)
 }

authorizationserver/oauth2_token.go

@@ -21,7 +21,7 @@ func tokenEndpoint(rw http.ResponseWriter, req *http.Request) {
 	// * ...
 	if err != nil {
 		log.Printf("Error occurred in NewAccessRequest: %+v", err)
-		oauth2.WriteAccessError(rw, accessRequest, err)
+		oauth2.WriteAccessError(ctx, rw, accessRequest, err)
 		return
 	}
 
@@ -39,12 +39,12 @@ func tokenEndpoint(rw http.ResponseWriter, req *http.Request) {
 	response, err := oauth2.NewAccessResponse(ctx, accessRequest)
 	if err != nil {
 		log.Printf("Error occurred in NewAccessResponse: %+v", err)
-		oauth2.WriteAccessError(rw, accessRequest, err)
+		oauth2.WriteAccessError(ctx, rw, accessRequest, err)
 		return
 	}
 
 	// All done, send the response.
-	oauth2.WriteAccessResponse(rw, accessRequest, response)
+	oauth2.WriteAccessResponse(ctx, rw, accessRequest, response)
 
 	// The client now has a valid access token
 }

go.mod

@@ -1,9 +1,47 @@
 module github.com/ory/fosite-example
 
-go 1.13
+go 1.17
 
 require (
-	github.com/ory/fosite v0.40.3-0.20210618140333-a4ce3544c299
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974
+	github.com/ory/fosite v0.42.3-0.20220508104133-3a0c9520791b
+	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 )
+
+require (
+	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/dgraph-io/ristretto v0.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/mattn/goveralls v0.0.6 // indirect
+	github.com/mitchellh/mapstructure v1.3.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/ory/go-acc v0.2.6 // indirect
+	github.com/ory/go-convenience v0.1.0 // indirect
+	github.com/ory/viper v1.7.5 // indirect
+	github.com/ory/x v0.0.214 // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.8.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/spf13/afero v1.3.2 // indirect
+	github.com/spf13/cast v1.3.2-0.20200723214538-8d17101741c8 // indirect
+	github.com/spf13/cobra v1.0.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/ini.v1 v1.57.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.5.2-0.20210529014059-a5c7eec3c614 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+)