FabInfra-Mirror/api.fabaccess-api
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git synced 2025-03-12 14:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed: Move Info to Struct

Browse Source
This commit is contained in:
TheJoKlLa 2021-08-27 21:42:36 +02:00
parent 7269f33cbb
commit 4595aaa1fa
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
machine.capnp
View File

@ -19,19 +19,9 @@ struct Machine {
disabled @4; disabled @4;
reserved @5; reserved @5;
} }
struct MachineInfoExtended {
struct MachineInfo { user @0 :User;
id @0 :General.UUID; transferuser @1 :User;
space @1 :Space;
name @2 :Text;
info @3 :Text;
state @4 :MachineState;
user @5 :User;
transferuser @6 :User;
manager @7:User;
} }
struct Reservation { struct Reservation {
@ -40,16 +30,23 @@ struct Machine {
end @2: UInt64; end @2: UInt64;
} }
info @0 :Info; id @0 :General.UUID;
space @1 :Space;
name @2 :Text;
description @3 :Text;
state @4 :MachineState;
manager @5:User;
info @6 :Info;
interface Info $CSharp.name("InfoInterface") { interface Info $CSharp.name("InfoInterface") {
getMachineInfo @0 () -> ( machineInfo :MachineInfo); getMachineInfoExtended @0 () -> ( machineInfoExtended :MachineInfoExtended);
getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) ); getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) );
getReservationList @2 () -> ( reservationList :List(Reservation) ); getReservationList @2 () -> ( reservationList :List(Reservation) );
} }
use @1 :Use; use @7 :Use;
interface Use $CSharp.name("UseInterface") { interface Use $CSharp.name("UseInterface") {
use @0 (); use @0 ();
@ -57,7 +54,7 @@ struct Machine {
reserveto @2 (start :UInt64, end :UInt64); reserveto @2 (start :UInt64, end :UInt64);
} }
inuse @2 :InUse; inuse @8 :InUse;
interface InUse $CSharp.name("InUseInterface") { interface InUse $CSharp.name("InUseInterface") {
giveBack @0 (); giveBack @0 ();
@ -66,19 +63,19 @@ struct Machine {
sendRawData @2 (data :Data); sendRawData @2 (data :Data);
} }
transfer @3 :Transfer; transfer @9 :Transfer;
interface Transfer $CSharp.name("TransferInterface") { interface Transfer $CSharp.name("TransferInterface") {
accept @0 (); accept @0 ();
reject @1 (); reject @1 ();
} }
check @4 :Check; check @10 :Check;
interface Check $CSharp.name("CheckInterface") { interface Check $CSharp.name("CheckInterface") {
check @0 (); check @0 ();
reject @1 (); reject @1 ();
} }
manage @5 :Manage; manage @11 :Manage;
interface Manage $CSharp.name("ManageInterface") { interface Manage $CSharp.name("ManageInterface") {
setProperty @0 (property :General.KeyValuePair); setProperty @0 (property :General.KeyValuePair);
removeProperty @1 (property :General.KeyValuePair); removeProperty @1 (property :General.KeyValuePair);
@ -92,7 +89,7 @@ struct Machine {
disabled @6 (); disabled @6 ();
} }
admin @6 :Admin; admin @12 :Admin;
interface Admin $CSharp.name("AdminInterface") { interface Admin $CSharp.name("AdminInterface") {
forceSetState @0 ( state :MachineState ); forceSetState @0 ( state :MachineState );
forceSetUser @1 ( user :User ); forceSetUser @1 ( user :User );

41
user.capnp
View File

@ -12,12 +12,9 @@ using Role = import "role.capnp".Role;
struct User struct User
{ {
struct UserInfo id @0 :General.UUID;
{ username @1 :Text;
id @0 :General.UUID; space @2 :Space;
username @1 :Text;
space @2 :Space;
}
struct UserInfoExtended struct UserInfoExtended
{ {
@ -32,29 +29,31 @@ struct User
} }
} }
info @0 :Info; info @3 :Info;
interface Info $CSharp.name("InfoInterface") { interface Info $CSharp.name("InfoInterface") {
getUserInfo @0 () -> ( userInfo :UserInfo );
}
manage @1 :Manage;
interface Manage $CSharp.name("ManageInterface") {
getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended ); getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
pwd @1 ( pwd :Text ) -> ();
addRole @2 ( role :Role ) -> ();
removeRole @3 ( role :Role ) -> ();
} }
cardDESFireEV2 @2 :CardDESFireEV2; manage @4 :Manage;
interface Manage $CSharp.name("ManageInterface") {
pwd @0 ( pwd :Text ) -> ();
}
admin @5 :Admin;
interface Admin $CSharp.name("AdminInterface") {
addRole @0 ( role :Role ) -> ();
removeRole @1 ( role :Role ) -> ();
}
cardDESFireEV2 @6 :CardDESFireEV2;
interface CardDESFireEV2 $CSharp.name("CardDESFireInterface") { interface CardDESFireEV2 $CSharp.name("CardDESFireInterface") {
getPIDList @0 () -> ( pids :List(Text) ); getPIDList @0 () -> ( pids :List(Text) );
getVersion @1 () -> ( version :Text ); getVersion @1 () -> ( version :Text );
getDomain @1 () -> ( Domain :Text ); getDomain @2 () -> ( Domain :Text );
getPID @2 () -> ( pid :Text ); getPID @3 () -> ( pid :Text );
bind @3 ( pid :Text, auth_key :Text ) -> (); bind @4 ( pid :Text, auth_key :Text ) -> ();
revoke @4 ( pid :Text ) -> (); revoke @5 ( pid :Text ) -> ();
} }
} }