From 0767abadcf5618cf82fd3cde60c915cbb2872dbc Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Tue, 26 Dec 2023 15:11:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20perxis-proto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../grpc/protobuf_type_converters.microgen.go | 15 +++++++++++----
.../grpc/protobuf_type_converters.microgen.go | 10 ++++++++--
.../grpc/protobuf_type_converters.microgen.go | 15 +++++++++++----
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go b/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
index 890bb0c2..bad21c1b 100644
--- a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
@@ -136,8 +136,8 @@ func PtrPermissionRuleToProto(rule *permission.Rule) (*commonpb.Rule, error) {
Actions: actions,
Access: commonpb.Access(rule.Access),
HiddenFields: rule.HiddenFields,
- ReadonlyFields: rule.DenyReadFields,
- WriteonlyFields: rule.DenyWriteFields,
+ ReadonlyFields: rule.DenyWriteFields,
+ WriteonlyFields: rule.DenyReadFields,
ReadFilter: rule.ReadFilter,
WriteFilter: rule.WriteFilter,
DenyReadFields: rule.DenyReadFields,
@@ -153,7 +153,7 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
for _, a := range protoRule.Actions {
actions = append(actions, permission.Action(a))
}
- return &permission.Rule{
+ r := &permission.Rule{
CollectionID: protoRule.CollectionId,
Actions: actions,
Access: permission.Access(protoRule.Access),
@@ -162,5 +162,12 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
DenyWriteFields: protoRule.DenyWriteFields,
ReadFilter: protoRule.ReadFilter,
WriteFilter: protoRule.WriteFilter,
- }, nil
+ }
+ if len(r.DenyReadFields) == 0 {
+ r.DenyReadFields = protoRule.WriteonlyFields
+ }
+ if len(r.DenyWriteFields) == 0 {
+ r.DenyWriteFields = protoRule.ReadonlyFields
+ }
+ return r, nil
}
diff --git a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
index 6e09f6a4..b115b147 100644
--- a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
@@ -56,8 +56,8 @@ func PtrCollectionToProto(coll *service.Collection) (*pb.Collection, error) {
HiddenFields: coll.Access.HiddenFields,
ReadonlyFields: coll.Access.DenyReadFields,
WriteonlyFields: coll.Access.DenyWriteFields,
- DenyReadFields: coll.Access.DenyReadFields,
- DenyWriteFields: coll.Access.DenyWriteFields,
+ DenyReadFields: coll.Access.DenyWriteFields,
+ DenyWriteFields: coll.Access.DenyReadFields,
}
}
protoCollection := &pb.Collection{
@@ -117,6 +117,12 @@ func ProtoToPtrCollection(protoCollection *pb.Collection) (*service.Collection,
DenyReadFields: protoCollection.Access.DenyReadFields,
DenyWriteFields: protoCollection.Access.DenyWriteFields,
}
+ if len(access.DenyReadFields) == 0 {
+ access.DenyReadFields = protoCollection.Access.WriteonlyFields
+ }
+ if len(access.DenyWriteFields) == 0 {
+ access.DenyWriteFields = protoCollection.Access.ReadonlyFields
+ }
}
collection := &service.Collection{
ID: protoCollection.Id,
diff --git a/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go b/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
index 67089c7b..4dca1e28 100644
--- a/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
@@ -82,8 +82,8 @@ func PtrPermissionRuleToProto(rule *permission.Rule) (*commonpb.Rule, error) {
Actions: actions,
Access: commonpb.Access(rule.Access),
HiddenFields: rule.HiddenFields,
- ReadonlyFields: rule.DenyReadFields,
- WriteonlyFields: rule.DenyWriteFields,
+ ReadonlyFields: rule.DenyWriteFields,
+ WriteonlyFields: rule.DenyReadFields,
ReadFilter: rule.ReadFilter,
WriteFilter: rule.WriteFilter,
DenyReadFields: rule.DenyReadFields,
@@ -99,7 +99,7 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
for _, a := range protoRule.Actions {
actions = append(actions, permission.Action(a))
}
- return &permission.Rule{
+ r := &permission.Rule{
CollectionID: protoRule.CollectionId,
Actions: actions,
Access: permission.Access(protoRule.Access),
@@ -108,5 +108,12 @@ func ProtoToPtrPermissionRule(protoRule *commonpb.Rule) (*permission.Rule, error
DenyWriteFields: protoRule.DenyWriteFields,
ReadFilter: protoRule.ReadFilter,
WriteFilter: protoRule.WriteFilter,
- }, nil
+ }
+ if len(r.DenyReadFields) == 0 {
+ r.DenyReadFields = protoRule.WriteonlyFields
+ }
+ if len(r.DenyWriteFields) == 0 {
+ r.DenyWriteFields = protoRule.ReadonlyFields
+ }
+ return r, nil
}
--
GitLab