@sap-ux/backend-proxy-middleware 0.7.20 → 0.7.22

package/README.md

@@ -16,8 +16,9 @@ It can be used either with the `ui5 serve` or the `fiori run` commands.
 | `pathReplace`  | `string` optional      | If provided then the path will be replaced with this value before forwarding |
 | `client`      | `string` optional      | sap-client parameter |
 | `scp`         | `boolean` optional      | If set to true the proxy will execute the required OAuth routine for the ABAP environment on SAP BTP |
-| `apiHub`      | `boolean` optional      | If set to true then the proxy will connect to the SAP API Business Hub
-| `proxy`       | `string` optional      | If set then it will override the proxy settings from node.
+| `apiHub`      | `boolean` optional      | If set to true then the proxy will connect to the SAP API Business Hub |
+| `proxy`       | `string` optional      | If set then it will override the proxy settings from node. |
+| `authenticationType` | `string` optional  | Authentication mechanism to be used in VSCode. Currently supported: "ReentranceTicket" |
 
 Additional optional experimental property `bsp` (type `string`): The BSP property is only needed for the FLP Embedded Flow. The property refers to the BSP Application Name. In that case, we need to redirect the manifest.appdescr request to the local manifest.json in order to overwrite the deployed application with the local one.
 

package/dist/base/proxy.d.ts

@@ -96,7 +96,7 @@ export declare function enhanceConfigsForDestination(proxyOptions: Options & {
  */
 export declare function enhanceConfigForSystem(proxyOptions: Options & {
     headers: object;
-}, system: BackendSystem, oAuthRequired: boolean | undefined, tokenChangedCallback: (refreshToken?: string) => void): Promise<void>;
+}, system: BackendSystem | undefined, oAuthRequired: boolean | undefined, tokenChangedCallback: (refreshToken?: string) => void): Promise<void>;
 /**
  * Generate options for the proxy middleware based on the input.
  *

package/dist/base/proxy.js

@@ -241,7 +241,7 @@ exports.enhanceConfigsForDestination = enhanceConfigsForDestination;
 function enhanceConfigForSystem(proxyOptions, system, oAuthRequired, tokenChangedCallback) {
     return __awaiter(this, void 0, void 0, function* () {
         if (oAuthRequired) {
-            if (system.serviceKeys) {
+            if (system === null || system === void 0 ? void 0 : system.serviceKeys) {
                 const provider = (0, axios_extension_1.createForAbapOnCloud)({
                     environment: axios_extension_1.AbapCloudEnvironment.Standalone,
                     service: system.serviceKeys,
@@ -255,16 +255,19 @@ function enhanceConfigForSystem(proxyOptions, system, oAuthRequired, tokenChange
                 throw new Error('Cannot connect to ABAP Environment on BTP without service keys.');
             }
         }
-        else if (system.authenticationType === store_1.AuthenticationType.ReentranceTicket) {
+        else if ((system === null || system === void 0 ? void 0 : system.authenticationType) === store_1.AuthenticationType.ReentranceTicket) {
             const provider = (0, axios_extension_1.createForAbapOnCloud)({
+                ignoreCertErrors: proxyOptions.secure === false,
                 environment: axios_extension_1.AbapCloudEnvironment.EmbeddedSteampunk,
                 url: system.url
             });
             // sending a request to the backend to get cookies
-            yield provider.getAtoInfo();
-            proxyOptions.headers['cookie'] = provider.cookies.toString();
+            const ato = yield provider.getAtoInfo();
+            if (ato) {
+                proxyOptions.headers['cookie'] = provider.cookies.toString();
+            }
         }
-        else if (system.username && system.password) {
+        else if ((system === null || system === void 0 ? void 0 : system.username) && system.password) {
             proxyOptions.auth = `${system.username}:${system.password}`;
         }
     });
@@ -279,7 +282,7 @@ exports.enhanceConfigForSystem = enhanceConfigForSystem;
  * @returns options for the http-proxy-middleware
  */
 function generateProxyMiddlewareOptions(backend, options = {}, logger = new logger_1.ToolsLogger()) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         // add required options
         const proxyOptions = Object.assign(Object.assign(Object.assign({ headers: {} }, exports.ProxyEventHandlers), { onError: (err, req, res, target) => {
@@ -303,22 +306,24 @@ function generateProxyMiddlewareOptions(backend, options = {}, logger = new logg
             // check if system credentials are stored in the store
             try {
                 const systemStore = yield (0, store_1.getService)({ logger, entityName: 'system' });
-                const system = yield systemStore.read(new store_1.BackendSystemKey({ url: localBackend.url, client: localBackend.client }));
-                if (system) {
-                    yield enhanceConfigForSystem(proxyOptions, system, backend.scp, (refreshToken, accessToken) => {
-                        if (refreshToken) {
-                            logger.info('Updating refresh token for: ' + localBackend.url);
-                            systemStore.write(Object.assign(Object.assign({}, system), { refreshToken })).catch((error) => logger.error(error));
-                        }
-                        if (accessToken) {
-                            logger.info('Setting access token');
-                            proxyOptions.headers['authorization'] = `bearer ${accessToken}`;
-                        }
-                        else {
-                            logger.warn('Setting of access token failed.');
-                        }
-                    });
-                }
+                const system = (_b = (yield systemStore.read(new store_1.BackendSystemKey({ url: localBackend.url, client: localBackend.client })))) !== null && _b !== void 0 ? _b : {
+                    name: '<unknown>',
+                    url: localBackend.url,
+                    authenticationType: localBackend.authenticationType
+                };
+                yield enhanceConfigForSystem(proxyOptions, system, backend.scp, (refreshToken, accessToken) => {
+                    if (refreshToken) {
+                        logger.info('Updating refresh token for: ' + localBackend.url);
+                        systemStore.write(Object.assign(Object.assign({}, system), { refreshToken })).catch((error) => logger.error(error));
+                    }
+                    if (accessToken) {
+                        logger.info('Setting access token');
+                        proxyOptions.headers['authorization'] = `bearer ${accessToken}`;
+                    }
+                    else {
+                        logger.warn('Setting of access token failed.');
+                    }
+                });
             }
             catch (error) {
                 logger.warn('Accessing the credentials store failed.');

package/dist/base/types.d.ts

@@ -1,3 +1,4 @@
+import type { AuthenticationType } from '@sap-ux/store';
 import type { Options } from 'http-proxy-middleware';
 export interface BaseBackendConfig {
     /**
@@ -16,6 +17,10 @@ export interface BaseBackendConfig {
      * If set to true the proxy will execute the required OAuth routine for the ABAP environment on SAP BTP
      */
     scp?: boolean;
+    /**
+     * Authentication mechanism to be used. Currently supported: "ReentranceTicket"
+     */
+    authenticationType?: AuthenticationType;
     /**
      * If set to true then the proxy will connect to the SAP API Business Hub
      */

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Abackend-proxy-middleware"
   },
-  "version": "0.7.20",
+  "version": "0.7.22",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "i18next": "20.6.1",
     "prompts": "2.4.2",
     "proxy-from-env": "1.1.0",
-    "@sap-ux/axios-extension": "1.11.4",
+    "@sap-ux/axios-extension": "1.11.6",
     "@sap-ux/btp-utils": "0.14.3",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/store": "0.5.0"