@sap-ux/axios-extension 1.11.4 → 1.11.6

package/dist/abap/lrep-service.js

@@ -14,6 +14,7 @@ const axios_1 = require("axios");
 const logger_1 = require("@sap-ux/logger");
 const fs_1 = require("fs");
 const odata_request_error_1 = require("../base/odata-request-error");
+const message_1 = require("./message");
 /**
  * Returns the namespace as string.
  *
@@ -134,17 +135,23 @@ class LayeredRepositoryService extends axios_1.Axios {
             if (params['package'].toUpperCase() !== '$TMP') {
                 params['changelist'] = config.transport;
             }
-            const response = yield this.request({
-                method: checkResponse.status === 200 ? 'PUT' : 'POST',
-                url: DTA_PATH_SUFFIX,
-                data,
-                params,
-                headers: {
-                    'Content-Type': 'application/octet-stream'
-                }
-            });
-            this.tryLogResponse(response, 'Deployment successful.');
-            return response;
+            try {
+                const response = yield this.request({
+                    method: checkResponse.status === 200 ? 'PUT' : 'POST',
+                    url: DTA_PATH_SUFFIX,
+                    data,
+                    params,
+                    headers: {
+                        'Content-Type': 'application/octet-stream'
+                    }
+                });
+                this.tryLogResponse(response, 'Deployment successful.');
+                return response;
+            }
+            catch (error) {
+                (0, message_1.logError)({ error, log: this.log });
+                throw error;
+            }
         });
     }
     /**

package/dist/abap/message.d.ts

@@ -73,4 +73,26 @@ export declare function prettyPrintError({ error, log, host, isDest }: {
  * @returns user friendly string
  */
 export declare const prettyPrintTimeInMs: (ms: number) => string;
+/**
+ * Log errors more user friendly if it is a standard Gateway error.
+ *
+ * @param e error thrown by Axios after sending a request
+ * @param e.error error from Axios
+ * @param e.log logger to be used
+ * @param e.host optional hostname
+ * @param e.isDest optional destination flag
+ */
+export declare function logError({ error, host, log, isDest }: {
+    error: Error;
+    host?: string;
+    log: Logger;
+    isDest?: boolean;
+}): void;
+/**
+ * Get ErrorMessage object from response contain an error as a string.
+ *
+ * @param data string value
+ * @returns undefined if an error object is not found or populated ErrorMessage object
+ */
+export declare function getErrorMessageFromString(data: unknown): ErrorMessage | undefined;
 //# sourceMappingURL=message.d.ts.map

package/dist/abap/message.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettyPrintTimeInMs = exports.prettyPrintError = exports.prettyPrintMessage = void 0;
+exports.getErrorMessageFromString = exports.logError = exports.prettyPrintTimeInMs = exports.prettyPrintError = exports.prettyPrintMessage = void 0;
 const url_1 = require("url");
+const axios_1 = require("axios");
 /**
  *
  * @param severity
@@ -121,4 +122,49 @@ const prettyPrintTimeInMs = (ms) => {
     }
 };
 exports.prettyPrintTimeInMs = prettyPrintTimeInMs;
+/**
+ * Log errors more user friendly if it is a standard Gateway error.
+ *
+ * @param e error thrown by Axios after sending a request
+ * @param e.error error from Axios
+ * @param e.log logger to be used
+ * @param e.host optional hostname
+ * @param e.isDest optional destination flag
+ */
+function logError({ error, host, log, isDest }) {
+    var _a, _b;
+    log.error(error.message);
+    if ((0, axios_1.isAxiosError)(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data)) {
+        const errorMessage = getErrorMessageFromString((_b = error.response) === null || _b === void 0 ? void 0 : _b.data);
+        if (errorMessage) {
+            prettyPrintError({ error: errorMessage, log: log, host: host, isDest: isDest });
+        }
+        else {
+            log.error(error.response.data.toString());
+        }
+    }
+}
+exports.logError = logError;
+/**
+ * Get ErrorMessage object from response contain an error as a string.
+ *
+ * @param data string value
+ * @returns undefined if an error object is not found or populated ErrorMessage object
+ */
+function getErrorMessageFromString(data) {
+    let error;
+    if (typeof data === 'string') {
+        try {
+            const errorMsg = JSON.parse(data);
+            if (errorMsg.error) {
+                error = errorMsg.error;
+            }
+        }
+        catch (_a) {
+            // Not much we can do!
+        }
+    }
+    return error;
+}
+exports.getErrorMessageFromString = getErrorMessageFromString;
 //# sourceMappingURL=message.js.map

package/dist/abap/ui5-abap-repository-service.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
-import type { AxiosResponse, AxiosRequestConfig } from 'axios';
-import type { ErrorMessage } from './message';
+import { type AxiosResponse, type AxiosRequestConfig } from 'axios';
 import { ODataService } from '../base/odata-service';
 /**
  * Required configuration a transportable object.
@@ -161,23 +160,5 @@ export declare class Ui5AbapRepositoryService extends ODataService {
      * @returns the Axios response object for further processing
      */
     protected deleteRepoRequest(appName: string, config: AxiosRequestConfig, tryCount?: number): Promise<AxiosResponse>;
-    /**
-     * Log errors more user friendly if it is a standard Gateway error.
-     *
-     * @param e error thrown by Axios after sending a request
-     * @param e.error error from Axios
-     * @param e.host hostname
-     */
-    protected logError({ error, host }: {
-        error: Error;
-        host?: string;
-    }): void;
-    /**
-     * Get ErrorMessage object from response contain an error as a string.
-     *
-     * @param data string value
-     * @returns undefined if an error object is not found or populated ErrorMessage object
-     */
-    protected getErrorMessageFromString(data: unknown): ErrorMessage | undefined;
 }
 //# sourceMappingURL=ui5-abap-repository-service.d.ts.map

