Skip to content

Commit 4244ef0

Browse files
committed
Update context and example
1 parent e627a7b commit 4244ef0

File tree

6 files changed

+115
-52
lines changed

6 files changed

+115
-52
lines changed

errors/response.go

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import (
55
"net/http"
66
)
77

8+
// Define alias
9+
var (
10+
New = errors.New
11+
)
12+
813
// Response error response
914
type Response struct {
1015
Error error

example/server/server.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func main() {
6060
http.HandleFunc("/auth", authHandler)
6161

6262
http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
63-
store, err := session.Start(nil, w, r)
63+
store, err := session.Start(r.Context(), w, r)
6464
if err != nil {
6565
http.Error(w, err.Error(), http.StatusInternalServerError)
6666
return
@@ -110,7 +110,7 @@ func main() {
110110
}
111111

112112
func userAuthorizeHandler(w http.ResponseWriter, r *http.Request) (userID string, err error) {
113-
store, err := session.Start(nil, w, r)
113+
store, err := session.Start(r.Context(), w, r)
114114
if err != nil {
115115
return
116116
}
@@ -136,7 +136,7 @@ func userAuthorizeHandler(w http.ResponseWriter, r *http.Request) (userID string
136136
}
137137

138138
func loginHandler(w http.ResponseWriter, r *http.Request) {
139-
store, err := session.Start(nil, w, r)
139+
store, err := session.Start(r.Context(), w, r)
140140
if err != nil {
141141
http.Error(w, err.Error(), http.StatusInternalServerError)
142142
return

example/server/static/login.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Login In</h1>
1515
<form action="/login" method="POST">
1616
<div class="form-group">
1717
<label for="username">User Name</label>
18-
<input type="text" class="form-control" name="username" placeholder="Please enter your user name">
18+
<input type="text" class="form-control" name="username" required placeholder="Please enter your user name">
1919
</div>
2020
<div class="form-group">
2121
<label for="password">Password</label>

go.mod

+13-14
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,26 @@ require (
1010
github.com/gavv/httpexpect v2.0.0+incompatible
1111
github.com/go-session/session v3.1.2+incompatible
1212
github.com/google/go-querystring v1.0.0 // indirect
13-
github.com/gorilla/websocket v1.4.1 // indirect
13+
github.com/gorilla/websocket v1.4.2 // indirect
1414
github.com/imkira/go-interpol v1.1.0 // indirect
1515
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
16-
github.com/mattn/go-colorable v0.1.4 // indirect
16+
github.com/klauspost/compress v1.10.6 // indirect
17+
github.com/mattn/go-colorable v0.1.6 // indirect
1718
github.com/moul/http2curl v1.0.0 // indirect
18-
github.com/onsi/ginkgo v1.10.2 // indirect
19-
github.com/onsi/gomega v1.7.0 // indirect
20-
github.com/sergi/go-diff v1.0.0 // indirect
19+
github.com/onsi/ginkgo v1.12.2 // indirect
20+
github.com/sergi/go-diff v1.1.0 // indirect
2121
github.com/smartystreets/goconvey v1.6.4
22-
github.com/stretchr/testify v1.4.0 // indirect
23-
github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 // indirect
24-
github.com/tidwall/buntdb v1.1.0
25-
github.com/tidwall/gjson v1.3.2 // indirect
26-
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb // indirect
27-
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e // indirect
28-
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect
29-
github.com/valyala/fasthttp v1.6.0 // indirect
22+
github.com/stretchr/testify v1.5.1 // indirect
23+
github.com/tidwall/buntdb v1.1.2
24+
github.com/tidwall/gjson v1.6.0 // indirect
25+
github.com/tidwall/pretty v1.0.1 // indirect
26+
github.com/valyala/fasthttp v1.12.0 // indirect
3027
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
3128
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
3229
github.com/yudai/gojsondiff v1.0.0 // indirect
3330
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
3431
github.com/yudai/pp v2.0.1+incompatible // indirect
35-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
32+
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect
33+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
34+
google.golang.org/appengine v1.6.6 // indirect
3635
)

0 commit comments

Comments
 (0)