chore: tweak

zeromicro · Aug 8, 2024 · c16e42f · c16e42f
1 parent 118d707
commit c16e42f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/zrpc/server.go b/zrpc/server.go
@@ -52,10 +52,8 @@ func NewServer(c RpcServerConf, register internal.RegisterFn) (*RpcServer, error
 	metrics.SetName(c.Name)
 	setupStreamInterceptors(server, c)
 	setupUnaryInterceptors(server, c, metrics)
-	if c.Auth {
-		if err = setupAuthInterceptors(server, c); err != nil {
-			return nil, err
-		}
+	if err = setupAuthInterceptors(server, c); err != nil {
+		return nil, err
 	}
 
 	rpcServer := &RpcServer{
@@ -112,6 +110,9 @@ func SetServerSlowThreshold(threshold time.Duration) {
 }
 
 func setupAuthInterceptors(svr internal.Server, c RpcServerConf) error {
+	if !c.Auth {
+		return nil
+	}
 	rds, err := redis.NewRedis(c.Redis.RedisConf)
 	if err != nil {
 		return err

diff --git a/zrpc/server_test.go b/zrpc/server_test.go
@@ -272,6 +272,15 @@ func Test_setupStreamInterceptors(t *testing.T) {
 }
 
 func Test_setupAuthInterceptors(t *testing.T) {
+	t.Run("no need set auth", func(t *testing.T) {
+		s := &mockedServer{}
+		err := setupAuthInterceptors(s, RpcServerConf{
+			Auth:  false,
+			Redis: redis.RedisKeyConf{},
+		})
+		assert.NoError(t, err)
+	})
+
 	t.Run("redis error", func(t *testing.T) {
 		s := &mockedServer{}
 		err := setupAuthInterceptors(s, RpcServerConf{