fix

Author: kuzmadom

src/server/middlewares/tenant-settings.ts

@@ -1,40 +1,44 @@
 import type {NextFunction, Request, Response} from '@gravity-ui/expresskit';
 import {REQUEST_ID_PARAM_NAME} from '@gravity-ui/nodekit';
 
+import {onFail} from '../callbacks';
 import {registry} from '../registry';
 import type {DatalensGatewaySchemas} from '../types/gateway';
 
 export function getTenantSettingsMiddleware() {
-    return async function tenantSettingsMiddleware(
-        req: Request,
-        res: Response,
-        next: NextFunction,
-    ) {
+    async function resolveTenantSettings(req: Request, res: Response, next: NextFunction) {
         const {ctx} = req;
 
-        try {
-            const requestId = req.ctx.get(REQUEST_ID_PARAM_NAME);
-            const currentTenantId = 'common';
+        const requestId = req.ctx.get(REQUEST_ID_PARAM_NAME);
+        const currentTenantId = 'common';
 
-            const {gatewayApi} = registry.getGatewayApi<DatalensGatewaySchemas>();
-            const {getAuthArgsUSPrivate} = registry.common.auth.getAll();
-            const authArgsUSPrivate = getAuthArgsUSPrivate(req, res);
+        const {gatewayApi} = registry.getGatewayApi<DatalensGatewaySchemas>();
+        const {getAuthArgsUSPrivate} = registry.common.auth.getAll();
+        const authArgsUSPrivate = getAuthArgsUSPrivate(req, res);
 
-            const tenantDetailsResponce = await gatewayApi.usPrivate._getTenantDetails({
-                ctx,
-                headers: req.headers,
-                requestId: requestId ?? '',
-                authArgs: authArgsUSPrivate,
-                args: {tenantId: currentTenantId},
-            });
-            const resolvedTenant = tenantDetailsResponce.responseData;
-            res.locals.tenantDefaultColorPaletteId = resolvedTenant.settings?.defaultColorPaletteId;
+        const tenantDetailsResponce = await gatewayApi.usPrivate._getTenantDetails({
+            ctx,
+            headers: req.headers,
+            requestId: requestId ?? '',
+            authArgs: authArgsUSPrivate,
+            args: {tenantId: currentTenantId},
+        });
+        const resolvedTenant = tenantDetailsResponce.responseData;
+        res.locals.tenantDefaultColorPaletteId = resolvedTenant.settings?.defaultColorPaletteId;
 
-            next();
-        } catch (error) {
-            ctx.logError('TENANT_RESOLVED_FAILED', error);
+        next();
+    }
 
-            next(error);
-        }
+    return function resolveTenantSettingsMiddleware(
+        req: Request,
+        res: Response,
+        next: NextFunction,
+    ) {
+        resolveTenantSettings(req, res, next)
+            .catch((error) => {
+                req.ctx.logError('TENANT_RESOLVED_FAILED', error);
+                onFail(req, res);
+            })
+            .catch((error) => next(error));
     };
 }

tests/docker-compose.e2e.yml

@@ -114,6 +114,7 @@ services:
     environment:
       APP_MODE: full
       APP_ENV: production
+      US_MASTER_TOKEN: ${US_MASTER_TOKEN:-us-master-token}
       APP_INSTALLATION: opensource
       AUTH_POLICY: disabled
       US_ENDPOINT: http://us:8080
@@ -140,6 +141,7 @@ services:
     environment:
       APP_MODE: full
       APP_ENV: production
+      US_MASTER_TOKEN: ${US_MASTER_TOKEN:-us-master-token}
       APP_INSTALLATION: opensource
       AUTH_POLICY: disabled
       US_ENDPOINT: http://us:8080