Skip to content

Commit fc4c9e2

Browse files
LyricTianLyricTian
committed
Upgrade to oauth2.v4
1 parent 4244ef0 commit fc4c9e2

26 files changed

+71
-71
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: go
22
sudo: false
3-
go_import_path: gopkg.in/oauth2.v3
3+
go_import_path: gopkg.in/oauth2.v4
44
go:
55
- 1.9
66
before_install:

‎README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
### Download and install
3232

3333
``` bash
34-
go get -u -v gopkg.in/oauth2.v3/...
34+
go get -u -v gopkg.in/oauth2.v4/...
3535
```
3636

3737
### Create file `server.go`
@@ -43,11 +43,11 @@ import (
4343
"log"
4444
"net/http"
4545

46-
"gopkg.in/oauth2.v3/errors"
47-
"gopkg.in/oauth2.v3/manage"
48-
"gopkg.in/oauth2.v3/models"
49-
"gopkg.in/oauth2.v3/server"
50-
"gopkg.in/oauth2.v3/store"
46+
"gopkg.in/oauth2.v4/errors"
47+
"gopkg.in/oauth2.v4/manage"
48+
"gopkg.in/oauth2.v4/models"
49+
"gopkg.in/oauth2.v4/server"
50+
"gopkg.in/oauth2.v4/store"
5151
)
5252

