Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/sparkly-rivers-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sap-ux/backend-proxy-middleware': patch
---

fix: simplify type usage
3 changes: 0 additions & 3 deletions packages/backend-proxy-middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@
"supertest": "7.1.4",
"yaml": "2.2.2"
},
"ui5": {
"dependencies": []
},
"engines": {
"node": ">=20.x"
}
Expand Down
7 changes: 0 additions & 7 deletions packages/backend-proxy-middleware/src/base/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,3 @@ export interface BackendMiddlewareConfig {
options?: Partial<Options>;
debug?: boolean;
}

export interface MiddlewareParameters<T> {
resources: object;
options: {
configuration: T;
};
}
13 changes: 9 additions & 4 deletions packages/backend-proxy-middleware/src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { LogLevel, ToolsLogger, UI5ToolingTransport } from '@sap-ux/logger';
import type { RequestHandler } from 'express';
import express from 'express';
import { createProxyMiddleware } from 'http-proxy-middleware';
import type { BackendMiddlewareConfig, MiddlewareParameters } from './base/types';
import type { BackendMiddlewareConfig } from './base/types';
import { generateProxyMiddlewareOptions, initI18n } from './base/proxy';
import type { MiddlewareParameters } from '@ui5/server';

/**
* Hides the proxy credentials for displaying the proxy configuration in the console.
Expand Down Expand Up @@ -33,6 +34,11 @@ function formatProxyForLogging(proxy: string | undefined): string | undefined {
* @returns {*} {(Promise<RequestHandler>)}
*/
module.exports = async ({ options }: MiddlewareParameters<BackendMiddlewareConfig>): Promise<RequestHandler> => {
const backend = options.configuration?.backend;
if (!backend) {
throw new Error('no backend configuration found.');
}

const logger = new ToolsLogger({
logLevel: options.configuration?.debug ? LogLevel.Debug : LogLevel.Info,
transports: [new UI5ToolingTransport({ moduleName: 'backend-proxy-middleware' })]
Expand All @@ -42,13 +48,12 @@ module.exports = async ({ options }: MiddlewareParameters<BackendMiddlewareConfi
dotenv.config();
const router = express.Router();

const backend = options.configuration.backend;
const configOptions = options.configuration.options ?? {};
const configOptions = options.configuration?.options ?? {};
configOptions.secure = configOptions.secure !== undefined ? !!configOptions.secure : true;
configOptions.logger = options.configuration?.debug ? logger : undefined;

try {
const proxyOptions = await generateProxyMiddlewareOptions(options.configuration.backend, configOptions, logger);
const proxyOptions = await generateProxyMiddlewareOptions(backend, configOptions, logger);
const proxyFn = createProxyMiddleware(proxyOptions);
logger.info(
`Starting backend-proxy-middleware using following configuration:\nbackend: ${JSON.stringify({
Expand Down
11 changes: 7 additions & 4 deletions packages/backend-proxy-middleware/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"extends": "../../tsconfig.json",
"include": ["src", "src/**/*.json"],
"include": [
"../../types/ui5.d.ts",
"src",
"src/**/*.json"],
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"references": [
{ "path": "../axios-extension" },
{ "path": "../btp-utils" },
{ "path": "../logger" },
{ "path": "../axios-extension" },
{ "path": "../btp-utils" },
{ "path": "../logger" },
{ "path": "../store" }
]
}
Loading