SLightly tweak options

AlexProgrammerDE · Dec 29, 2024 · 35458a7 · 35458a7
1 parent 2a77971
commit 35458a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/proto/src/main/proto/soulfire/common.proto b/proto/src/main/proto/soulfire/common.proto
@@ -92,7 +92,9 @@ message SettingsNamespace {
 enum GlobalPermission {
   CREATE_INSTANCE = 0;
   SUBSCRIBE_LOGS = 1;
-  SERVER_CONFIG = 2;
+  READ_CLIENT_DATA = 2;
+  READ_SERVER_CONFIG = 3;
+  UPDATE_SERVER_CONFIG = 4;
 }
 
 enum InstancePermission {

diff --git a/proto/src/main/proto/soulfire/config.proto b/proto/src/main/proto/soulfire/config.proto
@@ -135,6 +135,7 @@ message ServerPlugin {
 }
 
 message ClientDataResponse {
+  string id = 6;
   string username = 1;
   repeated GlobalPermissionState serverPermissions = 2;
   repeated ServerPlugin plugins = 3;

diff --git a/server/src/main/java/com/soulfiremc/server/grpc/ConfigServiceImpl.java b/server/src/main/java/com/soulfiremc/server/grpc/ConfigServiceImpl.java
@@ -59,12 +59,14 @@ private Collection<ServerPlugin> getPlugins() {
   @Override
   public void getClientData(
     ClientDataRequest request, StreamObserver<ClientDataResponse> responseObserver) {
-    ServerRPCConstants.USER_CONTEXT_KEY.get().hasPermissionOrThrow(PermissionContext.global(GlobalPermission.SERVER_CONFIG));
+    ServerRPCConstants.USER_CONTEXT_KEY.get().hasPermissionOrThrow(PermissionContext.global(GlobalPermission.READ_CLIENT_DATA));
 
     try {
+      var currentUSer = ServerRPCConstants.USER_CONTEXT_KEY.get();
       responseObserver.onNext(
         ClientDataResponse.newBuilder()
-          .setUsername(ServerRPCConstants.USER_CONTEXT_KEY.get().getUsername())
+          .setId(currentUSer.getUniqueId().toString())
+          .setUsername(currentUSer.getUsername())
           .addAllServerPermissions(getGlobalPermissions())
           .addAllPlugins(getPlugins())
           .addAllSettings(soulFireServer.serverSettingsRegistry().exportSettingsMeta())