update

admpub · admpub · commit 9569fe3f87c3 · 2022-04-30T17:10:36.000+08:00
diff --git a/go.mod b/go.mod
@@ -10,25 +10,19 @@ require (
 	github.com/admpub/go-reuseport v0.0.4 // indirect
 	github.com/admpub/humanize v0.0.0-20190501023926-5f826e92c8ca // indirect
 	github.com/admpub/log v1.3.2 // indirect
+	github.com/admpub/oauth2-redis/v4 v4.1.2
+	github.com/admpub/oauth2/v4 v4.0.0
 	github.com/admpub/realip v0.0.0-20210421084339-374cf5df122d // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/go-oauth2/oauth2/v4 v4.4.3
-	github.com/go-oauth2/redis/v4 v4.1.1
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/markbates/goth v1.71.1
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
 	github.com/smartwalle/crypto4go v1.0.3
-	github.com/tidwall/btree v1.3.1 // indirect
-	github.com/tidwall/buntdb v1.2.9 // indirect
-	github.com/tidwall/gjson v1.14.1 // indirect
 	github.com/webx-top/captcha v0.0.1 // indirect
 	github.com/webx-top/com v0.3.9
 	github.com/webx-top/echo v2.26.5+incompatible
@@ -39,6 +33,4 @@ require (
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/handler.go b/handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/go-oauth2/oauth2/v4/errors"
+	"github.com/admpub/oauth2/v4/errors"
 	"github.com/webx-top/echo"
 )
 
diff --git a/manager.go b/manager.go
@@ -1,9 +1,9 @@
 package oauth2s
 
 import (
-	"github.com/go-oauth2/oauth2/v4/generates"
-	"github.com/go-oauth2/oauth2/v4/manage"
-	"github.com/go-oauth2/oauth2/v4/store"
+	"github.com/admpub/oauth2/v4/generates"
+	"github.com/admpub/oauth2/v4/manage"
+	"github.com/admpub/oauth2/v4/store"
 )
 
 func NewManager(config *Config) (*manage.Manager, error) {
diff --git a/options.go b/options.go
@@ -1,9 +1,9 @@
 package oauth2s
 
 import (
-	"github.com/go-oauth2/oauth2/v4"
-	"github.com/go-oauth2/oauth2/v4/manage"
-	"github.com/go-oauth2/oauth2/v4/server"
+	"github.com/admpub/oauth2/v4"
+	"github.com/admpub/oauth2/v4/manage"
+	"github.com/admpub/oauth2/v4/server"
 	"github.com/golang-jwt/jwt"
 )
 
diff --git a/server.go b/server.go
@@ -1,7 +1,7 @@
 package oauth2s
 
 import (
-	"github.com/go-oauth2/oauth2/v4/server"
+	"github.com/admpub/oauth2/v4/server"
 )
 
 func NewServer(config *Config) (*server.Server, error) {
diff --git a/store/redis/store.go b/store/redis/store.go
@@ -1,8 +1,8 @@
 package redis
 
 import (
-	"github.com/go-oauth2/oauth2/v4"
-	oredis "github.com/go-oauth2/redis/v4"
+	oredis "github.com/admpub/oauth2-redis/v4"
+	"github.com/admpub/oauth2/v4"
 	"github.com/go-redis/redis/v8"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"net/http"`
`6`	`6`
`7`		`- "github.com/go-oauth2/oauth2/v4/errors"`
	`7`	`+ "github.com/admpub/oauth2/v4/errors"`
`8`	`8`	`"github.com/webx-top/echo"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package oauth2s`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/go-oauth2/oauth2/v4/server"`
	`4`	`+ "github.com/admpub/oauth2/v4/server"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func NewServer(config Config) (server.Server, error) {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package redis`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/go-oauth2/oauth2/v4"`
`5`		`- oredis "github.com/go-oauth2/redis/v4"`
	`4`	`+ oredis "github.com/admpub/oauth2-redis/v4"`
	`5`	`+ "github.com/admpub/oauth2/v4"`
`6`	`6`	`"github.com/go-redis/redis/v8"`
`7`	`7`	`)`
`8`	`8`