accounts: remove checks of account === sessionAccount in controllers

rucio · Sep 18, 2023 · 1dd7548 · 1dd7548
1 parent 60c8c21
commit 1dd7548
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 40 deletions.
diff --git a/src/lib/core/use-case/get-subscription-usecase.ts b/src/lib/core/use-case/get-subscription-usecase.ts
@@ -23,19 +23,6 @@ class GetSubscriptionUseCase extends BaseSingleEndpointUseCase<AuthenticatedRequ
             } as GetSubscriptionError
         }
 
-        if(requestModel.sessionAccount !== requestModel.account) {
-            return {
-                error: 'INVALID_ACCOUNT',
-                message: 'Account specified in the request is not same as the account present in the session',
-            } as GetSubscriptionError
-        }
-
-        if(requestModel.name === '' || requestModel.name === undefined) {
-            return {
-                error: 'INVALID_REQUEST',
-                message: 'Name is required',
-            } as GetSubscriptionError
-        }
         if(requestModel.rucioAuthToken === '' || requestModel.rucioAuthToken === undefined) {
             return {
                 error: 'INVALID_AUTH',

diff --git a/src/lib/core/use-case/list-subscriptions-usecase.ts b/src/lib/core/use-case/list-subscriptions-usecase.ts
@@ -33,22 +33,6 @@ class ListSubscriptionsUseCase extends BaseSingleEndpointStreamingUseCase<
                 message: 'The account specified in the request is an empty string',
             } as ListSubscriptionsError
         }
-
-        if(requestModel.sessionAccount === '' || requestModel.sessionAccount === undefined) {
-            return {
-                status: 'error',
-                error: 'INVALID_ACCOUNT',
-                message: 'The account specified in the session is an empty string. Check if you are logged in.',
-            } as ListSubscriptionsError
-        }
-
-        if (requestModel.sessionAccount != requestModel.account) {
-            return {
-                status: 'error',
-                error: 'INVALID_ACCOUNT',
-                message: 'The account specified in the request is not same as the account present in the session',
-            } as ListSubscriptionsError
-        }
     }
     async makeGatewayRequest(requestModel: AuthenticatedRequestModel<ListSubscriptionsRequest>): Promise<ListSubscriptionsDTO> {
         const { rucioAuthToken, account } = requestModel;

diff --git a/src/lib/core/usecase-models/get-subscription-usecase-models.ts b/src/lib/core/usecase-models/get-subscription-usecase-models.ts
@@ -3,7 +3,6 @@ import { Subscription } from "../entity/rucio";
 
 export interface GetSubscriptionRequest {
     account: string;
-    sessionAccount: string;
     name: string;
 }
 

diff --git a/src/lib/core/usecase-models/list-subscriptions-usecase-models.ts b/src/lib/core/usecase-models/list-subscriptions-usecase-models.ts
@@ -9,7 +9,6 @@ import { Subscription } from "../entity/rucio";
  */
 export interface ListSubscriptionsRequest {
     account: string;
-    sessionAccount: string;
 }
 
 export interface ListSubscriptionsResponse extends Subscription, BaseResponseModel {}

diff --git a/src/lib/infrastructure/controller/get-subscription-controller.ts b/src/lib/infrastructure/controller/get-subscription-controller.ts
@@ -7,7 +7,6 @@ import USECASE_FACTORY from "../ioc/ioc-symbols-usecase-factory";
 
 export type GetSubscriptionControllerParameters = TAuthenticatedControllerParameters & {
     name: string;
-    account: string;
     sessionAccount: string;
 }
 
@@ -23,8 +22,7 @@ export default class GetSubscriptionController extends BaseController<GetSubscri
     prepareRequestModel(parameters: GetSubscriptionControllerParameters): GetSubscriptionRequest {
         return {
             name: parameters.name,
-            account: parameters.account,
-            sessionAccount: parameters.sessionAccount,
+            account: parameters.sessionAccount,
             rucioAuthToken: parameters.rucioAuthToken
         } as GetSubscriptionRequest;
     }

diff --git a/src/lib/infrastructure/controller/list-subscriptions-controller.ts b/src/lib/infrastructure/controller/list-subscriptions-controller.ts
@@ -7,7 +7,6 @@ import { NextApiResponse } from "next";
 import USECASE_FACTORY from "../ioc/ioc-symbols-usecase-factory";
 
 export type ListSubscriptionsControllerParameters = TAuthenticatedControllerParameters & {
-    account: string;
     sessionAccount: string;
 }
 
@@ -20,9 +19,8 @@ class ListSubscriptionsController extends BaseController<ListSubscriptionsContro
     }
     prepareRequestModel(parameters: ListSubscriptionsControllerParameters): AuthenticatedRequestModel<ListSubscriptionsRequest> {
         return {
-            account: parameters.account,
-            sessionAccount: parameters.sessionAccount,
-            rucioAuthToken: parameters.rucioAuthToken
+            rucioAuthToken: parameters.rucioAuthToken,
+            account: parameters.sessionAccount,
         }
     }
 }

diff --git a/src/pages/api/feature/get-subscription.ts b/src/pages/api/feature/get-subscription.ts
@@ -33,7 +33,6 @@ async function getSubscription(req: NextApiRequest, res: NextApiResponse, rucioA
     const controller: GetSubscriptionController = appContainer.get(CONTROLLERS.GET_SUBSCRIPTION)
     const controllerParameters: GetSubscriptionControllerParameters = {
         response: res,
-        account: account,
         name: name,
         sessionAccount: sessionUser?.rucioAccount,
         rucioAuthToken: rucioAuthToken

diff --git a/src/pages/api/feature/list-subscription.ts b/src/pages/api/feature/list-subscription.ts
@@ -33,7 +33,6 @@ async function listSubscriptions(req:NextApiRequest, res: NextApiResponse, rucio
 
     const controllerParameters: ListSubscriptionsControllerParameters = {
         response: res,
-        account: account,
         sessionAccount: sessionAccount,
         rucioAuthToken: rucioAuthToken
     }