5353
func main() {
@@ -135,7 +135,7 @@ Simulation examples of authorization code model, please check [example](/example
135135
```go
136136

137137
import (
138-
"gopkg.in/oauth2.v3/generates"
138+
"gopkg.in/oauth2.v4/generates"
139139
"github.com/dgrijalva/jwt-go"
140140
)
141141

@@ -180,9 +180,9 @@ if !ok || !token.Valid {
180180
[Build-Status-Image]: https://travis-ci.org/go-oauth2/oauth2.svg?branch=master
181181
[codecov-url]: https://codecov.io/gh/go-oauth2/oauth2
182182
[codecov-image]: https://codecov.io/gh/go-oauth2/oauth2/branch/master/graph/badge.svg
183-
[reportcard-url]: https://goreportcard.com/report/gopkg.in/oauth2.v3
184-
[reportcard-image]: https://goreportcard.com/badge/gopkg.in/oauth2.v3
185-
[godoc-url]: https://godoc.org/gopkg.in/oauth2.v3
186-
[godoc-image]: https://godoc.org/gopkg.in/oauth2.v3?status.svg
183+
[reportcard-url]: https://goreportcard.com/report/gopkg.in/oauth2.v4
184+
[reportcard-image]: https://goreportcard.com/badge/gopkg.in/oauth2.v4
185+
[godoc-url]: https://godoc.org/gopkg.in/oauth2.v4
186+
[godoc-image]: https://godoc.org/gopkg.in/oauth2.v4?status.svg
187187
[license-url]: http://opensource.org/licenses/MIT
188188
[license-image]: https://img.shields.io/npm/l/express.svg

‎doc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// package main
44
// import (
55
// "net/http"
6-
// "gopkg.in/oauth2.v3/manage"
7-
// "gopkg.in/oauth2.v3/server"
8-
// "gopkg.in/oauth2.v3/store"
6+
// "gopkg.in/oauth2.v4/manage"
7+
// "gopkg.in/oauth2.v4/server"
8+
// "gopkg.in/oauth2.v4/store"
99
// )
1010
// func main() {
1111
// manager := manage.NewDefaultManager()

‎example/client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ func main() {
127127
e.Encode(token)
128128
})
129129

130-
log.Println("Client is running at 9094 port.")
130+
log.Println("Client is running at 9094 port.Please open http://localhost:9094")
131131
log.Fatal(http.ListenAndServe(":9094", nil))
132132
}

‎example/server/server.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010

1111
"github.com/dgrijalva/jwt-go"
1212
"github.com/go-session/session"
13-
"gopkg.in/oauth2.v3/errors"
14-
"gopkg.in/oauth2.v3/generates"
15-
"gopkg.in/oauth2.v3/manage"
16-
"gopkg.in/oauth2.v3/models"
17-
"gopkg.in/oauth2.v3/server"
18-
"gopkg.in/oauth2.v3/store"
13+
"gopkg.in/oauth2.v4/errors"
14+
"gopkg.in/oauth2.v4/generates"
15+
"gopkg.in/oauth2.v4/manage"
16+
"gopkg.in/oauth2.v4/models"
17+
"gopkg.in/oauth2.v4/server"
18+
"gopkg.in/oauth2.v4/store"
1919
)
2020

2121
func main() {

‎generates/access.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strconv"
88
"strings"
99

10-
"gopkg.in/oauth2.v3"
11-
"gopkg.in/oauth2.v3/utils/uuid"
10+
"gopkg.in/oauth2.v4"
11+
"gopkg.in/oauth2.v4/utils/uuid"
1212
)
1313

1414
// NewAccessGenerate create to generate the access token instance

‎generates/access_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66
"time"
77

8-
"gopkg.in/oauth2.v3"
9-
"gopkg.in/oauth2.v3/generates"
10-
"gopkg.in/oauth2.v3/models"
8+
"gopkg.in/oauth2.v4"
9+
"gopkg.in/oauth2.v4/generates"
10+
"gopkg.in/oauth2.v4/models"
1111

1212
. "github.com/smartystreets/goconvey/convey"
1313
)

‎generates/authorize.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"encoding/base64"
77
"strings"
88

9-
"gopkg.in/oauth2.v3"
10-
"gopkg.in/oauth2.v3/utils/uuid"
9+
"gopkg.in/oauth2.v4"
10+
"gopkg.in/oauth2.v4/utils/uuid"
1111
)
1212

1313
// NewAuthorizeGenerate create to generate the authorize code instance

‎generates/authorize_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66
"time"
77

8-
"gopkg.in/oauth2.v3"
9-
"gopkg.in/oauth2.v3/generates"
10-
"gopkg.in/oauth2.v3/models"
8+
"gopkg.in/oauth2.v4"
9+
"gopkg.in/oauth2.v4/generates"
10+
"gopkg.in/oauth2.v4/models"
1111

1212
. "github.com/smartystreets/goconvey/convey"
1313
)

‎generates/jwt_access.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
errs "errors"
1010

1111
"github.com/dgrijalva/jwt-go"
12-
"gopkg.in/oauth2.v3"
13-
"gopkg.in/oauth2.v3/errors"
14-
"gopkg.in/oauth2.v3/utils/uuid"
12+
"gopkg.in/oauth2.v4"
13+
"gopkg.in/oauth2.v4/errors"
14+
"gopkg.in/oauth2.v4/utils/uuid"
1515
)
1616

1717
// JWTAccessClaims jwt claims

‎generates/jwt_access_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"time"
88

99
"github.com/dgrijalva/jwt-go"
10-
"gopkg.in/oauth2.v3"
11-
"gopkg.in/oauth2.v3/generates"
12-
"gopkg.in/oauth2.v3/models"
10+
"gopkg.in/oauth2.v4"
11+
"gopkg.in/oauth2.v4/generates"
12+
"gopkg.in/oauth2.v4/models"
1313

1414
. "github.com/smartystreets/goconvey/convey"
1515
)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module gopkg.in/oauth2.v3
1+
module gopkg.in/oauth2.v4
22

33
go 1.13
44

‎manage/manage_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"testing"
66
"time"
77

8-
"gopkg.in/oauth2.v3"
9-
"gopkg.in/oauth2.v3/manage"
10-
"gopkg.in/oauth2.v3/models"
11-
"gopkg.in/oauth2.v3/store"
8+
"gopkg.in/oauth2.v4"
9+
"gopkg.in/oauth2.v4/manage"
10+
"gopkg.in/oauth2.v4/models"
11+
"gopkg.in/oauth2.v4/store"
1212

1313
. "github.com/smartystreets/goconvey/convey"
1414
)

‎manage/manager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"time"
66

7-
"gopkg.in/oauth2.v3"
8-
"gopkg.in/oauth2.v3/errors"
9-
"gopkg.in/oauth2.v3/generates"
10-
"gopkg.in/oauth2.v3/models"
7+
"gopkg.in/oauth2.v4"
8+
"gopkg.in/oauth2.v4/errors"
9+
"gopkg.in/oauth2.v4/generates"
10+
"gopkg.in/oauth2.v4/models"
1111
)
1212

1313
// NewDefaultManager create to default authorization management instance

‎manage/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/url"
55
"strings"
66

7-
"gopkg.in/oauth2.v3/errors"
7+
"gopkg.in/oauth2.v4/errors"
88
)
99

1010
type (

‎manage/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package manage_test
33
import (
44
"testing"
55

6-
"gopkg.in/oauth2.v3/manage"
6+
"gopkg.in/oauth2.v4/manage"
77

88
. "github.com/smartystreets/goconvey/convey"
99
)

‎models/token.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package models
33
import (
44
"time"
55

6-
"gopkg.in/oauth2.v3"
6+
"gopkg.in/oauth2.v4"
77
)
88

99
// NewToken create to token model instance

‎server/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"time"
66

7-
"gopkg.in/oauth2.v3"
7+
"gopkg.in/oauth2.v4"
88
)
99

1010
// Config configuration parameters

‎server/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"net/http"
55
"time"
66

7-
"gopkg.in/oauth2.v3"
8-
"gopkg.in/oauth2.v3/errors"
7+
"gopkg.in/oauth2.v4"
8+
"gopkg.in/oauth2.v4/errors"
99
)
1010

1111
type (

‎server/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12-
"gopkg.in/oauth2.v3"
13-
"gopkg.in/oauth2.v3/errors"
12+
"gopkg.in/oauth2.v4"
13+
"gopkg.in/oauth2.v4/errors"
1414
)
1515

1616
// NewDefaultServer create a default authorization server

‎server/server_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package server
22

33
import (
4-
"gopkg.in/oauth2.v3"
4+
"gopkg.in/oauth2.v4"
55
)
66

77
// SetTokenType token type

‎server/server_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"testing"
99

1010
"github.com/gavv/httpexpect"
11-
"gopkg.in/oauth2.v3"
12-
"gopkg.in/oauth2.v3/errors"
13-
"gopkg.in/oauth2.v3/manage"
14-
"gopkg.in/oauth2.v3/models"
15-
"gopkg.in/oauth2.v3/server"
16-
"gopkg.in/oauth2.v3/store"
11+
"gopkg.in/oauth2.v4"
12+
"gopkg.in/oauth2.v4/errors"
13+
"gopkg.in/oauth2.v4/manage"
14+
"gopkg.in/oauth2.v4/models"
15+
"gopkg.in/oauth2.v4/server"
16+
"gopkg.in/oauth2.v4/store"
1717
)
1818

1919
var (

‎store/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"sync"
77

8-
"gopkg.in/oauth2.v3"
8+
"gopkg.in/oauth2.v4"
99
)
1010

1111
// NewClientStore create client store

‎store/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"gopkg.in/oauth2.v3/models"
8-
"gopkg.in/oauth2.v3/store"
7+
"gopkg.in/oauth2.v4/models"
8+
"gopkg.in/oauth2.v4/store"
99

1010
. "github.com/smartystreets/goconvey/convey"
1111
)

‎store/token.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"time"
77

88
"github.com/tidwall/buntdb"
9-
"gopkg.in/oauth2.v3"
10-
"gopkg.in/oauth2.v3/models"
11-
"gopkg.in/oauth2.v3/utils/uuid"
9+
"gopkg.in/oauth2.v4"
10+
"gopkg.in/oauth2.v4/models"
11+
"gopkg.in/oauth2.v4/utils/uuid"
1212
)
1313

1414
// NewMemoryTokenStore create a token store instance based on memory

‎store/token_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77
"time"
88

9-
"gopkg.in/oauth2.v3"
10-
"gopkg.in/oauth2.v3/models"
11-
"gopkg.in/oauth2.v3/store"
9+
"gopkg.in/oauth2.v4"
10+
"gopkg.in/oauth2.v4/models"
11+
"gopkg.in/oauth2.v4/store"
1212

1313
. "github.com/smartystreets/goconvey/convey"
1414
)

0 commit comments

Comments
 (0)