From 3996e66d147be70447b5398e69d61f2eb74b9eb7 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 5 Apr 2023 15:11:30 +0200
Subject: [PATCH 1/4] feat: Added more verbose info on register_user

---
 aruna/api/storage/services/v1/user_service.proto | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/aruna/api/storage/services/v1/user_service.proto b/aruna/api/storage/services/v1/user_service.proto
index 11a77e00..39d7893b 100644
--- a/aruna/api/storage/services/v1/user_service.proto
+++ b/aruna/api/storage/services/v1/user_service.proto
@@ -156,8 +156,12 @@ message ExpiresAt {
 }
 
 message RegisterUserRequest {
-  // Optional user_displayname
+  // user_displayname
   string display_name = 1;
+  // Mail address
+  string email = 2;
+  // Project description string (optional)
+  string project = 3;
 }
 
 message RegisterUserResponse {
@@ -179,6 +183,8 @@ message CreateAPITokenRequest {
   ExpiresAt expires_at = 4;
   // Token permissions
   storage.models.v1.Permission permission = 5;
+  // Session token
+  bool is_session = 6;
 }
 
 message CreateAPITokenResponse {

From f649c5313aefe440e72773bcfdfb831ef267a512 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 5 Apr 2023 15:16:21 +0200
Subject: [PATCH 2/4] feat: Added project_permissions to activate_user_request

---
 aruna/api/storage/services/v1/user_service.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aruna/api/storage/services/v1/user_service.proto b/aruna/api/storage/services/v1/user_service.proto
index 39d7893b..f8bde7c0 100644
--- a/aruna/api/storage/services/v1/user_service.proto
+++ b/aruna/api/storage/services/v1/user_service.proto
@@ -276,6 +276,8 @@ message GetUserProjectsResponse {
 message ActivateUserRequest {
   // User to activate
   string user_id = 1;
+  // (optional) add user to project
+  storage.models.v1.ProjectPermission project_perms = 2;
 }
 
 message ActivateUserResponse {}

From 31bd67efe555cc06a8209d8d19d84701da466506 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 5 Apr 2023 15:20:54 +0200
Subject: [PATCH 3/4] feat: Added admin request to get all user

---
 .../storage/services/v1/user_service.proto    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/aruna/api/storage/services/v1/user_service.proto b/aruna/api/storage/services/v1/user_service.proto
index f8bde7c0..39d82d06 100644
--- a/aruna/api/storage/services/v1/user_service.proto
+++ b/aruna/api/storage/services/v1/user_service.proto
@@ -148,6 +148,18 @@ service UserService {
       get : "/v1/user/not_activated"
     };
   }
+
+  // GetAllUsers
+  //
+  // Status: ALPHA
+  //
+  // Get all users inkluding permissions (Admin only)
+  rpc GetAllUsers(GetAllUsersRequest)
+      returns (GetAllUsersResponse) {
+    option (google.api.http) = {
+      get : "/v1/user/all"
+    };
+  }
 }
 
 message ExpiresAt {
@@ -287,4 +299,17 @@ message GetNotActivatedUsersRequest {}
 message GetNotActivatedUsersResponse {
   // List of users that are not yet activated
   repeated storage.models.v1.User users = 1;
+}
+
+message GetAllUsersRequest {
+  bool include_permissions = 1;
+}
+
+message UserWithPerms {
+  storage.models.v1.User user = 1;
+  repeated storage.models.v1.ProjectPermission project_perms = 2;
+}
+
+message GetAllUsersResponse {
+  repeated UserWithPerms user_with_perms = 1;
 }
\ No newline at end of file

From 5924d6c00b4cb7b7ca117ed06cc3f5fb4d535058 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 5 Apr 2023 15:23:42 +0200
Subject: [PATCH 4/4] feat: Added deactivate user request

---
 .../storage/services/v1/user_service.proto    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/aruna/api/storage/services/v1/user_service.proto b/aruna/api/storage/services/v1/user_service.proto
index 39d82d06..d029142a 100644
--- a/aruna/api/storage/services/v1/user_service.proto
+++ b/aruna/api/storage/services/v1/user_service.proto
@@ -31,7 +31,19 @@ service UserService {
     };
   }
 
-  // ActivateUser 
+  // DeActivateUser 
+  //
+  // Status: ALPHA
+  //
+  // This deactivates a specific user (Admin request)
+  rpc DeactivateUser(DeactivateUserRequest) returns (DeactivateUserResponse) {
+    option (google.api.http) = {
+      patch : "/v1/user/{user_id}/deactivate"
+      body : "*"
+    };
+  }
+
+    // ActivateUser 
   //
   // Status: STABLE
   //
@@ -312,4 +324,12 @@ message UserWithPerms {
 
 message GetAllUsersResponse {
   repeated UserWithPerms user_with_perms = 1;
-}
\ No newline at end of file
+}
+
+
+message DeactivateUserRequest {
+  // User to activate
+  string user_id = 1;
+}
+
+message DeactivateUserResponse {}
\ No newline at end of file