Add sources params to ctx (#1962)

datalens-tech · Dec 19, 2024 · 183089f · 183089f
1 parent 39b8a8f
commit 183089f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/src/@types/nodekit.d.ts b/src/@types/nodekit.d.ts
@@ -111,6 +111,10 @@ export interface SharedAppContextParams {
         ) => Promise<ResolveEntryByLinkComponentResponse>;
     };
 
+    sources: {
+        reqBody: Request['body'];
+    };
+
     getAppLayoutSettings: (req: Request, res: Response, name?: string) => AppLayoutSettings;
     landingPageSettings?: LandingPageSettings;
 

diff --git a/src/server/components/charts-engine/components/processor/data-fetcher.ts b/src/server/components/charts-engine/components/processor/data-fetcher.ts
@@ -646,15 +646,6 @@ export class DataFetcher {
             userTargetUriUi = sourceConfig.uiEndpoint + croppedTargetUri;
         }
 
-        if (sourceConfig.adapter) {
-            return sourceConfig.adapter({
-                targetUri: croppedTargetUri,
-                sourceName,
-                req,
-                ctx,
-            });
-        }
-
         if (sourceConfig.adapterWithContext) {
             return sourceConfig.adapterWithContext({
                 targetUri: croppedTargetUri,
@@ -675,7 +666,9 @@ export class DataFetcher {
         if (sourceType === 'charts') {
             const incomingHeader = originalReqHeaders.xChartsFetcherVia || '';
 
-            const scriptName = req.body.params ? '/editor/' + req.body.params.name : req.body.path;
+            const {reqBody} = ctx.get('sources');
+
+            const scriptName = reqBody.params ? '/editor/' + reqBody.params.name : reqBody.path;
 
             if (incomingHeader && !Array.isArray(incomingHeader)) {
                 const circular = incomingHeader.split(',').some((someScriptName) => {
@@ -733,7 +726,7 @@ export class DataFetcher {
 
             const sourceAuthorizationHeaders = getSourceAuthorizationHeaders({
                 req,
-                chartsEngine,
+                ctx,
                 sourceConfig,
                 subrequestHeaders,
             });

diff --git a/src/server/components/charts-engine/types.ts b/src/server/components/charts-engine/types.ts
@@ -152,21 +152,6 @@ export type SourceConfig = {
     preprocess?: (url: string) => string;
     allowedMethods?: ('GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE')[];
 
-    /**
-     * @deprecated
-     **/
-    adapter?: ({
-        targetUri,
-        sourceName,
-        req,
-        ctx,
-    }: {
-        targetUri: string;
-        sourceName: string;
-        req: Request;
-        ctx: AppContext;
-    }) => unknown;
-
     adapterWithContext?: ({
         targetUri,
         sourceName,

diff --git a/src/server/registry/units/common/functions-map.ts b/src/server/registry/units/common/functions-map.ts
@@ -1,18 +1,18 @@
 import type {Request, Response} from '@gravity-ui/expresskit';
+import type {AppContext} from '@gravity-ui/nodekit';
 
 import type {Palette} from '../../../../shared/constants/colors';
 import type {GetEntryByKeyResponse} from '../../../../shared/schema';
 import {makeFunctionTemplate} from '../../../../shared/utils/makeFunctionTemplate';
-import type {ChartsEngine} from '../../../components/charts-engine';
 import type {SourceConfig} from '../../../components/charts-engine/types';
 
 export const commonFunctionsMap = {
     getAvailablePalettesMap: makeFunctionTemplate<() => Record<string, Palette>>(),
     getSourceAuthorizationHeaders:
         makeFunctionTemplate<
             (args: {
-                chartsEngine: ChartsEngine;
-                req: Request;
+                req?: Request;
+                ctx: AppContext;
                 sourceConfig: SourceConfig;
                 subrequestHeaders: Record<string, string>;
             }) => Record<string, string>