Modify module path to github.com/go-oauth2/oauth2/v4

Author: LyricTian

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 sudo: false
-go_import_path: gopkg.in/oauth2.v4
+go_import_path: github.com/go-oauth2/oauth2/v4
 go:
-  - 1.9
+  - 1.13
 before_install:
   - go get -t -v ./...
 

README.md

@@ -31,7 +31,7 @@
 ### Download and install
 
 ``` bash
-go get -u -v gopkg.in/oauth2.v4/...
+go get -u -v github.com/go-oauth2/oauth2/v4/...
 ```
 
 ### Create file `server.go`
@@ -43,11 +43,11 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/oauth2.v4/errors"
-	"gopkg.in/oauth2.v4/manage"
-	"gopkg.in/oauth2.v4/models"
-	"gopkg.in/oauth2.v4/server"
-	"gopkg.in/oauth2.v4/store"
+	"github.com/go-oauth2/oauth2/v4/errors"
+	"github.com/go-oauth2/oauth2/v4/manage"
+	"github.com/go-oauth2/oauth2/v4/models"
+	"github.com/go-oauth2/oauth2/v4/server"
+	"github.com/go-oauth2/oauth2/v4/store"
 )
 
 func main() {
@@ -135,7 +135,7 @@ Simulation examples of authorization code model, please check [example](/example
 ```go
 
 import (
-	"gopkg.in/oauth2.v4/generates"
+	"github.com/go-oauth2/oauth2/v4/generates"
 	"github.com/dgrijalva/jwt-go"
 )
 
@@ -180,9 +180,9 @@ if !ok || !token.Valid {
 [Build-Status-Image]: https://travis-ci.org/go-oauth2/oauth2.svg?branch=master
 [codecov-url]: https://codecov.io/gh/go-oauth2/oauth2
 [codecov-image]: https://codecov.io/gh/go-oauth2/oauth2/branch/master/graph/badge.svg
-[reportcard-url]: https://goreportcard.com/report/gopkg.in/oauth2.v4
-[reportcard-image]: https://goreportcard.com/badge/gopkg.in/oauth2.v4
-[godoc-url]: https://godoc.org/gopkg.in/oauth2.v4
-[godoc-image]: https://godoc.org/gopkg.in/oauth2.v4?status.svg
+[reportcard-url]: https://goreportcard.com/report/github.com/go-oauth2/oauth2/v4
+[reportcard-image]: https://goreportcard.com/badge/github.com/go-oauth2/oauth2/v4
+[godoc-url]: https://godoc.org/github.com/go-oauth2/oauth2/v4
+[godoc-image]: https://godoc.org/github.com/go-oauth2/oauth2/v4?status.svg
 [license-url]: http://opensource.org/licenses/MIT
 [license-image]: https://img.shields.io/npm/l/express.svg

doc.go

@@ -3,9 +3,9 @@
 //     package main
 //     import (
 //         "net/http"
-//         "gopkg.in/oauth2.v4/manage"
-//         "gopkg.in/oauth2.v4/server"
-//         "gopkg.in/oauth2.v4/store"
+//         "github.com/go-oauth2/oauth2/v4/manage"
+//         "github.com/go-oauth2/oauth2/v4/server"
+//         "github.com/go-oauth2/oauth2/v4/store"
 //     )
 //     func main() {
 //         manager := manage.NewDefaultManager()

errors/error.go

@@ -2,6 +2,9 @@ package errors
 
 import "errors"
 
+// New returns an error that formats as the given text.
+var New = errors.New
+
 // known errors
 var (
 	ErrInvalidRedirectURI   = errors.New("invalid redirect uri")

errors/response.go

@@ -5,11 +5,6 @@ import (
 	"net/http"
 )
 
-// Define alias
-var (
-	New = errors.New
-)
-
 // Response error response
 type Response struct {
 	Error       error

example/server/server.go

@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
+	"github.com/go-oauth2/oauth2/v4/errors"
+	"github.com/go-oauth2/oauth2/v4/generates"
+	"github.com/go-oauth2/oauth2/v4/manage"
+	"github.com/go-oauth2/oauth2/v4/models"
+	"github.com/go-oauth2/oauth2/v4/server"
+	"github.com/go-oauth2/oauth2/v4/store"
 	"github.com/go-session/session"
-	"gopkg.in/oauth2.v4/errors"
-	"gopkg.in/oauth2.v4/generates"
-	"gopkg.in/oauth2.v4/manage"
-	"gopkg.in/oauth2.v4/models"
-	"gopkg.in/oauth2.v4/server"
-	"gopkg.in/oauth2.v4/store"
 )
 
 func main() {

generates/access.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/utils/uuid"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/google/uuid"
 )
 
 // NewAccessGenerate create to generate the access token instance
@@ -26,11 +26,11 @@ func (ag *AccessGenerate) Token(ctx context.Context, data *oauth2.GenerateBasic,
 	buf.WriteString(data.UserID)
 	buf.WriteString(strconv.FormatInt(data.CreateAt.UnixNano(), 10))
 
-	access := base64.URLEncoding.EncodeToString(uuid.NewMD5(uuid.Must(uuid.NewRandom()), buf.Bytes()).Bytes())
+	access := base64.URLEncoding.EncodeToString([]byte(uuid.NewMD5(uuid.Must(uuid.NewRandom()), buf.Bytes()).String()))
 	access = strings.ToUpper(strings.TrimRight(access, "="))
 	refresh := ""
 	if isGenRefresh {
-		refresh = base64.URLEncoding.EncodeToString(uuid.NewSHA1(uuid.Must(uuid.NewRandom()), buf.Bytes()).Bytes())
+		refresh = base64.URLEncoding.EncodeToString([]byte(uuid.NewSHA1(uuid.Must(uuid.NewRandom()), buf.Bytes()).String()))
 		refresh = strings.ToUpper(strings.TrimRight(refresh, "="))
 	}
 

generates/access_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/generates"
-	"gopkg.in/oauth2.v4/models"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/go-oauth2/oauth2/v4/generates"
+	"github.com/go-oauth2/oauth2/v4/models"
 
 	. "github.com/smartystreets/goconvey/convey"
 )

generates/authorize.go

@@ -6,8 +6,8 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/utils/uuid"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/google/uuid"
 )
 
 // NewAuthorizeGenerate create to generate the authorize code instance
@@ -23,7 +23,7 @@ func (ag *AuthorizeGenerate) Token(ctx context.Context, data *oauth2.GenerateBas
 	buf := bytes.NewBufferString(data.Client.GetID())
 	buf.WriteString(data.UserID)
 	token := uuid.NewMD5(uuid.Must(uuid.NewRandom()), buf.Bytes())
-	code := base64.URLEncoding.EncodeToString(token.Bytes())
+	code := base64.URLEncoding.EncodeToString([]byte(token.String()))
 	code = strings.ToUpper(strings.TrimRight(code, "="))
 
 	return code, nil

generates/authorize_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/oauth2.v4"
-	"gopkg.in/oauth2.v4/generates"
-	"gopkg.in/oauth2.v4/models"
+	"github.com/go-oauth2/oauth2/v4"
+	"github.com/go-oauth2/oauth2/v4/generates"
+	"github.com/go-oauth2/oauth2/v4/models"
 
 	. "github.com/smartystreets/goconvey/convey"
 )