From 66bda1eed5a7d9b0384da508cab8c28fa990ad3c Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Fri, 27 Aug 2021 00:28:33 +0200
Subject: [PATCH] Fixed: Parse Errors

---
 machinesystem.capnp    |  7 +++----
 permissionsystem.capnp |  8 +++++---
 role.capnp             | 10 +++-------
 user.capnp             |  9 ++++++---
 usersystem.capnp       |  7 +++----
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/machinesystem.capnp b/machinesystem.capnp
index b74f074..1001b06 100644
--- a/machinesystem.capnp
+++ b/machinesystem.capnp
@@ -8,18 +8,17 @@ $CSharp.namespace("FabAccessAPI.Schema");
 
 using General = import "general.capnp";
 using Machine = import "machine.capnp".Machine;
-using Space = import "space.capnp".Space;
 
 interface MachineSystem 
 {
-	info @0 :Info;
+	info @0 () -> ( info : Info );
     interface Info $CSharp.name("InfoInterface") {
-    	getMachineList @0 () -> ( machines :List(Machine) );
+    	getMachineList @0 () -> ( machine_list :List(Machine) );
 
     	getMachine @1 ( uuid :General.UUID ) -> ( machine :Machine);
 	}
 
-	manage @1 :Manage;
+	manage @1 () -> ( manage : Manage );
     interface Manage $CSharp.name("ManageInterface") {
     	addMachine @0 (machine :Machine);
     	updateMachine @1 (machine :Machine);
diff --git a/permissionsystem.capnp b/permissionsystem.capnp
index 592d6f6..b284687 100644
--- a/permissionsystem.capnp
+++ b/permissionsystem.capnp
@@ -6,15 +6,17 @@ $Rust.parentModule("schema");
 using CSharp = import "programming_language/csharp.capnp";
 $CSharp.namespace("FabAccessAPI.Schema");
 
+using Role = import "role.capnp".Role;
+
 interface PermissionSystem 
 {
-    info @0 :Info;
+    info @0 () -> ( info : Info );
     interface Info $CSharp.name("InfoInterface") {
     	
 	}
 
-	manage @1 :Manage;
+	manage @1 () -> ( manage : Manage );
     interface Manage $CSharp.name("ManageInterface") {
-    	getRoleList @0 () -> ( role_list :List(Text) );
+    	getRoleList @0 () -> ( role_list :List(Role) );
 	}
 }
\ No newline at end of file
diff --git a/role.capnp b/role.capnp
index 6dd0aab..68e7435 100644
--- a/role.capnp
+++ b/role.capnp
@@ -1,4 +1,4 @@
-@0xbacaff4190ac7d80;
+@0xb61c6ec239895b01;
 
 using Rust = import "programming_language/rust.capnp";
 $Rust.parentModule("schema");
@@ -6,11 +6,7 @@ $Rust.parentModule("schema");
 using CSharp = import "programming_language/csharp.capnp";
 $CSharp.namespace("FabAccessAPI.Schema");
 
-using General = import "general.capnp";
-
-struct Space 
+struct Role 
 {
-    id @0 :General.UUID;
-    name @1 :Text;
-    info @2 :Text;
+    name @0 :Text;
 }
\ No newline at end of file
diff --git a/user.capnp b/user.capnp
index 6fa0ce5..6da218a 100644
--- a/user.capnp
+++ b/user.capnp
@@ -8,6 +8,7 @@ $CSharp.namespace("FabAccessAPI.Schema");
 
 using General = import "general.capnp";
 using Space = import "space.capnp".Space;
+using Role = import "role.capnp".Role;
 
 struct User
 {
@@ -40,11 +41,13 @@ struct User
     interface Manage $CSharp.name("ManageInterface") {
         getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
         pwd @1 ( pwd :Text ) -> ();
-        addRole @2 ( )
+        
+        addRole @2 ( role :Role ) -> ();
+        removeRole @3 ( role :Role ) -> ();
     }
 
-    card_DESFire @2 :Card_DESFire;
-    interface Card_DESFire $CSharp.name("CardDESFireInterface") {
+    cardDESFire @2 :CardDESFire;
+    interface CardDESFire $CSharp.name("CardDESFireInterface") {
         getPIDList @0 () -> ( pids :List(Text) );
         getNewURL @1 () -> ( url :Text );
         bind @2 ( pid :Text, auth_key :Text ) -> ();
diff --git a/usersystem.capnp b/usersystem.capnp
index 1a092ce..e742ba3 100644
--- a/usersystem.capnp
+++ b/usersystem.capnp
@@ -11,17 +11,16 @@ using User = import "user.capnp".User;
 
 interface UserSystem 
 {
-    info @0 :Info;
+	info @0 () -> ( info : Info );
     interface Info $CSharp.name("InfoInterface") {
-    	getUserSelf @1 ( ) -> ( user :User );
+    	getUserSelf @0 ( ) -> ( user :User );
 	}
 
-	manage @1 :Manage;
+	manage @1 () -> ( manage : Manage );
     interface Manage $CSharp.name("ManageInterface") {
     	getUserList @0 () -> ( user_list :List(User) );
 
     	addUser @1 (username :Text, password: Text) -> ( user :User );
     	removeUser @2 (user :User );
-    	#updateUser @3 (user :User );
 	}
 }
\ No newline at end of file