Add generated token package

Author: LyricTian

generates/.gitkeep

@@ -0,0 +1,41 @@
+package generates
+
+import (
+	"bytes"
+	"strconv"
+	"strings"
+
+	"github.com/LyricTian/go.uuid"
+	"gopkg.in/LyricTian/lib.v2"
+	"gopkg.in/oauth2.v2"
+)
+
+// NewAccessGenerate 创建访问令牌生成实例
+func NewAccessGenerate() *AccessGenerate {
+	return &AccessGenerate{}
+}
+
+// AccessGenerate 访问令牌生成
+type AccessGenerate struct {
+}
+
+// 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)
+	if isGenRefresh {
+		refresh, err = lib.NewEncryption(uuid.NewV5(uuid.NewV4(), buf.String()).Bytes()).Sha1()
+		if err != nil {
+			return
+		}
+		refresh = strings.ToUpper(refresh)
+	}
+
+	return
+}

generates/access.go

@@ -0,0 +1,28 @@
+package generates
+
+import (
+	"testing"
+	"time"
+
+	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/oauth2.v2"
+	"gopkg.in/oauth2.v2/models"
+)
+
+func TestAccess(t *testing.T) {
+	Convey("Test Access Generate", t, func() {
+		data := &oauth2.GenerateBasic{
+			Client: &models.Client{
+				ClientID: "123456",
+				Secret:   "123456",
+			},
+			UserID:   "000000",
+			CreateAt: time.Now(),
+		}
+		gen := NewAccessGenerate()
+		access, refresh, err := gen.Token(data, true)
+		So(err, ShouldBeNil)
+		Println("\nAccess:", access)
+		Println("Refresh:", refresh)
+	})
+}

generates/access_test.go

@@ -0,0 +1,31 @@
+package generates
+
+import (
+	"bytes"
+	"strings"
+
+	"github.com/LyricTian/go.uuid"
+	"gopkg.in/LyricTian/lib.v2"
+	"gopkg.in/oauth2.v2"
+)
+
+// NewAuthorizeGenerate 创建授权令牌生成实例
+func NewAuthorizeGenerate() *AuthorizeGenerate {
+	return &AuthorizeGenerate{}
+}
+
+// AuthorizeGenerate 授权令牌生成
+type AuthorizeGenerate struct{}
+
+// Token 生成令牌
+func (ag *AuthorizeGenerate) Token(data *oauth2.GenerateBasic) (code string, err error) {
+	buf := bytes.NewBuffer(uuid.NewV1().Bytes())
+	buf.WriteString(data.UserID)
+	buf.WriteString(data.Client.GetID())
+	code, err = lib.NewEncryption(buf.Bytes()).MD5()
+	if err != nil {
+		return
+	}
+	code = strings.ToUpper(code)
+	return
+}

generates/authorize.go

@@ -0,0 +1,27 @@
+package generates
+
+import (
+	"testing"
+	"time"
+
+	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/oauth2.v2"
+	"gopkg.in/oauth2.v2/models"
+)
+
+func TestAuthorize(t *testing.T) {
+	Convey("Test Authorize Generate", t, func() {
+		data := &oauth2.GenerateBasic{
+			Client: &models.Client{
+				ClientID: "123456",
+				Secret:   "123456",
+			},
+			UserID:   "000000",
+			CreateAt: time.Now(),
+		}
+		gen := NewAuthorizeGenerate()
+		code, err := gen.Token(data)
+		So(err, ShouldBeNil)
+		Println("\nCode:", code)
+	})
+}

generates/authorize_test.go

@@ -19,14 +19,15 @@ func NewManager() *Manager {
 		injector: inject.New(),
 	}
 	// 设定参数默认值
-
 	// 设定授权码的有效期为10分钟
 	m.SetRTConfig(oauth2.Code, &Config{TokenExp: time.Minute * 10})
 	// 设定简化模式授权令牌的有效期为1小时
 	m.SetRTConfig(oauth2.Token, &Config{TokenExp: time.Hour * 1})
 
