feat: add SerializerAdapter support custom serializer

enforcer.go

@@ -449,14 +449,57 @@ func (e *Enforcer) AddTokenGenerateFun(tokenStyle string, f model.GenerateFunc)
 
 func (e *Enforcer) GetSession(id string) *model.Session {
 	if v := e.adapter.Get(e.spliceSessionKey(id)); v != nil {
-		session := v.(*model.Session)
+		if s := e.sessionUnSerialize(v); s != nil {
-		return session
+			return s
+		} else {
+			session, ok := v.(*model.Session)
+			if !ok {
+				return nil
+			}
+			return session
+		}
 	}
 	return nil
 }
 
+func (e *Enforcer) sessionUnSerialize(v interface{}) *model.Session {
+	// get serializer
+	serializer, ok := e.adapter.(persist.SerializerAdapter)
+	if !ok {
+		return nil
+	}
+
+	// to bytes
+	bytes, err := util.InterfaceToBytes(v)
+	if err != nil {
+		return nil
+	}
+	session, err := serializer.UnSerialize(bytes)
+	if err != nil {
+		return nil
+	}
+	return session
+}
+
+func (e *Enforcer) sessionSerialize(v *model.Session) ([]byte, error) {
+	serializer, ok := e.adapter.(persist.SerializerAdapter)
+
+	if !ok {
+		return nil, nil
+	}
+	return serializer.Serialize(v)
+}
+
 func (e *Enforcer) SetSession(id string, session *model.Session, timeout int64) error {
-	err := e.adapter.Set(e.spliceSessionKey(id), session, timeout)
+	bytes, err := e.sessionSerialize(session)
+	if err != nil {
+		return err
+	}
+	if bytes != nil {
+		err = e.adapter.Set(e.spliceSessionKey(id), bytes, timeout)
+	} else {
+		err = e.adapter.Set(e.spliceSessionKey(id), session, timeout)
+	}
 	if err != nil {
 		return err
 	}
@@ -470,3 +513,19 @@ func (e *Enforcer) deleteSession(id string) error {
 	}
 	return nil
 }
+
+func (e *Enforcer) updateSession(id string, session *model.Session) error {
+	bytes, err := e.sessionSerialize(session)
+	if err != nil {
+		return err
+	}
+	if bytes != nil {
+		err = e.adapter.Update(e.spliceSessionKey(id), bytes)
+	} else {
+		err = e.adapter.Update(e.spliceSessionKey(id), session)
+	}
+	if err != nil {
+		return err
+	}
+	return nil
+}

enforcer_test.go

@@ -378,3 +378,44 @@ func TestNewEnforcer1(t *testing.T) {
 	t.Log(err)
 	t.Log(enforcer)
 }
+
+func TestEnforcer_JsonAdapter(t *testing.T) {
+	enforcer, err := NewEnforcer(persist.NewJsonAdapter(), config.DefaultTokenConfig())
+	if err != nil {
+		t.Fatalf("NewEnforcer() failed: %v", err)
+	}
+	newSession := model.NewSession("1", "2", "3")
+	newSession.AddTokenSign(&model.TokenSign{
+		Value:  "2",
+		Device: "device",
+	})
+	newSession.AddTokenSign(&model.TokenSign{
+		Value:  "3",
+		Device: "device",
+	})
+
+	t.Log(newSession.Json())
+	println(newSession.TokenSignSize())
+
+	err = enforcer.SetSession("1", newSession, 565)
+	if err != nil {
+		t.Errorf("SetSession() failed: %v", err)
+	}
+	session := enforcer.GetSession("1")
+	if id := session.Id; id != "1" {
+		t.Errorf("GetSession() failed")
+	}
+	if num := len(session.TokenSignList); num != 2 {
+		t.Fatalf("unexpected session tokenSignList length = %v", num)
+	}
+
+	err = enforcer.updateSession("1", model.NewSession("4", "5", "6"))
+	if err != nil {
+		t.Errorf("updateSession() failed: %v", err)
+	}
+	session = enforcer.GetSession("1")
+	if id := session.Id; id != "4" {
+		t.Errorf("GetSession() failed")
+	}
+
+}

persist/json_adapter.go

@@ -0,0 +1,27 @@
+package persist
+
+import (
+	"encoding/json"
+	"github.com/weloe/token-go/model"
+)
+
+type JsonAdapter struct {
+	*DefaultAdapter
+}
+
+func NewJsonAdapter() *JsonAdapter {
+	return &JsonAdapter{NewDefaultAdapter()}
+}
+
+func (j *JsonAdapter) Serialize(session *model.Session) ([]byte, error) {
+	return json.Marshal(session)
+}
+
+func (j *JsonAdapter) UnSerialize(bytes []byte) (*model.Session, error) {
+	s := &model.Session{}
+	err := json.Unmarshal(bytes, s)
+	if err != nil {
+		return nil, err
+	}
+	return s, nil
+}

persist/serializer_adapter.go

@@ -0,0 +1,9 @@
+package persist
+
+import "github.com/weloe/token-go/model"
+
+type SerializerAdapter interface {
+	Adapter
+	Serialize(*model.Session) ([]byte, error)
+	UnSerialize([]byte) (*model.Session, error)
+}

util/util.go

@@ -1,5 +1,7 @@
 package util
 
+import "fmt"
+
 func HasNil(arr []interface{}) bool {
 	for _, elem := range arr {
 		if elem == nil {
@@ -17,3 +19,10 @@ func HasStr(arr []string, str string) bool {
 	}
 	return false
 }
+
+func InterfaceToBytes(data interface{}) ([]byte, error) {
+	if b, ok := data.([]byte); ok {
+		return b, nil
+	}
+	return nil, fmt.Errorf("unable to convert %T to []byte", data)
+}