perf: update user fields

LeeEirc · LeeEirc · commit 35187ce82896 · 2025-12-02T18:32:56.000+08:00
diff --git a/cmd/impl/convert_pb.go b/cmd/impl/convert_pb.go
@@ -21,6 +21,8 @@ func ConvertToProtobufUser(user model.User) *pb.User {
 		IsActive:    user.IsActive,
 		SystemRoles: systemRoles,
 		OrgRoles:    orgRoles,
+		IsOrgAdmin:  user.IsOrgAdmin,
+		IsSuperuser: user.IsSuperuser,
 	}
 }
 
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/elastic/go-elasticsearch/v8 v8.14.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.25.4+incompatible
-	github.com/jumpserver-dev/sdk-go v0.0.0-20251201074529-80d314122472
+	github.com/jumpserver-dev/sdk-go v0.0.0-20251202100642-4cf5cf0a6c8a
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
diff --git a/go.sum b/go.sum
@@ -63,8 +63,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jumpserver-dev/sdk-go v0.0.0-20251201074529-80d314122472 h1:Q1Shgnw1nJL3KG+AeEOhc6JUitrXDgeFpmI2oUh1scc=
-github.com/jumpserver-dev/sdk-go v0.0.0-20251201074529-80d314122472/go.mod h1:CDNCGOGgeudYS4IKsHOG+ma1rBSbjv8toKtRax2Z0EE=
+github.com/jumpserver-dev/sdk-go v0.0.0-20251202100642-4cf5cf0a6c8a h1:VdK2hysyHHyZuAsv84ZfFUVX8R2J5Igp3yeWScoS58U=
+github.com/jumpserver-dev/sdk-go v0.0.0-20251202100642-4cf5cf0a6c8a/go.mod h1:CDNCGOGgeudYS4IKsHOG+ma1rBSbjv8toKtRax2Z0EE=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
diff --git a/protobuf-go/protobuf/common.pb.go b/protobuf-go/protobuf/common.pb.go
diff --git a/protobuf-java/org/jumpserver/wisp/Common.java b/protobuf-java/org/jumpserver/wisp/Common.java
diff --git a/protobuf-py/protobuf/common_pb2.py b/protobuf-py/protobuf/common_pb2.py
diff --git a/protobuf-py/protobuf/common_pb2.pyi b/protobuf-py/protobuf/common_pb2.pyi
@@ -35,7 +35,7 @@ ReviewAccept: RiskLevel
 ReviewCancel: RiskLevel
 
 class User(_message.Message):
-    __slots__ = ("id", "name", "username", "role", "is_valid", "is_active", "org_roles", "system_roles")
+    __slots__ = ("id", "name", "username", "role", "is_valid", "is_active", "org_roles", "system_roles", "is_superuser", "is_org_admin")
     ID_FIELD_NUMBER: _ClassVar[int]
     NAME_FIELD_NUMBER: _ClassVar[int]
     USERNAME_FIELD_NUMBER: _ClassVar[int]
@@ -44,6 +44,8 @@ class User(_message.Message):
     IS_ACTIVE_FIELD_NUMBER: _ClassVar[int]
     ORG_ROLES_FIELD_NUMBER: _ClassVar[int]
     SYSTEM_ROLES_FIELD_NUMBER: _ClassVar[int]
+    IS_SUPERUSER_FIELD_NUMBER: _ClassVar[int]
+    IS_ORG_ADMIN_FIELD_NUMBER: _ClassVar[int]
     id: str
     name: str
     username: str
@@ -52,7 +54,9 @@ class User(_message.Message):
     is_active: bool
     org_roles: _containers.RepeatedCompositeFieldContainer[OrgRole]
     system_roles: _containers.RepeatedCompositeFieldContainer[SystemRole]
-    def __init__(self, id: _Optional[str] = ..., name: _Optional[str] = ..., username: _Optional[str] = ..., role: _Optional[str] = ..., is_valid: bool = ..., is_active: bool = ..., org_roles: _Optional[_Iterable[_Union[OrgRole, _Mapping]]] = ..., system_roles: _Optional[_Iterable[_Union[SystemRole, _Mapping]]] = ...) -> None: ...
+    is_superuser: bool
+    is_org_admin: bool
+    def __init__(self, id: _Optional[str] = ..., name: _Optional[str] = ..., username: _Optional[str] = ..., role: _Optional[str] = ..., is_valid: bool = ..., is_active: bool = ..., org_roles: _Optional[_Iterable[_Union[OrgRole, _Mapping]]] = ..., system_roles: _Optional[_Iterable[_Union[SystemRole, _Mapping]]] = ..., is_superuser: bool = ..., is_org_admin: bool = ...) -> None: ...
 
 class OrgRole(_message.Message):
     __slots__ = ("id", "name", "display_name")
diff --git a/protobuf-rs/message.rs b/protobuf-rs/message.rs
@@ -18,6 +18,10 @@ pub struct User {
     pub org_roles: ::prost::alloc::vec::Vec<OrgRole>,
     #[prost(message, repeated, tag="8")]
     pub system_roles: ::prost::alloc::vec::Vec<SystemRole>,
+    #[prost(bool, tag="9")]
+    pub is_superuser: bool,
+    #[prost(bool, tag="10")]
+    pub is_org_admin: bool,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OrgRole {
diff --git a/protos/common.proto b/protos/common.proto
@@ -13,6 +13,8 @@ message User {
   bool is_active = 6;
   repeated OrgRole org_roles = 7;
   repeated SystemRole system_roles = 8;
+  bool is_superuser = 9;
+  bool is_org_admin = 10;
 }
 
 message OrgRole {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ func ConvertToProtobufUser(user model.User) *pb.User {`
`21`	`21`	`IsActive: user.IsActive,`
`22`	`22`	`SystemRoles: systemRoles,`
`23`	`23`	`OrgRoles: orgRoles,`
	`24`	`+ IsOrgAdmin: user.IsOrgAdmin,`
	`25`	`+ IsSuperuser: user.IsSuperuser,`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ message User {`
`13`	`13`	`bool is_active = 6;`
`14`	`14`	`repeated OrgRole org_roles = 7;`
`15`	`15`	`repeated SystemRole system_roles = 8;`
	`16`	`+ bool is_superuser = 9;`
	`17`	`+ bool is_org_admin = 10;`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`message OrgRole {`