-	// 设定授权码模式令牌的有效期为2小时,g令牌的有效期为3天
-	m.SetGTConfig(oauth2.PasswordCredentials, &Config{TokenExp: time.Hour * 2, RefreshExp: time.Hour * 24 * 3})
+	// 设定授权码模式令牌的有效期为2小时,更新令牌的有效期为3天
+	m.SetGTConfig(oauth2.AuthorizationCodeCredentials, &Config{TokenExp: time.Hour * 2, RefreshExp: time.Hour * 24 * 3})
+	// 设定密码模式令牌的有效期为2小时,更新令牌的有效期为7天
+	m.SetGTConfig(oauth2.PasswordCredentials, &Config{TokenExp: time.Hour * 2, RefreshExp: time.Hour * 24 * 7})
 	// 设定客户端模式令牌的有效期为1小时
 	m.SetGTConfig(oauth2.ClientCredentials, &Config{TokenExp: time.Hour * 2})
 	return m
@@ -93,7 +94,7 @@ func (m *Manager) MapClientStorage(stor oauth2.ClientStorage) {
 	m.injector.Map(stor)
 }
 
-// MustClientStorage 注入客户端信息存储接口
+// MustClientStorage 强制注入客户端信息存储接口
 func (m *Manager) MustClientStorage(stor oauth2.ClientStorage, err error) {
 	if err != nil {
 		panic(err)
@@ -112,7 +113,7 @@ func (m *Manager) MapTokenStorage(stor oauth2.TokenStorage) {
 	m.injector.Map(stor)
 }
 
-// MustTokenStorage 注入令牌信息存储接口
+// MustTokenStorage 强制注入令牌信息存储接口
 func (m *Manager) MustTokenStorage(stor oauth2.TokenStorage, err error) {
 	if err != nil {
 		panic(err)
@@ -257,7 +258,6 @@ func (m *Manager) RefreshAccessToken(refresh, scope string) (token string, err e
 			err = terr
 			return
 		}
-		ti.SetAuthType(oauth2.RefreshCredentials.String())
 		ti.SetAccess(tv)
 		ti.SetAccessCreateAt(td.CreateAt)
 		if scope != "" {

manage/manager.go

@@ -12,8 +12,8 @@ type (
 		GetSecret() string
 		// 客户端域名URL
 		GetDomain() string
-		// 预留数据
-		GetRetainData() interface{}
+		// Other data
+		GetOtherData() interface{}
 	}
 
 	// TokenInfo 令牌信息模型接口
@@ -39,17 +39,17 @@ type (
 		// 设置令牌授权类型
 		SetAuthType(string)
 
-		// 访问令牌
+		// 访问令牌(或授权令牌)
 		GetAccess() string
-		// 设置访问令牌
+		// 设置访问令牌(或授权令牌)
 		SetAccess(string)
-		// 访问令牌创建时间
+		// 访问令牌(或授权令牌)创建时间
 		GetAccessCreateAt() time.Time
-		// 设置访问令牌创建时间
+		// 设置访问令牌(或授权令牌)创建时间
 		SetAccessCreateAt(time.Time)
-		// 访问令牌有效期
+		// 访问令牌(或授权令牌)有效期
 		GetAccessExpiresIn() time.Duration
-		// 设置访问令牌有效期
+		// 设置访问令牌(或授权令牌)有效期
 		SetAccessExpiresIn(time.Duration)
 
 		// 更新令牌

model.go

@@ -22,7 +22,7 @@ func (c *Client) GetDomain() string {
 	return c.Domain
 }
 
-// GetRetainData 预留数据
-func (c *Client) GetRetainData() interface{} {
+// GetOtherData Other data
+func (c *Client) GetOtherData() interface{} {
 	return nil
 }