From 51edd2fb90011e23d51112e768d814ec179fe3e2 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 19 Jul 2023 15:26:01 +0200
Subject: [PATCH 01/14] fix: Typo in hierarchy

---
 aruna/api/storage/services/v2/relations_service.proto | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aruna/api/storage/services/v2/relations_service.proto b/aruna/api/storage/services/v2/relations_service.proto
index 1133aba7..268a5bff 100644
--- a/aruna/api/storage/services/v2/relations_service.proto
+++ b/aruna/api/storage/services/v2/relations_service.proto
@@ -30,8 +30,8 @@ service RelationsService {
   // Status: BETA
   //
   // Gets all downstream hierarchy relations from a resource
-  rpc GetHierachy(GetHierachyRequest)
-    returns (GetHierachyResponse) {
+  rpc GetHierarchy(GetHierarchyRequest)
+    returns (GetHierarchyResponse) {
       option (google.api.http) = {
         get : "/v2/relation/hierarchy"
     };
@@ -46,7 +46,7 @@ message ModifyRelationsRequest {
 
 message ModifyRelationsResponse {}
 
-message GetHierachyRequest {
+message GetHierarchyRequest {
     string resource_id = 1;
 }
 
@@ -68,7 +68,7 @@ message ProjectRelations {
     repeated string object_children = 4;
 }
 
-message GetHierachyResponse {
+message GetHierarchyResponse {
     oneof graph {
         ProjectRelations project = 1;
         CollectionRelations collection = 2;

From ad6ca89c98ce0adb9c136e074aa04ac1bce8df28 Mon Sep 17 00:00:00 2001
From: Jannis Hochmuth <Jannis.Hochmuth@computational.bio.uni-giessen.de>
Date: Fri, 21 Jul 2023 09:28:46 +0200
Subject: [PATCH 02/14] refactor: Change user type to string to provide user_id

---
 aruna/api/notification/services/v2/notification_service.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index 9b29fbdc..a1b021c7 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -69,7 +69,7 @@ message ResourceTarget {
 message CreateStreamConsumerRequest {
   oneof target {
     ResourceTarget resource = 1;
-    bool user = 2;
+    string user = 2;
     bool anouncements = 3;
     bool all = 4;
   }

From fdb8152bd57e97c4acabeb9064943d041d4a9444 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Fri, 21 Jul 2023 11:18:22 +0200
Subject: [PATCH 03/14] feat: Added GetS3Credentials for user and svc_account

---
 .../services/v2/service_account_service.proto | 26 ++++++++++++++++++-
 .../storage/services/v2/user_service.proto    | 21 ++++++++-------
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index 9080b7ce..e6f20245 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -113,6 +113,18 @@ service ServiceAccountService {
       delete : "/v2/service_account/{svc_account_id}"
     };
   }
+
+    // GetS3Credentials
+  //
+  // Status: ALPHA
+  //
+  // Gets s3 credentials for a specific user and data_proxy
+  rpc GetS3Credentials(GetS3CredentialsRequest)
+      returns (GetS3CredentialsResponse) {
+    option (google.api.http) = {
+      get : "/v2/service_account/{svc_account_id}/s3_credentials"
+    };
+  }
 }
 
 message CreateServiceAccountRequest {
@@ -192,4 +204,16 @@ message DeleteServiceAccountRequest {
     string svc_account_id = 1;
 }
 
-message DeleteServiceAccountResponse {}
\ No newline at end of file
+message DeleteServiceAccountResponse {}
+
+
+message GetS3CredentialsRequest {
+  string svc_account_id = 1;
+  string endpoint_id = 2;
+}
+
+message GetS3CredentialsResponse {
+  string s3_access_key = 1;
+  string s3_secret_key = 2;
+  string s3_endpoint_url = 3;
+}
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index 96ca5390..9b9c620f 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -186,17 +186,18 @@ service UserService {
     };
   }
 
-  // MergeUserAccount
+  // GetS3Credentials
   //
   // Status: ALPHA
   //
-  // Get all users including permissions (Admin only)
-  rpc MergeUserAccount(MergeUserAccountRequest)
-      returns (MergeUserAccountResponse) {
+  // Gets s3 credentials for a specific user and data_proxy
+  rpc GetS3Credentials(GetS3CredentialsRequest)
+      returns (GetS3CredentialsResponse) {
     option (google.api.http) = {
-      get : "/v2/user/{user_id}/merge/{from_user_id}"
+      get : "/v2/user/{user_id}/s3_credentials"
     };
   }
+
 }
 
 message RegisterUserRequest {
@@ -336,11 +337,13 @@ message UpdateUserEmailResponse {
   storage.models.v2.User user = 1;
 }
 
-message MergeUserAccountRequest {
+message GetS3CredentialsRequest {
   string user_id = 1;
-  string from_user_id = 2;
+  string endpoint_id = 2;
 }
 
-message MergeUserAccountResponse {
-  storage.models.v2.User user = 1;
+message GetS3CredentialsResponse {
+  string s3_access_key = 1;
+  string s3_secret_key = 2;
+  string s3_endpoint_url = 3;
 }
\ No newline at end of file

From b10eb83eed29dbae45ba57ef3ac46985d411ce58 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Fri, 21 Jul 2023 11:23:21 +0200
Subject: [PATCH 04/14] feat: Added GetDataproxyToken request for
 ServiceAccount and User

---
 .../services/v2/service_account_service.proto | 25 ++++++++++++++++++-
 .../storage/services/v2/user_service.proto    | 25 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index e6f20245..62da913c 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -125,6 +125,19 @@ service ServiceAccountService {
       get : "/v2/service_account/{svc_account_id}/s3_credentials"
     };
   }
+
+
+  // GetDataproxyToken
+  //
+  // Status: ALPHA
+  //
+  // Gets token for a specific user and data_proxy
+  rpc GetDataproxyToken(GetDataproxyTokenRequest)
+      returns (GetDataproxyTokenResponse) {
+    option (google.api.http) = {
+      get : "/v2/user/{svc_account_id}/proxy_token"
+    };
+  }
 }
 
 message CreateServiceAccountRequest {
@@ -216,4 +229,14 @@ message GetS3CredentialsResponse {
   string s3_access_key = 1;
   string s3_secret_key = 2;
   string s3_endpoint_url = 3;
-}
\ No newline at end of file
+}
+
+
+message GetDataproxyTokenRequest {
+  string user_id = 1;
+  string endpoint_id = 2;
+}
+
+message GetDataproxyTokenResponse {
+  string token = 1;
+}
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index 9b9c620f..c8b9124b 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -198,6 +198,19 @@ service UserService {
     };
   }
 
+
+  // GetDataproxyToken
+  //
+  // Status: ALPHA
+  //
+  // Gets s3 credentials for a specific user and data_proxy
+  rpc GetDataproxyToken(GetDataproxyTokenRequest)
+      returns (GetDataproxyTokenResponse) {
+    option (google.api.http) = {
+      get : "/v2/user/{user_id}/proxy_token"
+    };
+  }
+
 }
 
 message RegisterUserRequest {
@@ -346,4 +359,14 @@ message GetS3CredentialsResponse {
   string s3_access_key = 1;
   string s3_secret_key = 2;
   string s3_endpoint_url = 3;
-}
\ No newline at end of file
+}
+
+
+message GetDataproxyTokenRequest {
+  string user_id = 1;
+  string endpoint_id = 2;
+}
+
+message GetDataproxyTokenResponse {
+  string token = 1;
+}

From 7482928bfa49f18dec7062adbf0900b74143d7ed Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Fri, 21 Jul 2023 16:54:55 +0200
Subject: [PATCH 05/14] feat: Update user to contain a single external_id

---
 aruna/api/storage/models/v2/models.proto         | 8 +-------
 aruna/api/storage/services/v2/user_service.proto | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index dcc0b0a2..3328d9a6 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -120,17 +120,11 @@ enum ResourceVariant {
 }
 
 // ------------- USERS & PERMISSIONS -----------------------
-
-message ExternalId {
-  string external_id = 1;
-  string idp = 2;
-}
-
 message User {
   // Internal Aruna UserID
   string id = 1;
   // Oidc subject ID
-  repeated ExternalId external_ids = 2;
+  string external_id = 2;
   // (optional) User display_name
   string display_name = 3;
   // Is the user activated
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index c8b9124b..b52bbe65 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -203,7 +203,7 @@ service UserService {
   //
   // Status: ALPHA
   //
-  // Gets s3 credentials for a specific user and data_proxy
+  // Gets token for a specific user and data_proxy
   rpc GetDataproxyToken(GetDataproxyTokenRequest)
       returns (GetDataproxyTokenResponse) {
     option (google.api.http) = {

From 357b48e819ed5ad59257884dca39c7d07f7e1912 Mon Sep 17 00:00:00 2001
From: Jannis Hochmuth <Jannis.Hochmuth@computational.bio.uni-giessen.de>
Date: Mon, 24 Jul 2023 09:27:11 +0200
Subject: [PATCH 06/14] feat: Rename DeleteEventStreamingGroup to
 DeleteStreamConsumer

---
 .../services/v2/notification_service.proto         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index a1b021c7..f9840962 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -16,9 +16,9 @@ import "aruna/api/storage/models/v2/models.proto";
 // A service to receive events in the AOS storage
 service EventNotificationService {
 
-  // CreateEventStreamingGroup
+  // CreateStreamConsumer
   //
-  // Creates a new EventStreamingGroup
+  // Creates a new event stream consumer.
   rpc CreateStreamConsumer(CreateStreamConsumerRequest)
       returns (CreateStreamConsumerResponse) {}
 
@@ -47,9 +47,9 @@ service EventNotificationService {
 
   // DeleteEventStreamingGroup
   //
-  // Deletes a existing EventStreamingGroup by ID
-  rpc DeleteEventStreamingGroup(DeleteEventStreamingGroupRequest)
-      returns (DeleteEventStreamingGroupResponse) {}
+  // Deletes an existing event stream consumer by ID.
+  rpc DeleteStreamConsumer(DeleteStreamConsumerRequest)
+      returns (DeleteStreamConsumerResponse) {}
 }
 
 
@@ -108,11 +108,11 @@ message AcknowledgeMessageBatchRequest {
 message AcknowledgeMessageBatchResponse {}
 
 
-message DeleteEventStreamingGroupRequest {
+message DeleteStreamConsumerRequest {
     string stream_consumer = 1;
 }
 
-message DeleteEventStreamingGroupResponse {}
+message DeleteStreamConsumerResponse {}
 
 message StreamFromSequence { uint64 sequence = 1; }
 

From 6c9756ecf072ab6692ee9b65d81184f213f5aba6 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Tue, 25 Jul 2023 14:38:47 +0200
Subject: [PATCH 07/14] feat: Update Token to be only included in
 user_attributes

---
 aruna/api/storage/models/v2/models.proto | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index 3328d9a6..973e682c 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -148,12 +148,10 @@ message Permission {
 message Token {
   string id = 1;
   string name = 2;
-  string user_id = 3;
-  google.protobuf.Timestamp created_at = 4;
-  google.protobuf.Timestamp expires_at = 5;
+  google.protobuf.Timestamp created_at = 3;
+  google.protobuf.Timestamp expires_at = 4;
   // Tokens can either be personal or resource "specific"
   Permission permission = 6;
-  google.protobuf.Timestamp used_at = 7;
 }
 
 

From 145c40aaf807b0949d8c5ea515015d9845a6598f Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Tue, 25 Jul 2023 16:37:32 +0200
Subject: [PATCH 08/14] fix: Linting s3credentials / svc account credentials

---
 .../services/v2/service_account_service.proto    | 16 ++++++++--------
 aruna/api/storage/services/v2/user_service.proto | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index 62da913c..e67a9914 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -119,8 +119,8 @@ service ServiceAccountService {
   // Status: ALPHA
   //
   // Gets s3 credentials for a specific user and data_proxy
-  rpc GetS3Credentials(GetS3CredentialsRequest)
-      returns (GetS3CredentialsResponse) {
+  rpc GetS3CredentialsSvcAccount(GetS3CredentialsSvcAccountRequest)
+      returns (GetS3CredentialsSvcAccountResponse) {
     option (google.api.http) = {
       get : "/v2/service_account/{svc_account_id}/s3_credentials"
     };
@@ -132,8 +132,8 @@ service ServiceAccountService {
   // Status: ALPHA
   //
   // Gets token for a specific user and data_proxy
-  rpc GetDataproxyToken(GetDataproxyTokenRequest)
-      returns (GetDataproxyTokenResponse) {
+  rpc GetDataproxyTokenSvcAccount(GetDataproxyTokenSvcAccountRequest)
+      returns (GetDataproxyTokenSvcAccountResponse) {
     option (google.api.http) = {
       get : "/v2/user/{svc_account_id}/proxy_token"
     };
@@ -220,23 +220,23 @@ message DeleteServiceAccountRequest {
 message DeleteServiceAccountResponse {}
 
 
-message GetS3CredentialsRequest {
+message GetS3CredentialsSvcAccountRequest {
   string svc_account_id = 1;
   string endpoint_id = 2;
 }
 
-message GetS3CredentialsResponse {
+message GetS3CredentialsSvcAccountResponse {
   string s3_access_key = 1;
   string s3_secret_key = 2;
   string s3_endpoint_url = 3;
 }
 
 
-message GetDataproxyTokenRequest {
+message GetDataproxyTokenSvcAccountRequest {
   string user_id = 1;
   string endpoint_id = 2;
 }
 
-message GetDataproxyTokenResponse {
+message GetDataproxyTokenSvcAccountResponse {
   string token = 1;
 }
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index b52bbe65..6e5fda19 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -191,8 +191,8 @@ service UserService {
   // Status: ALPHA
   //
   // Gets s3 credentials for a specific user and data_proxy
-  rpc GetS3Credentials(GetS3CredentialsRequest)
-      returns (GetS3CredentialsResponse) {
+  rpc GetS3CredentialsUser(GetS3CredentialsUserRequest)
+      returns (GetS3CredentialsUserResponse) {
     option (google.api.http) = {
       get : "/v2/user/{user_id}/s3_credentials"
     };
@@ -204,8 +204,8 @@ service UserService {
   // Status: ALPHA
   //
   // Gets token for a specific user and data_proxy
-  rpc GetDataproxyToken(GetDataproxyTokenRequest)
-      returns (GetDataproxyTokenResponse) {
+  rpc GetDataproxyTokenUser(GetDataproxyTokenUserRequest)
+      returns (GetDataproxyTokenUserResponse) {
     option (google.api.http) = {
       get : "/v2/user/{user_id}/proxy_token"
     };
@@ -350,23 +350,23 @@ message UpdateUserEmailResponse {
   storage.models.v2.User user = 1;
 }
 
-message GetS3CredentialsRequest {
+message GetS3CredentialsUserRequest {
   string user_id = 1;
   string endpoint_id = 2;
 }
 
-message GetS3CredentialsResponse {
+message GetS3CredentialsUserResponse {
   string s3_access_key = 1;
   string s3_secret_key = 2;
   string s3_endpoint_url = 3;
 }
 
 
-message GetDataproxyTokenRequest {
+message GetDataproxyTokenUserRequest {
   string user_id = 1;
   string endpoint_id = 2;
 }
 
-message GetDataproxyTokenResponse {
+message GetDataproxyTokenUserResponse {
   string token = 1;
 }

From ee2899fee5f303f27190b0b52f24dc830da57aa8 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Tue, 25 Jul 2023 16:41:48 +0200
Subject: [PATCH 09/14] feat: Added service account project to User

---
 aruna/api/storage/models/v2/models.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index 973e682c..bf27841a 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -162,7 +162,7 @@ message CustomAttributes {
 
 message UserAttributes {
   bool global_admin = 1;
-  bool service_account = 2;
+  string svc_account_project = 2;
   repeated Token tokens = 3;
   repeated CustomAttributes custom_attributes = 4; 
   repeated Permission personal_permissions = 5;

From 3efd741911923e2ac9fd713500090159ee204008 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Tue, 25 Jul 2023 16:48:43 +0200
Subject: [PATCH 10/14] feat: Revert service account attribute to bool

---
 aruna/api/storage/models/v2/models.proto                    | 4 ++--
 aruna/api/storage/services/v2/service_account_service.proto | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index bf27841a..a8017734 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -151,7 +151,7 @@ message Token {
   google.protobuf.Timestamp created_at = 3;
   google.protobuf.Timestamp expires_at = 4;
   // Tokens can either be personal or resource "specific"
-  Permission permission = 6;
+  Permission permission = 5;
 }
 
 
@@ -162,7 +162,7 @@ message CustomAttributes {
 
 message UserAttributes {
   bool global_admin = 1;
-  string svc_account_project = 2;
+  bool service_account = 2;
   repeated Token tokens = 3;
   repeated CustomAttributes custom_attributes = 4; 
   repeated Permission personal_permissions = 5;
diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index e67a9914..1b0d8503 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -142,7 +142,7 @@ service ServiceAccountService {
 
 message CreateServiceAccountRequest {
     string name = 1;
-    storage.models.v2.Permission permission = 3;
+    storage.models.v2.Permission permission = 2;
 }
 
 message ServiceAccount {

From afee7046b44d097596caa5a70f62b0276403021e Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 26 Jul 2023 09:32:48 +0200
Subject: [PATCH 11/14] feat: Added GetPublicResource to search

---
 .../storage/services/v2/search_service.proto  | 19 +++++++++++++++++++
 .../services/v2/service_account_service.proto |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/aruna/api/storage/services/v2/search_service.proto b/aruna/api/storage/services/v2/search_service.proto
index 9e7b597e..c0762e11 100644
--- a/aruna/api/storage/services/v2/search_service.proto
+++ b/aruna/api/storage/services/v2/search_service.proto
@@ -22,6 +22,17 @@ service SearchService {
       };
     }
 
+    // GetPublicResource
+    //
+    // Status: BETA
+    //
+    // Retrieves a public resource by its ID.
+    rpc GetPublicResource(GetPublicResourceRequest) returns (GetPublicResourceResponse){
+      option (google.api.http) = {
+        get : "/v2/public/{resource_id}"
+      };
+    }
+
 }
 
 message SearchResourcesRequest {
@@ -38,4 +49,12 @@ message SearchResourcesResponse {
     int64 estimated_total = 2;
     // The last index returned
     int64 last_index = 3;
+}
+
+message GetPublicResourceRequest {
+  string resource_id = 1;
+}
+
+message GetPublicResourceResponse {
+  storage.models.v2.GenericResource resources = 1;
 }
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index 1b0d8503..0dd247cc 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -114,7 +114,7 @@ service ServiceAccountService {
     };
   }
 
-    // GetS3Credentials
+  // GetS3Credentials
   //
   // Status: ALPHA
   //

From 7fbb60d1af3c8e89abc861e923031c76acb3079e Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 26 Jul 2023 11:30:37 +0200
Subject: [PATCH 12/14] feat: Added Context to GetDataProxyToken requests

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

diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index 6e5fda19..341198b2 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -361,10 +361,24 @@ message GetS3CredentialsUserResponse {
   string s3_endpoint_url = 3;
 }
 
+message Copy {
+  string resource = 1;
+  string target_endpoint = 2;
+  bool push = 3;
+}
+
+message Context {
+  oneof context {
+    bool s3_credentials = 1;
+    Copy copy = 2;
+  }
+}
+
 
 message GetDataproxyTokenUserRequest {
   string user_id = 1;
   string endpoint_id = 2;
+  Context context = 3;
 }
 
 message GetDataproxyTokenUserResponse {

From 6db62c6dfbf577d6ea6ffd8b6671ff8fe4318127 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Wed, 26 Jul 2023 11:32:21 +0200
Subject: [PATCH 13/14] feat: Added Context to GetDataProxyToken requests

---
 aruna/api/storage/models/v2/models.proto         | 15 +++++++++++++++
 .../services/v2/service_account_service.proto    |  1 +
 aruna/api/storage/services/v2/user_service.proto | 16 +---------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index a8017734..10719bb9 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -234,6 +234,21 @@ message Endpoint {
   repeated EndpointHostConfig host_configs = 6;
 }
 
+
+message Copy {
+  string resource = 1;
+  string target_endpoint = 2;
+  bool push = 3;
+}
+
+message Context {
+  oneof context {
+    bool s3_credentials = 1;
+    Copy copy = 2;
+  }
+}
+
+
 // ------ Resources ----------
 
 message GenericResource {
diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index 0dd247cc..0e9e90dc 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -235,6 +235,7 @@ message GetS3CredentialsSvcAccountResponse {
 message GetDataproxyTokenSvcAccountRequest {
   string user_id = 1;
   string endpoint_id = 2;
+  storage.models.v2.Context context = 3;
 }
 
 message GetDataproxyTokenSvcAccountResponse {
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index 341198b2..5a1965fc 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -361,24 +361,10 @@ message GetS3CredentialsUserResponse {
   string s3_endpoint_url = 3;
 }
 
-message Copy {
-  string resource = 1;
-  string target_endpoint = 2;
-  bool push = 3;
-}
-
-message Context {
-  oneof context {
-    bool s3_credentials = 1;
-    Copy copy = 2;
-  }
-}
-
-
 message GetDataproxyTokenUserRequest {
   string user_id = 1;
   string endpoint_id = 2;
-  Context context = 3;
+  storage.models.v2.Context context = 3;
 }
 
 message GetDataproxyTokenUserResponse {

From c2717736c98722d269e0f9d0eace7593250525fd Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 27 Jul 2023 13:26:04 +0200
Subject: [PATCH 14/14] feat: Added limit to search resource request

---
 aruna/api/storage/services/v2/search_service.proto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aruna/api/storage/services/v2/search_service.proto b/aruna/api/storage/services/v2/search_service.proto
index c0762e11..c379d972 100644
--- a/aruna/api/storage/services/v2/search_service.proto
+++ b/aruna/api/storage/services/v2/search_service.proto
@@ -38,7 +38,8 @@ service SearchService {
 message SearchResourcesRequest {
     string query = 1;
     string filter = 2;
-    int64 offset = 3;
+    int64 limit = 3;
+    int64 offset = 4;
 }