Added context to PasswordAuthroizationHandler (#173)

example/server/server.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+"context"
 "encoding/json"
 "flag"
 "fmt"
-"github.com/go-oauth2/oauth2/v4/generates"
 "io"
 "log"
 "net/http"
@@ -13,6 +13,8 @@ import (
 "os"
 "time"
 
+"github.com/go-oauth2/oauth2/v4/generates"
+
 "github.com/go-oauth2/oauth2/v4/errors"
 "github.com/go-oauth2/oauth2/v4/manage"
 "github.com/go-oauth2/oauth2/v4/models"
@@ -62,7 +64,7 @@ func main() {
 
 srv := server.NewServer(server.NewConfig(), manager)
 
-srv.SetPasswordAuthorizationHandler(func(username, password string) (userID string, err error) {
+srv.SetPasswordAuthorizationHandler(func(ctx context.Context, username, password string) (userID string, err error) {
 if username == "test" && password == "test" {
 userID = "test"
 }
@@ -143,7 +145,7 @@ func main() {
 log.Printf("Server is running at %d port.\n", portvar)
 log.Printf("Point your OAuth client Auth endpoint to %s:%d%s", "http://localhost", portvar, "/oauth/authorize")
 log.Printf("Point your OAuth client Token endpoint to %s:%d%s", "http://localhost", portvar, "/oauth/token")
-log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d",portvar), nil))
+log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", portvar), nil))
 }
 
 func dumpRequest(writer io.Writer, header string, r *http.Request) error {

server/handler.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+"context"
 "net/http"
 "time"
 
@@ -22,7 +23,7 @@ type (
 UserAuthorizationHandler func(w http.ResponseWriter, r *http.Request) (userID string, err error)
 
 // PasswordAuthorizationHandler get user id from username and password
-PasswordAuthorizationHandler func(username, password string) (userID string, err error)
+PasswordAuthorizationHandler func(ctx context.Context, username, password string) (userID string, err error)
 
 // RefreshingScopeHandler check the scope of the refreshing token
 RefreshingScopeHandler func(tgr *oauth2.TokenGenerateRequest, oldScope string) (allowed bool, err error)

server/server.go

@@ -32,7 +32,7 @@ func NewServer(cfg *Config, manager oauth2.Manager) *Server {
 return "", errors.ErrAccessDenied
 }
 
-srv.PasswordAuthorizationHandler = func(username, password string) (string, error) {
+srv.PasswordAuthorizationHandler = func(ctx context.Context, username, password string) (string, error) {
 return "", errors.ErrAccessDenied
 }
 return srv
@@ -347,7 +347,7 @@ func (s *Server) ValidationTokenRequest(r *http.Request) (oauth2.GrantType, *oau
 return "", nil, errors.ErrInvalidRequest
 }
 
-userID, err := s.PasswordAuthorizationHandler(username, password)
+userID, err := s.PasswordAuthorizationHandler(r.Context(), username, password)
 if err != nil {
 return "", nil, err
 } else if userID == "" {

server/server_test.go

@@ -1,6 +1,7 @@
 package server_test
 
 import (
+"context"
 "fmt"
 "net/http"
 "net/http/httptest"
@@ -250,7 +251,7 @@ func TestPasswordCredentials(t *testing.T) {
 
 manager.MapClientStorage(clientStore(""))
 srv = server.NewDefaultServer(manager)
-srv.SetPasswordAuthorizationHandler(func(username, password string) (userID string, err error) {
+srv.SetPasswordAuthorizationHandler(func(ctx context.Context, username, password string) (userID string, err error) {
 if username == "admin" && password == "123456" {
 userID = "000000"
 return