@sap/ux-ui5-tooling 1.4.7 → 1.5.0

package/dist/tasks/deploy/index.js

@@ -110193,7 +110193,7 @@ class Ui5AbapRepository extends oDataClient_1.ODataClient {
             if (tryCount === 2) {
                 this.log.warn('Warning: retry undeploy to handle a backend rejection...');
             }
-            return await httpClient.delete(`/Repositories('${appName}')`, config);
+            return await httpClient.delete(`/Repositories('${encodeURIComponent(appName)}')`, config);
         }
         catch (error) {
             if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 400) {
@@ -110487,14 +110487,14 @@ async function fetchDestinations() {
  * @param destination name of the destination
  * @param destinationInstance name of the destination instance as provided in the mta.yaml
  */
-async function getUrlForInstanceBasedDest(destination, destinationInstance) {
+async function getAuthHeaderForInstanceBasedDest(destinationInstance) {
     var _a, _b;
     try {
-        const credentials = await cf_tools_1.apiGetInstanceCredentials(destinationInstance);
+        const credentials = (await cf_tools_1.apiGetInstanceCredentials(destinationInstance)).credentials;
         const clientId = ((_a = credentials.uaa) === null || _a === void 0 ? void 0 : _a.clientid) || credentials.clientid;
         const clientSecret = ((_b = credentials.uaa) === null || _b === void 0 ? void 0 : _b.clientsecret) || credentials.clientsecret;
-        const base64Host = Buffer.from(`${clientId}:${clientSecret}`).toString('base64');
-        return `https://${base64Host}@${destination}${DEST}`;
+        const base64Header = Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64');
+        return base64Header;
     }
     catch (error) {
         throw new Error(`An error occurred while retrieving service key for the destination instance ${destinationInstance}: ${error}`);
@@ -110524,7 +110524,8 @@ async function replaceUrlForAppStudio(systemConfig, destinationName, destination
     var _a, _b;
     systemConfig.originalUrl = systemConfig.url;
     if (destinationName && destinationInstance) {
-        systemConfig.url = await getUrlForInstanceBasedDest(destinationName, destinationInstance);
+        systemConfig.url = `https://${destinationName}${DEST}`;
+        systemConfig.basDestinationInstanceCred = await getAuthHeaderForInstanceBasedDest(destinationInstance);
     }
     else {
         systemConfig.url = ux_common_utils_1.getAppStudioBaseURL();
@@ -110702,8 +110703,7 @@ function throwIfHtmlLoginForm(response) {
     if ((response === null || response === void 0 ? void 0 : response.status) !== 200) {
         return;
     }
-    if (response.headers['sap-err-id'] === 'ICFLOGONREQUIRED' ||
-        isHtmlLoginForm(response.headers['content-type'], response.data)) {
+    if (response.headers['sap-err-id'] === 'ICFLOGONREQUIRED' || isHtmlLoginForm(response)) {
         const err = new Error();
         err.response = { status: 401 };
         err.isAxiosError = true;
@@ -110713,9 +110713,11 @@ function throwIfHtmlLoginForm(response) {
         throw err;
     }
 }
-function isHtmlLoginForm(contentTypeHeader, responseData) {
-    const contentType = getContentType(contentTypeHeader, responseData);
-    return contentType.startsWith('text/html') && typeof responseData === 'string' && !!responseData.match(/log[io]n/i);
+function isHtmlResponse(response) {
+    return getContentType(response.headers['content-type'], response.data).startsWith('text/html');
+}
+function isHtmlLoginForm(response) {
+    return isHtmlResponse(response) && typeof response.data === 'string' && !!response.data.match(/log[io]n/i);
 }
 /**
  * Given a possibly missing content-type header and response data,
@@ -110739,10 +110741,10 @@ function getContentType(contentTypeHeader, responseData) {
  * Did we get a SAML login form?
  */
 function isSamlLogonNeeded(response) {
-    var _a;
-    return ((response === null || response === void 0 ? void 0 : response.status) === 200 && ((_a = response.headers['content-type']) === null || _a === void 0 ? void 0 : _a.toLowerCase().startsWith('text/html')) &&
+    return ((response === null || response === void 0 ? void 0 : response.status) === 200 &&
+        isHtmlResponse(response) &&
         typeof response.data === 'string' &&
-        !!(response === null || response === void 0 ? void 0 : response.data.match(/saml/i)));
+        !!response.data.match(/saml/i));
 }
 /**
  * Generic connect method that will be used as abstraction of different authentication methods.
@@ -112068,6 +112070,68 @@ function guessAuthType({ credentials, fallback = false }) {
     return authType;
 }
 exports.guessAuthType = guessAuthType;
+/**
+ * Gets onPrem system from store and creates one if none present
+ * @param system system details
+ * @returns sap system from store, and boolean if it's a new system
+ */
+async function getOnPremSystem(system) {
+    let sapSystem = await __1.getSapSystem(system.url, system.client);
+    let isNewSystem = false;
+    const creds = {
+        username: system.credentials.systemUsername,
+        password: system.credentials.systemPassword
+    };
+    if (sapSystem) {
+        sapSystem.name = system.name || '';
+        sapSystem.setCredentials(creds);
+    }
+    else {
+        sapSystem = __1.newSapSystem(system.name || '', system.url, system.client, creds, true);
+        isNewSystem = true;
+    }
+    return [sapSystem, isNewSystem];
+}
+exports.getOnPremSystem = getOnPremSystem;
+/**
+ * Gets BTP system from store and creates one if none present
+ * @param system system details
+ * @returns sap system from store, and boolean if it's a new system
+ */
+async function getBTPSystem(system, savedSapSystemServiceKey) {
+    let sapSystem;
+    let isNewSystem = false;
+    if (system.url && system.credentials === savedSapSystemServiceKey) {
+        sapSystem = await __1.getSapSystem(system.url, system.client);
+    }
+    if (sapSystem) {
+        sapSystem.name = system.name || '';
+    }
+    else {
+        sapSystem = __1.newSapSystemForSteampunk(system.name || '', system.credentials);
+        if (sapSystem) {
+            isNewSystem = true;
+        }
+    }
+    return [sapSystem, isNewSystem];
+}
+exports.getBTPSystem = getBTPSystem;
+async function isSystemNameValid(newName, savedSystemName) {
+    if (newName && newName !== savedSystemName && (await __1.isSystemNameInUse(newName))) {
+        return false;
+    }
+    return true;
+}
+exports.isSystemNameValid = isSystemNameValid;
+async function isSapSystemConnected(sapSystem) {
+    const catalogV2 = await sapSystem.getCatalog(__1.ODataVersion.v2);
+    const catalogV4 = await sapSystem.getCatalog(__1.ODataVersion.v4);
+    if (catalogV2 || catalogV4) {
+        return true;
+    }
+    return false;
+}
+exports.isSapSystemConnected = isSapSystemConnected;
 
 
 /***/ }),
@@ -140983,7 +141047,7 @@ module.exports = JSON.parse('{"ERROR_SPECIFICATION_MISSING":"Seems specification
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@sap/ux-telemetry","version":"1.4.7","description":"SAP Fiori tools telemetry library","main":"dist/src/index.js","author":"SAP SE","license":"MIT","private":true,"azureInstrumentationKey":"0a65e45d-6bf4-421d-b845-61e888c50e9e","azureProdKey":"0a65e45d-6bf4-421d-b845-61e888c50e9e","scripts":{"pre-commit":"lint-staged --quiet","clean":"rimraf ./dist","build":"ts-node ./build-script/ && yarn run clean && tsc --project ./","test":"jest --maxWorkers=1 --silent --ci --forceExit --detectOpenHandles","lint":"eslint . --ext .ts","lint:summary":"eslint . --ext .ts -f summary","lint:fix":"eslint --fix","lint:fix:all":"eslint . --ext .ts --fix","lint:report":"eslint . --ext .ts -f multiple --report-unused-disable-directives","format:fix":"prettier --write --loglevel silent --ignore-path ../../../.prettierignore","format:fix:all":"prettier --write \'**/*.{css,scss,html,js,json,ts,tsx,yaml,yml}\' \'!**/{out,dist,node_modules}/**\' \'!**/*.{svg,png,xml}\' --ignore-path ../../../.prettierignore","madge":"madge --warning --circular --extensions ts ./"},"dependencies":{"@sap/ux-cds":"1.4.7","@sap/ux-common-utils":"1.4.7","@sap/ux-feature-toggle":"1.4.7","@sap/ux-project-access":"1.4.7","applicationinsights":"1.4.1","performance-now":"2.1.0","yaml":"2.0.0-10"},"devDependencies":{"ts-node":"8.5.2","typescript":"3.8.3"},"files":["dist/"],"jestSonar":{"reportPath":"reports/test/unit","reportFile":"test-report.xml"},"eslint-formatter-multiple":{"formatters":[{"name":"stylish","output":"console"},{"name":"json","output":"file","path":"reports/lint/eslint.json"},{"name":"checkstyle","output":"file","path":"reports/lint/eslint.checkstyle.xml"}]}}');
+module.exports = JSON.parse('{"name":"@sap/ux-telemetry","version":"1.5.0","description":"SAP Fiori tools telemetry library","main":"dist/src/index.js","author":"SAP SE","license":"MIT","private":true,"azureInstrumentationKey":"0a65e45d-6bf4-421d-b845-61e888c50e9e","azureProdKey":"0a65e45d-6bf4-421d-b845-61e888c50e9e","scripts":{"pre-commit":"lint-staged --quiet","clean":"rimraf ./dist","build":"ts-node ./build-script/ && yarn run clean && tsc --project ./","test":"jest --maxWorkers=1 --silent --ci --forceExit --detectOpenHandles","lint":"eslint . --ext .ts","lint:summary":"eslint . --ext .ts -f summary","lint:fix":"eslint --fix","lint:fix:all":"eslint . --ext .ts --fix","lint:report":"eslint . --ext .ts -f multiple --report-unused-disable-directives","format:fix":"prettier --write --loglevel silent --ignore-path ../../../.prettierignore","format:fix:all":"prettier --write \'**/*.{css,scss,html,js,json,ts,tsx,yaml,yml}\' \'!**/{out,dist,node_modules}/**\' \'!**/*.{svg,png,xml}\' --ignore-path ../../../.prettierignore","madge":"madge --warning --circular --extensions ts ./"},"dependencies":{"@sap/ux-cds":"1.5.0","@sap/ux-common-utils":"1.5.0","@sap/ux-feature-toggle":"1.5.0","@sap/ux-project-access":"1.5.0","applicationinsights":"1.4.1","performance-now":"2.1.0","yaml":"2.0.0-10"},"devDependencies":{"ts-node":"8.5.2","typescript":"3.8.3"},"files":["dist/"],"jestSonar":{"reportPath":"reports/test/unit","reportFile":"test-report.xml"},"eslint-formatter-multiple":{"formatters":[{"name":"stylish","output":"console"},{"name":"json","output":"file","path":"reports/lint/eslint.json"},{"name":"checkstyle","output":"file","path":"reports/lint/eslint.checkstyle.xml"}]}}');
 
 /***/ }),