@sap-ux/axios-extension 1.0.3 → 1.1.0

package/dist/abap/abap-service-provider.d.ts

@@ -12,6 +12,10 @@ import { AdtService } from './adt-catalog/services';
 export declare class AbapServiceProvider extends ServiceProvider {
     s4Cloud: boolean | undefined;
     protected atoSettings: AtoSettings;
+    /**
+     * Maintain the public facing URL which is required for destination related flows
+     */
+    protected _publicUrl: string;
     /**
      * Get the name of the currently logged in user. This is the basic implementation that could be overwritten by subclasses.
      * The function returns a promise because it may be required to fetch the information from the backend.
@@ -31,6 +35,18 @@ export declare class AbapServiceProvider extends ServiceProvider {
      * @returns ABAP Transport Organizer settings
      */
     getAtoInfo(): Promise<AtoSettings>;
+    /**
+     * Set the public facing URL, typically used for a destination related flows.
+     *
+     * @param host
+     */
+    set publicUrl(host: string);
+    /**
+     * Retrieve the public facing URL, default to Axios base URL if not configured.
+     *
+     * @returns string Axios baseUrl if public URL is not configured by a destination
+     */
+    get publicUrl(): string;
     /**
      * Detect if the given configuration points to an S/4HANA Cloud system.
      *
@@ -74,7 +90,7 @@ export declare class AbapServiceProvider extends ServiceProvider {
      *
      * @example
      * ```ts
-     * const transportRequestSerivce = abapServiceProvider.getAdtService<TransportRequestService>(TransportRequestService);
+     * const transportRequestService = abapServiceProvider.getAdtService<TransportRequestService>(TransportRequestService);
      * ```
      * @param adtServiceSubclass Subclass of class AdtService, type is specified by using AdtService class constructor signature.
      * @returns Subclass type of class AdtService

package/dist/abap/abap-service-provider.js

@@ -69,6 +69,22 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
             return this.atoSettings;
         });
     }
+    /**
+     * Set the public facing URL, typically used for a destination related flows.
+     *
+     * @param host
+     */
+    set publicUrl(host) {
+        this._publicUrl = host;
+    }
+    /**
+     * Retrieve the public facing URL, default to Axios base URL if not configured.
+     *
+     * @returns string Axios baseUrl if public URL is not configured by a destination
+     */
+    get publicUrl() {
+        return this._publicUrl || this.defaults.baseURL;
+    }
     /**
      * Detect if the given configuration points to an S/4HANA Cloud system.
      *
@@ -171,7 +187,7 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
      *
      * @example
      * ```ts
-     * const transportRequestSerivce = abapServiceProvider.getAdtService<TransportRequestService>(TransportRequestService);
+     * const transportRequestService = abapServiceProvider.getAdtService<TransportRequestService>(TransportRequestService);
      * ```
      * @param adtServiceSubclass Subclass of class AdtService, type is specified by using AdtService class constructor signature.
      * @returns Subclass type of class AdtService

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

@@ -67,12 +67,15 @@ export declare const abapUrlReplaceMap: Map<RegExp, string>;
  */
 export declare class Ui5AbapRepositoryService extends ODataService {
     static readonly PATH = "/sap/opu/odata/UI5/ABAP_REPOSITORY_SRV";
+    private readonly publicUrl;
     /**
      * Extension of the base constructor to set preferred response format if not provided by caller.
      *
-     * @param config optional base configuration for Axios
+     * @param config optional base configuration for Axios appended with optional fields
      */
-    constructor(config?: AxiosRequestConfig);
+    constructor(config?: AxiosRequestConfig & {
+        publicUrl?: string;
+    });
     /**
      * Get information about a deployed application. Returns undefined if the application cannot be found.
      *

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

@@ -42,7 +42,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
     /**
      * Extension of the base constructor to set preferred response format if not provided by caller.
      *
-     * @param config optional base configuration for Axios
+     * @param config optional base configuration for Axios appended with optional fields
      */
     constructor(config) {
         var _a, _b;
@@ -51,6 +51,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
         // @see https://axios-http.com/docs/config_defaults
         config.headers['Accept'] = (_b = config.headers['Accept']) !== null && _b !== void 0 ? _b : 'application/json,application/xml,text/plain,*/*';
         super(config);
+        this.publicUrl = config.publicUrl || this.defaults.baseURL;
     }
     /**
      * Get information about a deployed application. Returns undefined if the application cannot be found.
@@ -65,6 +66,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 return response.odata();
             }
             catch (error) {
+                this.log.debug(`Retrieving application ${app}, error found ${error}`);
                 return undefined;
             }
         });
@@ -146,7 +148,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      * @returns url to be used in the browser.
      */
     getAbapFrontendUrl() {
-        const url = new URL(this.defaults.baseURL);
+        const url = new URL(this.publicUrl);
         exports.abapUrlReplaceMap.forEach((value, key) => {
             url.hostname = url.hostname.replace(key, value);
         });
@@ -205,8 +207,8 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
         return (`<entry xmlns="http://www.w3.org/2005/Atom"` +
             `       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"` +
             `       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"` +
-            `       xml:base="${this.defaults.baseURL}">` +
-            `  <id>${this.defaults.baseURL}/Repositories('${escapedName}')</id>` +
+            `       xml:base="${this.publicUrl}">` +
+            `  <id>${this.publicUrl}/Repositories('${escapedName}')</id>` +
             `  <title type="text">Repositories('${escapedName}')</title>` +
             `  <updated>${time}</updated>` +
             `  <category term="/UI5/ABAP_REPOSITORY_SRV.Repository" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>` +
@@ -313,8 +315,17 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
         var _a;
         this.log.error(error.message);
         if ((0, odata_request_error_1.isAxiosError)(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data)) {
-            if (error.response.data['error']) {
-                (0, message_1.prettyPrintError)({ error: error.response.data['error'], host, log: this.log });
+            let responseData = error.response.data;
+            if (typeof error.response.data === 'string') {
+                try {
+                    responseData = JSON.parse(error.response.data);
+                }
+                catch (_b) {
+                    // Not much we can do!
+                }
+            }
+            if (responseData === null || responseData === void 0 ? void 0 : responseData['error']) {
+                (0, message_1.prettyPrintError)({ error: responseData['error'], host, log: this.log });
             }
             else {
                 this.log.error(error.response.data);

package/dist/base/service-provider.d.ts

@@ -44,12 +44,18 @@ export declare class ServiceProvider extends Axios implements ServiceProviderExt
      */
     protected generateServiceConfig(path: string): AxiosRequestConfig;
     /**
-     * Create a service instance for the given path and service class.
+     * Create a service instance for the given path, service class and public URL.
      *
      * @param path path of the service relative to the service provider
      * @param ServiceClass class type to be used to create an instance
      * @returns a service instance
      */
     protected createService<T extends Service>(path: string, ServiceClass: any): T;
+    /**
+     * Retrieve the public URL exposing the ABAP UI application.
+     *
+     * @returns string Axios Base URL
+     */
+    protected get publicUrl(): string;
 }
 //# sourceMappingURL=service-provider.d.ts.map

package/dist/base/service-provider.js

@@ -39,18 +39,26 @@ class ServiceProvider extends axios_1.Axios {
         return Object.assign(Object.assign({}, config), { baseURL: this.defaults.baseURL + path, headers: (_b = (_a = this.defaults.headers) === null || _a === void 0 ? void 0 : _a.common) !== null && _b !== void 0 ? _b : {} });
     }
     /**
-     * Create a service instance for the given path and service class.
+     * Create a service instance for the given path, service class and public URL.
      *
      * @param path path of the service relative to the service provider
      * @param ServiceClass class type to be used to create an instance
      * @returns a service instance
      */
     createService(path, ServiceClass) {
-        const service = new ServiceClass(this.generateServiceConfig(path));
+        const service = new ServiceClass(Object.assign(Object.assign({}, this.generateServiceConfig(path)), { publicUrl: this.publicUrl }));
         service.log = this.log;
         service.interceptors = this.interceptors;
         return service;
     }
+    /**
+     * Retrieve the public URL exposing the ABAP UI application.
+     *
+     * @returns string Axios Base URL
+     */
+    get publicUrl() {
+        return this.defaults.baseURL;
+    }
 }
 exports.ServiceProvider = ServiceProvider;
 //# sourceMappingURL=service-provider.js.map

package/dist/factory.js

@@ -157,6 +157,8 @@ function createForDestination(options, destination, destinationServiceInstance)
     let provider;
     if ((0, btp_utils_1.isAbapSystem)(destination)) {
         provider = createInstance(abap_1.AbapServiceProvider, providerConfig);
+        // For an ABAP destination flow, need to show the destination host URL property instead of the BAS host URL i.e. https://mydest.dest
+        provider.publicUrl = destination.Host;
     }
     else {
         provider = createInstance(service_provider_1.ServiceProvider, providerConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Extension of the Axios module adding convinience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",