package/dist/abap/ui5-abap-repository-service.js

@@ -144,7 +144,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 else {
                     // Test mode returns a HTTP response code of 403 so we dont want to show all error messages
                     (0, message_1.prettyPrintError)({
-                        error: this.getErrorMessageFromString(response === null || response === void 0 ? void 0 : response.data),
+                        error: (0, message_1.getErrorMessageFromString)(response === null || response === void 0 ? void 0 : response.data),
                         log: this.log,
                         host: frontendUrl,
                         isDest: this.isDest
@@ -153,7 +153,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 return response;
             }
             catch (error) {
-                this.logError({ error, host: frontendUrl });
+                (0, message_1.logError)({ error, host: frontendUrl, log: this.log, isDest: this.isDest });
                 throw error;
             }
         });
@@ -191,7 +191,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 }
             }
             catch (error) {
-                this.logError({ error, host });
+                (0, message_1.logError)({ error, host, log: this.log });
                 throw error;
             }
         });
@@ -359,47 +359,6 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
             }
         });
     }
-    /**
-     * Log errors more user friendly if it is a standard Gateway error.
-     *
-     * @param e error thrown by Axios after sending a request
-     * @param e.error error from Axios
-     * @param e.host hostname
-     */
-    logError({ error, host }) {
-        var _a, _b;
-        this.log.error(error.message);
-        if ((0, odata_request_error_1.isAxiosError)(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data)) {
-            const errorMessage = this.getErrorMessageFromString((_b = error.response) === null || _b === void 0 ? void 0 : _b.data);
-            if (errorMessage) {
-                (0, message_1.prettyPrintError)({ error: errorMessage, host, log: this.log, isDest: this.isDest });
-            }
-            else {
-                this.log.error(error.response.data.toString());
-            }
-        }
-    }
-    /**
-     * Get ErrorMessage object from response contain an error as a string.
-     *
-     * @param data string value
-     * @returns undefined if an error object is not found or populated ErrorMessage object
-     */
-    getErrorMessageFromString(data) {
-        let error;
-        if (typeof data === 'string') {
-            try {
-                const errorMsg = JSON.parse(data);
-                if (errorMsg.error) {
-                    error = errorMsg.error;
-                }
-            }
-            catch (_a) {
-                // Not much we can do!
-            }
-        }
-        return error;
-    }
 }
 exports.Ui5AbapRepositoryService = Ui5AbapRepositoryService;
 Ui5AbapRepositoryService.PATH = '/sap/opu/odata/UI5/ABAP_REPOSITORY_SRV';

package/dist/auth/reentrance-ticket/index.js

@@ -16,9 +16,9 @@ const abap_system_1 = require("./abap-system");
 const redirect_1 = require("./redirect");
 /**
  * DO NOT USE THIS SERVICE ENDPOINT DIRECTLY.
- *  It might change without notice.
+ * It might be removed in the future without notice.
  */
-const ADT_REENTRANCE_ENDPOINT = '/sap/bc/adt/core/http/reentranceticket';
+const ADT_REENTRANCE_ENDPOINT = '/sap/bc/sec/reentrance';
 /**
  * Get the reentrance ticket from the backend.
  *
@@ -30,15 +30,16 @@ const ADT_REENTRANCE_ENDPOINT = '/sap/bc/adt/core/http/reentranceticket';
 function getReentranceTicket({ backendUrl, logger, timeout = connection_1.defaultTimeout }) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {
-            var _a;
+            var _a, _b;
             const backend = new abap_system_1.ABAPSystem(backendUrl);
             // Start local server to listen to redirect call, with timeout
             const { server, redirectUrl } = (0, redirect_1.setupRedirectHandling)({ resolve, reject, timeout, backend, logger });
             server.listen();
             const redirectPort = server.address().port;
             // Open browser to handle SAML flow and return the reentrance ticket
-            const url = `${backend.uiHostname()}${ADT_REENTRANCE_ENDPOINT}?redirect-url=${redirectUrl(redirectPort)}`;
-            (_a = open(url)) === null || _a === void 0 ? void 0 : _a.catch((error) => logger.error(error));
+            const scenario = (_a = process.env.SCENARIO) !== null && _a !== void 0 ? _a : 'FIORI';
+            const url = `${backend.uiHostname()}${ADT_REENTRANCE_ENDPOINT}?scenario=${scenario}&redirect-url=${redirectUrl(redirectPort)}`;
+            (_b = open(url)) === null || _b === void 0 ? void 0 : _b.catch((error) => logger.error(error));
         });
     });
 }

package/dist/index.d.ts

@@ -5,5 +5,6 @@ export * from './base/service-provider';
 export * from './abap';
 export * from './factory';
 export * from './auth';
+export * from './abap/message';
 export { AxiosError, AxiosRequestConfig, isAxiosError };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -22,4 +22,5 @@ __exportStar(require("./base/service-provider"), exports);
 __exportStar(require("./abap"), exports);
 __exportStar(require("./factory"), exports);
 __exportStar(require("./auth"), exports);
+__exportStar(require("./abap/message"), exports);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "description": "Extension of the Axios module adding convenience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@types/lodash": "4.14.202",
     "nock": "13.4.0",
     "supertest": "6.3.3",
-    "@sap-ux/project-access": "1.19.2"
+    "@sap-ux/project-access": "1.19.6"
   },
   "files": [
     "dist",