rename

Author: wxiaoguang

modules/session/mem.go

@@ -11,21 +11,21 @@ import (
 	"gitea.com/go-chi/session"
 )
 
-type MemStore struct {
+type mockMemRawStore struct {
 	s *session.MemStore
 }
 
-var _ session.RawStore = (*MemStore)(nil)
+var _ session.RawStore = (*mockMemRawStore)(nil)
 
-func (m *MemStore) Set(k, v any) error {
+func (m *mockMemRawStore) Set(k, v any) error {
 	var buf bytes.Buffer
 	if err := gob.NewEncoder(&buf).Encode(map[string]any{"v": v}); err != nil {
 		return err
 	}
 	return m.s.Set(k, buf.Bytes())
 }
 
-func (m *MemStore) Get(k any) (ret any) {
+func (m *mockMemRawStore) Get(k any) (ret any) {
 	v, ok := m.s.Get(k).([]byte)
 	if !ok {
 		return nil
@@ -35,24 +35,24 @@ func (m *MemStore) Get(k any) (ret any) {
 	return w["v"]
 }
 
-func (m *MemStore) Delete(k any) error {
+func (m *mockMemRawStore) Delete(k any) error {
 	return m.s.Delete(k)
 }
 
-func (m *MemStore) ID() string {
+func (m *mockMemRawStore) ID() string {
 	return m.s.ID()
 }
 
-func (m *MemStore) Release() error {
+func (m *mockMemRawStore) Release() error {
 	return m.s.Release()
 }
 
-func (m *MemStore) Flush() error {
+func (m *mockMemRawStore) Flush() error {
 	return m.s.Flush()
 }
 
 type mockMemStore struct {
-	*MemStore
+	*mockMemRawStore
 }
 
 var _ Store = (*mockMemStore)(nil)
@@ -61,6 +61,6 @@ func (m mockMemStore) Destroy(writer http.ResponseWriter, request *http.Request)
 	return nil
 }
 
-func NewMockStore(sid string) Store {
-	return &mockMemStore{&MemStore{session.NewMemStore(sid)}}
+func NewMockMemStore(sid string) Store {
+	return &mockMemStore{&mockMemRawStore{session.NewMemStore(sid)}}
 }

routers/web/auth/auth_test.go

@@ -71,7 +71,7 @@ func TestSignUpOAuth2Login(t *testing.T) {
 		defer test.MockVariableValue(&gothic.CompleteUserAuth, func(res http.ResponseWriter, req *http.Request) (goth.User, error) {
 			return goth.User{Provider: "dummy-auth-source", UserID: "dummy-user"}, nil
 		})()
-		mockOpt := contexttest.MockContextOption{SessionStore: session.NewMockStore("dummy-sid")}
+		mockOpt := contexttest.MockContextOption{SessionStore: session.NewMockMemStore("dummy-sid")}
 		ctx, resp := contexttest.MockContext(t, "/user/oauth2/dummy-auth-source/callback?code=dummy-code", mockOpt)
 		ctx.SetPathParam("provider", "dummy-auth-source")
 		SignInOAuthCallback(ctx)
@@ -85,7 +85,7 @@ func TestSignUpOAuth2Login(t *testing.T) {
 	})
 
 	t.Run("OAuth2CallbackError", func(t *testing.T) {
-		mockOpt := contexttest.MockContextOption{SessionStore: session.NewMockStore("dummy-sid")}
+		mockOpt := contexttest.MockContextOption{SessionStore: session.NewMockMemStore("dummy-sid")}
 		ctx, resp := contexttest.MockContext(t, "/user/oauth2/dummy-auth-source/callback", mockOpt)
 		ctx.SetPathParam("provider", "dummy-auth-source")
 		SignInOAuthCallback(ctx)