Forráskód Böngészése

fix(api-gateway): remove calling both auth and payments on account deletion request

Karol Sójko 1 éve
szülő
commit
6b554c28b7

+ 0 - 5
packages/api-gateway/src/Controller/v1/UsersController.ts

@@ -23,7 +23,6 @@ export class UsersController extends BaseHttpController {
     @inject(TYPES.ApiGateway_ServiceProxy) private httpService: ServiceProxyInterface,
     @inject(TYPES.ApiGateway_EndpointResolver) private endpointResolver: EndpointResolverInterface,
     @inject(TYPES.ApiGateway_Logger) private logger: Logger,
-    @inject(TYPES.ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER) private isConfiguredForHomeServer: boolean,
   ) {
     super()
   }
@@ -238,10 +237,6 @@ export class UsersController extends BaseHttpController {
 
   @httpDelete('/:userUuid', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
   async deleteUser(request: Request, response: Response): Promise<void> {
-    if (!this.isConfiguredForHomeServer) {
-      await this.httpService.callPaymentsServer(request, response, 'api/account', request.body, true)
-    }
-
     await this.httpService.callAuthServer(
       request,
       response,

+ 1 - 16
packages/api-gateway/src/Service/Http/HttpServiceProxy.ts

@@ -151,7 +151,6 @@ export class HttpServiceProxy implements ServiceProxyInterface {
     response: Response,
     endpointOrMethodIdentifier: string,
     payload?: Record<string, unknown> | string,
-    returnRawResponse?: boolean,
   ): Promise<void | Response<unknown, Record<string, unknown>>> {
     if (!this.paymentsServerUrl) {
       this.logger.debug('Payments Server URL not defined. Skipped request to Payments API.')
@@ -159,18 +158,13 @@ export class HttpServiceProxy implements ServiceProxyInterface {
       return
     }
 
-    const rawResponse = await this.callServerWithLegacyFormat(
+    await this.callServerWithLegacyFormat(
       this.paymentsServerUrl,
       request,
       response,
       endpointOrMethodIdentifier,
       payload,
-      returnRawResponse,
     )
-
-    if (returnRawResponse) {
-      return rawResponse
-    }
   }
 
   async callAuthServerWithLegacyFormat(
@@ -345,7 +339,6 @@ export class HttpServiceProxy implements ServiceProxyInterface {
     response: Response,
     endpointOrMethodIdentifier: string,
     payload?: Record<string, unknown> | string,
-    returnRawResponse?: boolean,
   ): Promise<void | Response<unknown, Record<string, unknown>>> {
     const serviceResponse = await this.getServerResponse(
       serverUrl,
@@ -364,18 +357,10 @@ export class HttpServiceProxy implements ServiceProxyInterface {
     if (serviceResponse.request._redirectable._redirectCount > 0) {
       response.status(302)
 
-      if (returnRawResponse) {
-        return response
-      }
-
       response.redirect(serviceResponse.request.res.responseUrl)
     } else {
       response.status(serviceResponse.status)
 
-      if (returnRawResponse) {
-        return response
-      }
-
       response.send(serviceResponse.data)
     }
   }

+ 0 - 1
packages/api-gateway/src/Service/Http/ServiceProxyInterface.ts

@@ -42,7 +42,6 @@ export interface ServiceProxyInterface {
     response: Response,
     endpointOrMethodIdentifier: string,
     payload?: Record<string, unknown> | string,
-    returnRawResponse?: boolean,
   ): Promise<void | Response<unknown, Record<string, unknown>>>
   callWebSocketServer(
     request: Request,