update example

Author: LyricTian

.travis.yml

@@ -2,8 +2,12 @@ language: go
 sudo: false
 go_import_path: gopkg.in/oauth2.v3
 go:
-  - 1.7
+  - 1.9
 before_install:
-  - go get github.com/mattn/goveralls
+  - go get -t -v ./...
+
 script:
-  - $HOME/gopath/bin/goveralls -service=travis-ci
+  - go test -race -coverprofile=coverage.txt -covermode=atomic
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -2,7 +2,7 @@
 
 > An open protocol to allow secure authorization in a simple and standard method from web, mobile and desktop applications.
 
-[![License][License-Image]][License-Url] [![ReportCard][ReportCard-Image]][ReportCard-Url] [![Build][Build-Status-Image]][Build-Status-Url] [![Coverage][Coverage-Image]][Coverage-Url] [![GoDoc][GoDoc-Image]][GoDoc-Url]
+[![Build][Build-Status-Image]][Build-Status-Url] [![Codecov][codecov-image]][codecov-url] [![ReportCard][reportcard-image]][reportcard-url] [![GoDoc][godoc-image]][godoc-url] [![License][license-image]][license-url]
 
 ## Protocol Flow
 
@@ -140,13 +140,13 @@ Simulation examples of authorization code model, please check [example](/example
 
   Copyright (c) 2016 Lyric
 
-[License-Url]: http://opensource.org/licenses/MIT
-[License-Image]: https://img.shields.io/npm/l/express.svg
 [Build-Status-Url]: https://travis-ci.org/go-oauth2/oauth2
 [Build-Status-Image]: https://travis-ci.org/go-oauth2/oauth2.svg?branch=master
-[ReportCard-Url]: https://goreportcard.com/report/gopkg.in/oauth2.v3
-[ReportCard-Image]: https://goreportcard.com/badge/gopkg.in/oauth2.v3
-[GoDoc-Url]: https://godoc.org/gopkg.in/oauth2.v3
-[GoDoc-Image]: https://godoc.org/gopkg.in/oauth2.v3?status.svg
-[Coverage-Url]: https://coveralls.io/github/go-oauth2/oauth2?branch=master
-[Coverage-Image]: https://coveralls.io/repos/github/go-oauth2/oauth2/badge.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.v3
+[reportcard-image]: https://goreportcard.com/badge/gopkg.in/oauth2.v3
+[godoc-url]: https://godoc.org/gopkg.in/oauth2.v3
+[godoc-image]: https://godoc.org/gopkg.in/oauth2.v3?status.svg
+[license-url]: http://opensource.org/licenses/MIT
+[license-image]: https://img.shields.io/npm/l/express.svg

example/server/server.go

@@ -6,23 +6,14 @@ import (
 	"net/url"
 	"os"
 
+	"github.com/go-session/session"
 	"gopkg.in/oauth2.v3/errors"
 	"gopkg.in/oauth2.v3/manage"
 	"gopkg.in/oauth2.v3/models"
 	"gopkg.in/oauth2.v3/server"
 	"gopkg.in/oauth2.v3/store"
-	"gopkg.in/session.v1"
 )
 
-var (
-	globalSessions *session.Manager
-)
-
-func init() {
-	globalSessions, _ = session.NewManager("memory", `{"cookieName":"gosessionid","gclifetime":3600}`)
-	go globalSessions.GC()
-}
-
 func main() {
 	manager := manage.NewDefaultManager()
 	// token store
@@ -70,30 +61,40 @@ func main() {
 }
 
 func userAuthorizeHandler(w http.ResponseWriter, r *http.Request) (userID string, err error) {
-	us, err := globalSessions.SessionStart(w, r)
-	uid := us.Get("UserID")
-	if uid == nil {
+	store, err := session.Start(nil, w, r)
+	if err != nil {
+		return
+	}
+
+	uid, ok := store.Get("UserID")
+	if !ok {
 		if r.Form == nil {
 			r.ParseForm()
 		}
-		us.Set("ReturnUri", r.Form)
+		store.Set("ReturnUri", r.Form)
+		store.Save()
+
 		w.Header().Set("Location", "/login")
 		w.WriteHeader(http.StatusFound)
 		return
 	}
 	userID = uid.(string)
-	us.Delete("UserID")
+	store.Delete("UserID")
+	store.Save()
 	return
 }
 
 func loginHandler(w http.ResponseWriter, r *http.Request) {
+	store, err := session.Start(nil, w, r)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
 	if r.Method == "POST" {
-		us, err := globalSessions.SessionStart(w, r)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		us.Set("LoggedInUserID", "000000")
+		store.Set("LoggedInUserID", "000000")
+		store.Save()
+
 		w.Header().Set("Location", "/auth")
 		w.WriteHeader(http.StatusFound)
 		return
@@ -102,25 +103,35 @@ func loginHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func authHandler(w http.ResponseWriter, r *http.Request) {
-	us, err := globalSessions.SessionStart(w, r)
+	store, err := session.Start(nil, w, r)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	if us.Get("LoggedInUserID") == nil {
+
+	if _, ok := store.Get("LoggedInUserID"); !ok {
 		w.Header().Set("Location", "/login")
 		w.WriteHeader(http.StatusFound)
 		return
 	}
+
 	if r.Method == "POST" {
-		form := us.Get("ReturnUri").(url.Values)
+		var form url.Values
+		if v, ok := store.Get("ReturnUri"); ok {
+			form = v.(url.Values)
+		}
 		u := new(url.URL)
 		u.Path = "/authorize"
 		u.RawQuery = form.Encode()
 		w.Header().Set("Location", u.String())
 		w.WriteHeader(http.StatusFound)
-		us.Delete("Form")
-		us.Set("UserID", us.Get("LoggedInUserID"))
+		store.Delete("Form")
+
+		if v, ok := store.Get("LoggedInUserID"); ok {
+			store.Set("UserID", v)
+		}
+		store.Save()
+
 		return
 	}
 	outputHTML(w, r, "static/auth.html")