change the open source licenses for MIT

Author: LyricTian

LICENSE

@@ -1,23 +1,21 @@
-Copyright (c) 2016, OAuth 2.0
-All rights reserved.
+MIT License
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Copyright (c) 2016 Lyric
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,18 +1,18 @@
-MongoDB Storage for OAuth2
-==========================
+# MongoDB Storage for OAuth 2.0
 
-[![GoDoc](https://godoc.org/github.com/go-oauth2/mongo?status.svg)](https://godoc.org/github.com/go-oauth2/mongo)
-[![Go Report Card](https://goreportcard.com/badge/github.com/go-oauth2/mongo)](https://goreportcard.com/report/github.com/go-oauth2/mongo)
+> Based on the redis token storage
 
-Install
--------
+[![License][License-Image]][License-Url] 
+[![ReportCard][ReportCard-Image]][ReportCard-Url] 
+[![GoDoc][GoDoc-Image]][GoDoc-Url]
+
+## Install
 
 ``` bash
-$ go get -u -v github.com/go-oauth2/mongo
+$ go get -u github.com/go-oauth2/mongo
 ```
 
-Usage
------
+## Usage
 
 ``` go
 package main
@@ -25,17 +25,25 @@ import (
 func main() {
 	manager := manage.NewDefaultManager()
 	// use mongodb token store
-    mcfg := mongo.NewConfig("mongodb://admin:[email protected]:27017", "oauth2")
-	manager.MustTokenStorage(mongo.NewTokenStore(mcfg))
-
+	manager.MustTokenStorage(
+		mongo.NewTokenStore(mongo.NewConfig(
+			"mongodb://127.0.0.1:27017",
+			"oauth2",
+		)),
+	)
 	// ...
 }
 ```
 
-License
--------
+## MIT License
 
 ```
-Copyright (c) 2016, OAuth 2.0
-All rights reserved.
-```
+Copyright (c) 2016 Lyric
+```
+
+[License-Url]: http://opensource.org/licenses/MIT
+[License-Image]: https://img.shields.io/npm/l/express.svg
+[ReportCard-Url]: https://goreportcard.com/report/github.com/go-oauth2/mongo
+[ReportCard-Image]: https://goreportcard.com/badge/github.com/go-oauth2/mongo
+[GoDoc-Url]: https://godoc.org/github.com/go-oauth2/mongo
+[GoDoc-Image]: https://godoc.org/github.com/go-oauth2/mongo?status.svg

config.go

@@ -1,12 +1,12 @@
 package mongo
 
-// Config MongoDB Config
+// Config mongodb configuration parameters
 type Config struct {
 	URL string
 	DB  string
 }
 
-// NewConfig Create MongoDB Config
+// NewConfig create mongodb configuration
 func NewConfig(url, db string) *Config {
 	return &Config{
 		URL: url,

token.go

@@ -11,15 +11,19 @@ import (
 	"gopkg.in/oauth2.v3/models"
 )
 
-// TokenConfig Token Config
+// TokenConfig token configuration parameters
 type TokenConfig struct {
-	TxnCName     string // Store txn collection name(The default is oauth2)
-	BasicCName   string // Store token based data collection name(The default is oauth2_basic)
-	AccessCName  string // Store access token data collection name(The default is oauth2_access)
-	RefreshCName string // Store refresh token data collection name(The default is oauth2_refresh)
+	// store txn collection name(The default is oauth2)
+	TxnCName string
+	// store token based data collection name(The default is oauth2_basic)
+	BasicCName string
+	// store access token data collection name(The default is oauth2_access)
+	AccessCName string
+	// store refresh token data collection name(The default is oauth2_refresh)
+	RefreshCName string
 }
 
-// NewDefaultTokenConfig Create default token config
+// NewDefaultTokenConfig create a default token configuration
 func NewDefaultTokenConfig() *TokenConfig {
 	return &TokenConfig{
 		TxnCName:     "oauth2_txn",
@@ -29,7 +33,7 @@ func NewDefaultTokenConfig() *TokenConfig {
 	}
 }
 
-// NewTokenStore Create a token store instance based on mongodb
+// NewTokenStore create a token store instance based on mongodb
 func NewTokenStore(cfg *Config, tcfgs ...*TokenConfig) (store oauth2.TokenStore, err error) {
 	ts := &TokenStore{
 		mcfg: cfg,
@@ -68,7 +72,7 @@ func NewTokenStore(cfg *Config, tcfgs ...*TokenConfig) (store oauth2.TokenStore,
 	return
 }
 
-// TokenStore MongoDB token store
+// TokenStore MongoDB storage for OAuth 2.0
 type TokenStore struct {
 	tcfg    *TokenConfig
 	mcfg    *Config
@@ -86,7 +90,7 @@ func (ts *TokenStore) cHandler(name string, handler func(c *mgo.Collection)) {
 	return
 }
 
-// Create Create and store the new token information
+// Create create and store the new token information
 func (ts *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 	jv, err := json.Marshal(info)
 	if err != nil {
@@ -148,7 +152,7 @@ func (ts *TokenStore) Create(info oauth2.TokenInfo) (err error) {
 	return
 }
 
-// RemoveByCode Use the authorization code to delete the token information
+// RemoveByCode use the authorization code to delete the token information
 func (ts *TokenStore) RemoveByCode(code string) (err error) {
 	ts.cHandler(ts.tcfg.BasicCName, func(c *mgo.Collection) {
 		verr := c.RemoveId(code)
@@ -162,7 +166,7 @@ func (ts *TokenStore) RemoveByCode(code string) (err error) {
 	return
 }
 
-// RemoveByAccess Use the access token to delete the token information
+// RemoveByAccess use the access token to delete the token information
 func (ts *TokenStore) RemoveByAccess(access string) (err error) {
 	ts.cHandler(ts.tcfg.AccessCName, func(c *mgo.Collection) {
 		verr := c.RemoveId(access)
@@ -176,7 +180,7 @@ func (ts *TokenStore) RemoveByAccess(access string) (err error) {
 	return
 }
 
-// RemoveByRefresh Use the refresh token to delete the token information
+// RemoveByRefresh use the refresh token to delete the token information
 func (ts *TokenStore) RemoveByRefresh(refresh string) (err error) {
 	ts.cHandler(ts.tcfg.RefreshCName, func(c *mgo.Collection) {
 		verr := c.RemoveId(refresh)
@@ -227,13 +231,13 @@ func (ts *TokenStore) getBasicID(cname, token string) (basicID string, err error
 	return
 }
 
-// GetByCode Use the authorization code for token information data
+// GetByCode use the authorization code for token information data
 func (ts *TokenStore) GetByCode(code string) (ti oauth2.TokenInfo, err error) {
 	ti, err = ts.getData(code)
 	return
 }
 
-// GetByAccess Use the access token for token information data
+// GetByAccess use the access token for token information data
 func (ts *TokenStore) GetByAccess(access string) (ti oauth2.TokenInfo, err error) {
 	basicID, err := ts.getBasicID(ts.tcfg.AccessCName, access)
 	if err != nil && basicID == "" {
@@ -243,7 +247,7 @@ func (ts *TokenStore) GetByAccess(access string) (ti oauth2.TokenInfo, err error
 	return
 }
 
-// GetByRefresh Use the refresh token for token information data
+// GetByRefresh use the refresh token for token information data
 func (ts *TokenStore) GetByRefresh(refresh string) (ti oauth2.TokenInfo, err error) {
 	basicID, err := ts.getBasicID(ts.tcfg.RefreshCName, refresh)
 	if err != nil && basicID == "" {

token_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestTokenStore(t *testing.T) {
 	Convey("Test mongodb token store", t, func() {
-		mcfg := mongo.NewConfig("mongodb://admin:[email protected]:27017", "oauth2")
+		mcfg := mongo.NewConfig("mongodb://127.0.0.1:27017", "oauth2")
 		store, err := mongo.NewTokenStore(mcfg)
 		So(err, ShouldBeNil)