@sap-ux/axios-extension 1.0.1 → 1.0.3

package/README.adoc

@@ -27,11 +27,11 @@ The generic OData service simplifies the access to the service metadata as well
 #### Catalog Service
 Simplified consumption of the SAP catalog service useful for fetching annotations.
 
-#### ABAP UI5 Respository Service
+#### ABAP UI5 Repository Service
 Allows deployment of applications to the UI5 ABAP Repository as well as checking deployed applications.
 
 #### App Index Service
-A class respresenting the app index service allowing to search applications deployed on an ABAP system.
+A class representing the app index service allowing to search applications deployed on an ABAP system.
 
 #### Layered Repository Service
 Allows deployment of adaptation projects.
@@ -64,8 +64,8 @@ const provider = createForAbap({
     baseURL: 'https://sap.example',
     params: { 'sap-client': client }
 });
-const transportRequestSerivce = provider.getAdtService<TransportRequestService>(TransportRequestService);
-const newTrNumber = await transportRequestSerivce.createTransportRequest({
+const transportRequestService = provider.getAdtService<TransportRequestService>(TransportRequestService);
+const newTrNumber = await transportRequestService.createTransportRequest({
     packageName: 'Z_PACKAGE',
     ui5AppName: 'zappname',
     description: 'A new transport request number for deployment'

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

@@ -101,8 +101,8 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
      */
     getAdtCatalogService() {
         if (!this.services[adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH]) {
-            const adtCatalogSerivce = this.createService(adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH, adt_catalog_service_1.AdtCatalogService);
-            this.services[adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH] = adtCatalogSerivce;
+            const adtCatalogService = this.createService(adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH, adt_catalog_service_1.AdtCatalogService);
+            this.services[adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH] = adtCatalogService;
         }
         return this.services[adt_catalog_service_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH];
     }
@@ -181,8 +181,8 @@ class AbapServiceProvider extends service_provider_1.ServiceProvider {
             const subclassName = adtServiceSubclass.name;
             if (!this.services[subclassName]) {
                 // Retrieve ADT schema for the specific input AdtService subclass
-                const adtCatalogSerivce = this.getAdtCatalogService();
-                const adtSchema = yield adtCatalogSerivce.getServiceDefinition(adtServiceSubclass.getAdtCatagory());
+                const adtCatalogService = this.getAdtCatalogService();
+                const adtSchema = yield adtCatalogService.getServiceDefinition(adtServiceSubclass.getAdtCatagory());
                 // No ADT schema available neither locally nor from service query.
                 if (!adtSchema) {
                     return null;

package/dist/abap/app-index-service.d.ts

@@ -7,7 +7,7 @@ export interface App {
 }
 export type AppIndex = Partial<App>[];
 /**
- * A class respresenting the app index service allowing to search applications deployed on an ABAP system.
+ * A class representing the app index service allowing to search applications deployed on an ABAP system.
  */
 export declare abstract class AppIndexService extends Axios implements Service {
     static readonly PATH = "/sap/bc/ui2/app_index";

package/dist/abap/app-index-service.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppIndexService = void 0;
 const axios_1 = require("axios");
 /**
- * A class respresenting the app index service allowing to search applications deployed on an ABAP system.
+ * A class representing the app index service allowing to search applications deployed on an ABAP system.
  */
 class AppIndexService extends axios_1.Axios {
     /**

package/dist/abap/catalog/v2-catalog-service.js

@@ -80,15 +80,24 @@ class V2CatalogService extends base_1.CatalogService {
      */
     findService({ title, path }) {
         return __awaiter(this, void 0, void 0, function* () {
+            let version = 1;
             if (!title) {
-                title = path.replace(/\/$/, '').split('/').pop().toUpperCase();
+                const titleWithParameters = path.replace(/\/$/, '').split('/').pop().split(';');
+                title = titleWithParameters[0].toUpperCase();
                 if (!title) {
                     throw new Error(`Cannot determine service title from path: ${path}`);
                 }
+                const segParams = titleWithParameters.slice(1);
+                segParams.forEach((parameter) => {
+                    const [key, value] = parameter.split('=');
+                    if (key === 'v') {
+                        version = parseInt(value, 10);
+                    }
+                });
             }
             const params = {
                 $format: 'json',
-                $filter: `Title eq '${title}'`
+                $filter: `Title eq '${title}' and TechnicalServiceVersion eq ${version}`
             };
             const response = yield this.get(`/${this.entitySet}`, { params });
             const services = response.odata();

package/dist/abap/message.js

@@ -2,6 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prettyPrintTimeInMs = exports.prettyPrintError = exports.prettyPrintMessage = void 0;
 const url_1 = require("url");
+/**
+ *
+ * @param severity
+ * @param msg
+ * @param log
+ * @param error
+ */
+function logLevel(severity, msg, log, error = false) {
+    if (severity) {
+        severity = severity.toLowerCase();
+        if (severity === 'success') {
+            log.info(msg);
+        }
+        else {
+            if (severity === 'warning') {
+                severity = 'warn';
+            }
+            log[severity](msg);
+        }
+    }
+    else {
+        error ? log.error(msg) : log.info(msg);
+    }
+}
 /**
  * Log a Gateway response.
  *
@@ -57,7 +81,7 @@ function prettyPrintError({ error, log, host }) {
         if (error.innererror) {
             (error.innererror.errordetails || []).forEach((entry) => {
                 if (!entry.message.startsWith('<![CDATA')) {
-                    log.error(entry.message);
+                    logLevel(entry.severity, entry.message, log, true);
                 }
                 logFullURL({ host, path: error['longtext_url'], log });
             });

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

@@ -88,16 +88,16 @@ export declare class Ui5AbapRepositoryService extends ODataService {
      * @param config.bsp BSP configuration
      * @param config.testMode if set to true, all requests will be sent, the service checks them, but no actual deployment will happen
      * @param config.safeMode if set then the SafeMode url parameter will be set. SafeMode is by default active, to activate provide false
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     deploy({ archive, bsp, testMode, safeMode }: DeployConfig): Promise<AxiosResponse>;
     /**
      * Undeploy an existing app.
      *
-     * @param config undeployment config
+     * @param config undeploy config
      * @param config.bsp BSP configuration
      * @param config.testMode if set to true, all requests will be sent, the service checks them, but no actual deployment will happen
-     * @returns the Axios response object for futher processing or undefined if no request is sent
+     * @returns the Axios response object for further processing or undefined if no request is sent
      */
     undeploy({ bsp, testMode }: UndeployConfig): Promise<AxiosResponse | undefined>;
     /**
@@ -111,8 +111,8 @@ export declare class Ui5AbapRepositoryService extends ODataService {
      *
      * @param transport optional transport request id
      * @param testMode optional url parameter to enable test mode
-     * @param safeMode optional url paramater to disable the safe model (safemode=false)
-     * @returns the Axios response object for futher processing
+     * @param safeMode optional url parameter to disable the safe model (safemode=false)
+     * @returns the Axios response object for further processing
      */
     protected createConfig(transport?: string, testMode?: boolean, safeMode?: boolean): AxiosRequestConfig;
     /**
@@ -133,16 +133,16 @@ export declare class Ui5AbapRepositoryService extends ODataService {
      * @param payload request payload
      * @param config additional request config
      * @param tryCount number of attempted deploys (sometimes a repo request fails with a known timeout issue, so we retry)
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     protected updateRepoRequest(isExisting: boolean, appName: string, payload: string, config: AxiosRequestConfig, tryCount?: number): Promise<AxiosResponse | undefined>;
     /**
-     * Send a request to the backed to delete an application.
+     * Send a request to the backend to delete an application.
      *
      * @param appName application name
      * @param config additional request config
      * @param tryCount number of attempted deploys (sometimes a repo request fails with a known timeout issue, so we retry)
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     protected deleteRepoRequest(appName: string, config: AxiosRequestConfig, tryCount?: number): Promise<AxiosResponse>;
     /**

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

@@ -77,7 +77,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      * @param config.bsp BSP configuration
      * @param config.testMode if set to true, all requests will be sent, the service checks them, but no actual deployment will happen
      * @param config.safeMode if set then the SafeMode url parameter will be set. SafeMode is by default active, to activate provide false
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     deploy({ archive, bsp, testMode = false, safeMode }) {
         var _a, _b;
@@ -110,10 +110,10 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
     /**
      * Undeploy an existing app.
      *
-     * @param config undeployment config
+     * @param config undeploy config
      * @param config.bsp BSP configuration
      * @param config.testMode if set to true, all requests will be sent, the service checks them, but no actual deployment will happen
-     * @returns the Axios response object for futher processing or undefined if no request is sent
+     * @returns the Axios response object for further processing or undefined if no request is sent
      */
     undeploy({ bsp, testMode = false }) {
         var _a;
@@ -157,8 +157,8 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      *
      * @param transport optional transport request id
      * @param testMode optional url parameter to enable test mode
-     * @param safeMode optional url paramater to disable the safe model (safemode=false)
-     * @returns the Axios response object for futher processing
+     * @param safeMode optional url parameter to disable the safe model (safemode=false)
+     * @returns the Axios response object for further processing
      */
     createConfig(transport, testMode, safeMode) {
         const headers = {
@@ -230,10 +230,10 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      * @param payload request payload
      * @param config additional request config
      * @param tryCount number of attempted deploys (sometimes a repo request fails with a known timeout issue, so we retry)
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     updateRepoRequest(isExisting, appName, payload, config, tryCount = 1) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Was the app deployed after the first failed attempt?
@@ -246,6 +246,7 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                     return Promise.resolve(undefined);
                 }
                 else {
+                    this.log.info(`${appName} found on target system: ${isExisting}`);
                     const response = isExisting
                         ? yield this.put(`/Repositories('${encodeURIComponent(appName)}')`, payload, config)
                         : yield this.post('/Repositories', payload, config);
@@ -260,6 +261,10 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                     }
                     return this.updateRepoRequest(isExisting, appName, payload, config, tryCount + 1);
                 }
+                else if ((_b = config === null || config === void 0 ? void 0 : config.params) === null || _b === void 0 ? void 0 : _b.TestMode) {
+                    // TestMode returns HTTP 403 but includes details of the uploaded files and request
+                    return error.response;
+                }
                 else {
                     throw error;
                 }
@@ -267,12 +272,12 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
         });
     }
     /**
-     * Send a request to the backed to delete an application.
+     * Send a request to the backend to delete an application.
      *
      * @param appName application name
      * @param config additional request config
      * @param tryCount number of attempted deploys (sometimes a repo request fails with a known timeout issue, so we retry)
-     * @returns the Axios response object for futher processing
+     * @returns the Axios response object for further processing
      */
     deleteRepoRequest(appName, config, tryCount = 1) {
         var _a;

package/dist/auth/connection.js

@@ -114,7 +114,7 @@ function isHtmlLoginForm(response) {
 }
 /**
  * @param contentTypeHeader contents of Content-Type header (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type)
- * @param responseData data receievd in HTTP response. This is used to infer the Content-Type, if the header is missing or ambiguous
+ * @param responseData data received in HTTP response. This is used to infer the Content-Type, if the header is missing or ambiguous
  * @returns content type
  */
 function getContentType(contentTypeHeader, responseData) {
@@ -164,11 +164,14 @@ function attachConnectionHandler(provider) {
             return response;
         }
     }, (error) => {
-        var _a, _b;
+        var _a;
         // remember xsrf token if provided even on error
-        if ((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b[CSRF.ResponseHeaderName]) {
-            provider.defaults.headers.common[CSRF.RequestHeaderName] =
-                error.response.headers[CSRF.ResponseHeaderName];
+        if (error.response) {
+            if ((_a = error.response.headers) === null || _a === void 0 ? void 0 : _a[CSRF.ResponseHeaderName]) {
+                provider.defaults.headers.common[CSRF.RequestHeaderName] =
+                    error.response.headers[CSRF.ResponseHeaderName];
+            }
+            provider.cookies.setCookies(error.response);
         }
         throw error;
     });

package/dist/factory.js

@@ -47,7 +47,7 @@ function createInstance(ProviderType, config) {
     delete providerConfig.ignoreCertErrors;
     providerConfig.withCredentials = (providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.auth) && Object.keys(providerConfig.auth).length > 0;
     /**
-     * Make axios throw an error for 4xx errors as well.
+     * Make axios throw an error for 4xx errors.
      *
      * @param status - http response status
      * @returns success (true) or error (false)

package/package.json

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