To optimize the implementation

Author: LyricTian

README.md

@@ -24,7 +24,6 @@ import (
 	"net/http"
 
 	"gopkg.in/oauth2.v2/manage"
-	"gopkg.in/oauth2.v2/models"
 	"gopkg.in/oauth2.v2/server"
 	"gopkg.in/oauth2.v2/store/client"
 	"gopkg.in/oauth2.v2/store/token"

const.go

@@ -1,31 +1,33 @@
 package oauth2
 
-// ResponseType 定义授权类型
+// ResponseType Response Type
 type ResponseType string
 
 const (
-	// Code 授权码类型
+	// Code Authorization code type
 	Code ResponseType = "code"
-	// Token 令牌类型
+	// Token Token type
 	Token ResponseType = "token"
 )
 
 func (rt ResponseType) String() string {
 	return string(rt)
 }
 
-// GrantType 定义授权模式
+// GrantType Authorization Grant
 type GrantType string
 
 const (
-	// AuthorizationCodeCredentials 授权码模式
-	AuthorizationCodeCredentials GrantType = "authorization_code"
-	// PasswordCredentials 密码模式
+	// AuthorizationCode Authorization Code
+	AuthorizationCode GrantType = "authorization_code"
+	// PasswordCredentials Resource Owner Password Credentials
 	PasswordCredentials GrantType = "password"
-	// ClientCredentials 客户端模式
+	// ClientCredentials Client Credentials
 	ClientCredentials GrantType = "clientcredentials"
-	// RefreshCredentials 更新令牌模式
-	RefreshCredentials GrantType = "refreshtoken"
+	// Refreshing Refresh Token
+	Refreshing GrantType = "refreshtoken"
+	// Implicit Implicit Grant
+	Implicit GrantType = "__implicit"
 )
 
 func (gt GrantType) String() string {

example/README.md

@@ -1,25 +1,25 @@
-OAuth2授权码模式模拟
-=================
+Authorization code simulation
+=============================
 
-运行服务端
---------
-> 运行fasthttp服务端，请使用`cd example/fastserver`
+Run Server
+---------
+> Run fasthttp server(`cd example/fastserver`)
 
-```
+``` bash
 $ cd example/server
 $ go run main.go
 ```
 
-运行客户端
---------
+Run Client
+----------
 
 ```
 $ cd example/client
 $ go run main.go
 ```
 
-打开浏览器
---------
+Open the browser
+----------------
 
 [http://localhost:9094](http://localhost:9094)
 

example/client/main.go

@@ -54,6 +54,6 @@ func main() {
 		io.Copy(w, resp.Body)
 	})
 
-	log.Println("OAuth2 client is running at 9094 port.")
+	log.Println("Client is running at 9094 port.")
 	log.Fatal(http.ListenAndServe(":9094", nil))
 }

example/fastserver/main.go

@@ -12,11 +12,10 @@ import (
 )
 
 func main() {
-	// 创建基于redis的oauth2管理实例
 	manager := manage.NewRedisManager(
 		&token.RedisConfig{Addr: "192.168.33.70:6379"},
 	)
-	// 使用临时客户端存储
+	// Create the client temporary storage
 	manager.MapClientStorage(client.NewTempStore(&models.Client{
 		ID:     "222222",
 		Secret: "22222222",
@@ -31,8 +30,8 @@ func main() {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
+		// TODO: User authentication...
 		authReq.UserID = "000000"
-		// TODO: 登录验证、授权处理
 		err = srv.HandleAuthorizeRequest(w, authReq)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
@@ -46,6 +45,6 @@ func main() {
 		}
 	})
 
-	log.Println("OAuth2 server is running at 9096 port.")
+	log.Println("Server is running at 9096 port.")
 	log.Fatal(http.ListenAndServe(":9096", nil))
 }

example/server/main.go

@@ -3,22 +3,20 @@ package oauth2
 import "time"
 
 type (
-	// GenerateBasic 提供生成令牌的基础数据
+	// GenerateBasic Provide the basis of the generated token data
 	GenerateBasic struct {
-		Client   ClientInfo // 客户端信息
-		UserID   string     // 用户标识
-		CreateAt time.Time  // 创建时间
+		Client   ClientInfo // The client information
+		UserID   string     // The user id
+		CreateAt time.Time  // Creation time
 	}
 
-	// AuthorizeGenerate 授权令牌生成接口
+	// AuthorizeGenerate Generate the authorization code interface
 	AuthorizeGenerate interface {
-		// 授权令牌
 		Token(data *GenerateBasic) (code string, err error)
 	}
 
-	// AccessGenerate 访问令牌生成接口
+	// AccessGenerate Generate the access and refresh tokens interface
 	AccessGenerate interface {
-		// 访问令牌、更新令牌
 		Token(data *GenerateBasic, isGenRefresh bool) (access, refresh string, err error)
 	}
 )

generate.go

@@ -2,39 +2,34 @@ package generates
 
 import (
 	"bytes"
+	"encoding/base64"
 	"strconv"
 	"strings"
 
 	"github.com/LyricTian/go.uuid"
-	"gopkg.in/LyricTian/lib.v2"
 	"gopkg.in/oauth2.v2"
 )
 
-// NewAccessGenerate 创建访问令牌生成实例
+// NewAccessGenerate Create to generate the access token instance
 func NewAccessGenerate() *AccessGenerate {
 	return &AccessGenerate{}
 }
 
-// AccessGenerate 访问令牌生成
+// AccessGenerate Generate the access token
 type AccessGenerate struct {
 }
 
-// Token 生成令牌
+// Token Based on the UUID generated token
 func (ag *AccessGenerate) Token(data *oauth2.GenerateBasic, isGenRefresh bool) (access, refresh string, err error) {
 	buf := bytes.NewBufferString(data.Client.GetID())
 	buf.WriteString(data.UserID)
 	buf.WriteString(strconv.FormatInt(data.CreateAt.UnixNano(), 10))
-	access, err = lib.NewEncryption(uuid.NewV3(uuid.NewV4(), buf.String()).Bytes()).MD5()
-	if err != nil {
-		return
-	}
-	access = strings.ToUpper(access)
+
+	access = base64.URLEncoding.EncodeToString(uuid.NewV3(uuid.NewV4(), buf.String()).Bytes())
+	access = strings.ToUpper(strings.TrimRight(access, "="))
 	if isGenRefresh {
-		refresh, err = lib.NewEncryption(uuid.NewV5(uuid.NewV4(), buf.String()).Bytes()).Sha1()
-		if err != nil {
-			return
-		}
-		refresh = strings.ToUpper(refresh)
+		refresh = base64.URLEncoding.EncodeToString(uuid.NewV5(uuid.NewV4(), buf.String()).Bytes())
+		refresh = strings.ToUpper(strings.TrimRight(refresh, "="))
 	}
 
 	return

generates/access.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/oauth2.v2"
 	"gopkg.in/oauth2.v2/models"
+
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestAccess(t *testing.T) {
@@ -24,5 +25,7 @@ func TestAccess(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(access, ShouldNotBeEmpty)
 		So(refresh, ShouldNotBeEmpty)
+		Println("\nAccess Token:" + access)
+		Println("Refresh Token:" + refresh)
 	})
 }

generates/access_test.go

@@ -2,30 +2,28 @@ package generates
 
 import (
 	"bytes"
+	"encoding/base64"
 	"strings"
 
 	"github.com/LyricTian/go.uuid"
-	"gopkg.in/LyricTian/lib.v2"
 	"gopkg.in/oauth2.v2"
 )
 
-// NewAuthorizeGenerate 创建授权令牌生成实例
+// NewAuthorizeGenerate Create to generate the authorize code instance
 func NewAuthorizeGenerate() *AuthorizeGenerate {
 	return &AuthorizeGenerate{}
 }
 
-// AuthorizeGenerate 授权令牌生成
+// AuthorizeGenerate Generate the authorize code
 type AuthorizeGenerate struct{}
 
-// Token 生成令牌
+// Token Based on the UUID generated token
 func (ag *AuthorizeGenerate) Token(data *oauth2.GenerateBasic) (code string, err error) {
-	buf := bytes.NewBuffer(uuid.NewV1().Bytes())
+	buf := bytes.NewBufferString(data.Client.GetID())
 	buf.WriteString(data.UserID)
-	buf.WriteString(data.Client.GetID())
-	code, err = lib.NewEncryption(buf.Bytes()).MD5()
-	if err != nil {
-		return
-	}
-	code = strings.ToUpper(code)
+	token := uuid.NewV3(uuid.NewV1(), buf.String())
+	code = base64.URLEncoding.EncodeToString(token.Bytes())
+	code = strings.ToUpper(strings.TrimRight(code, "="))
+
 	return
 }