@gravity-ui/gateway 2.2.0 → 2.3.0

package/README.md

@@ -72,6 +72,7 @@ type ProxyHeadersFunction = (
   type: ControllerType,
 ) => IncomingHttpHeaders;
 type ProxyHeaders = string[] | ProxyHeadersFunction;
+type ResponseContentType = AxiosResponse['headers']['Content-Type'];
 
 interface GatewayConfig {
   // Gateway Installation (external/internal/...). If the configuration is not provided, it is determined from process.env.APP_INSTALLATION.
@@ -119,7 +120,7 @@ interface GatewayConfig {
   // Configuration for automatic connection re-establishment upon connection error through L3 load balancer (default is true).
   grpcRecreateService?: boolean;
   // Enable verification of response contentType header. Actual only for REST actions. This value can be set / redefined the in action confg.
-  expectedResponseContentType?: AxiosResponse['headers']['Content-Type'];
+  expectedResponseContentType?: ResponseContentType | ResponseContentType[];
 }
 ```
 

package/build/components/rest.js

@@ -225,26 +225,34 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
             requestData.requestTime = endRequestTime - startRequestTime;
             const actualResponseContentType = (_f = response.headers) === null || _f === void 0 ? void 0 : _f['Content-Type'];
             const expectedResponseContentType = config.expectedResponseContentType || options.expectedResponseContentType;
-            if (actualResponseContentType &&
-                expectedResponseContentType &&
-                actualResponseContentType !== expectedResponseContentType) {
-                ctx.log('Invalid response content type', {
-                    expectedResponseContentType,
-                    actualResponseContentType,
-                });
-                ctx.end();
-                return Promise.reject({
-                    error: {
-                        status: 415,
-                        message: 'Response content type validation failed',
-                        code: 'INVALID_RESPONSE_CONTENT_TYPE',
-                        details: {
-                            title: 'Invalid response content type',
-                            description: `Expected to get ${expectedResponseContentType} but got ${actualResponseContentType}`,
+            if (actualResponseContentType && expectedResponseContentType) {
+                let isInvalidResponseContentType;
+                if (Array.isArray(expectedResponseContentType)) {
+                    isInvalidResponseContentType = !expectedResponseContentType.includes(String(actualResponseContentType));
+                }
+                else {
+                    isInvalidResponseContentType =
+                        expectedResponseContentType !== actualResponseContentType;
+                }
+                if (isInvalidResponseContentType) {
+                    ctx.log('Invalid response content type', {
+                        expectedResponseContentType,
+                        actualResponseContentType,
+                    });
+                    ctx.end();
+                    return Promise.reject({
+                        error: {
+                            status: 415,
+                            message: 'Response content type validation failed',
+                            code: 'INVALID_RESPONSE_CONTENT_TYPE',
+                            details: {
+                                title: 'Invalid response content type',
+                                description: `Expected to get ${expectedResponseContentType} but got ${actualResponseContentType}`,
+                            },
                         },
-                    },
-                    debugHeaders,
-                });
+                        debugHeaders,
+                    });
+                }
             }
             if (config.transformResponseData) {
                 try {

package/build/models/common.d.ts

@@ -71,6 +71,7 @@ export type GetAuthHeadersParams<AuthArgs = Record<string, unknown>> = {
     authArgs: AuthArgs | undefined;
 };
 export type GetAuthHeaders<AuthArgs = Record<string, unknown>> = (params: GetAuthHeadersParams<AuthArgs>) => Record<string, string> | undefined;
+export type ResponseContentType = AxiosResponse['headers']['Content-Type'];
 export interface GatewayApiOptions<Context extends GatewayContext> {
     serviceName: string;
     timeout?: number;
@@ -81,7 +82,7 @@ export interface GatewayApiOptions<Context extends GatewayContext> {
     proxyHeaders?: ProxyHeaders;
     validationSchema?: object;
     encodePathArgs?: boolean;
-    expectedResponseContentType?: AxiosResponse['headers']['Content-Type'];
+    expectedResponseContentType?: ResponseContentType | ResponseContentType[];
     getAuthHeaders: GetAuthHeaders;
 }
 export interface ParamsOutput {
@@ -125,7 +126,7 @@ export interface ApiServiceRestActionConfig<Context extends GatewayContext, TOut
     path: (args: TParams) => string;
     paramsSerializer?: AxiosRequestConfig['paramsSerializer'];
     responseType?: AxiosRequestConfig['responseType'];
-    expectedResponseContentType?: AxiosResponse['headers']['Content-Type'];
+    expectedResponseContentType?: ResponseContentType | ResponseContentType[];
     maxRedirects?: number;
 }
 export interface ApiServiceBaseGrpcActionConfig<Context extends GatewayContext, TOutput, TParams = undefined, TTransformed = TOutput> extends ApiServiceBaseActionConfig<Context, TOutput, TParams, TTransformed> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/gateway",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "",
   "license": "MIT",
   "main": "build/index.js",