@sap-ux/deploy-tooling 0.14.38 → 0.14.40

package/dist/base/deploy.js

@@ -80,25 +80,25 @@ function handle401Error(command, provider, config, logger, archive) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         logger.warn(`${command === tryDeploy ? 'Deployment' : 'Undeployment'} failed with authentication error.`);
-        logger.info('Please maintain correct credentials to avoid seeing this error\n\t(see help: https://www.npmjs.com/package/@sap/ux-ui5-tooling#setting-environment-variables-in-a-env-file)');
-        logger.info('Please enter your credentials.');
-        const credentials = yield (0, system_access_1.getCredentialsWithPrompts)((_b = (_a = provider.defaults) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.username);
-        if (Object.keys(credentials).length) {
-            if (config.target.serviceKey) {
-                config.target.serviceKey.uaa.username = credentials.username;
-                config.target.serviceKey.uaa.password = credentials.password;
-            }
-            else {
-                config.credentials = credentials;
+        if (yield (0, validate_1.checkForCredentials)(config.target.destination, logger)) {
+            logger.info('Please maintain correct credentials to avoid seeing this error\n\t(see help: https://www.npmjs.com/package/@sap/ux-ui5-tooling#setting-environment-variables-in-a-env-file)');
+            logger.info('Please enter your credentials.');
+            const credentials = yield (0, system_access_1.getCredentialsWithPrompts)((_b = (_a = provider.defaults) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.username);
+            if (Object.keys(credentials).length) {
+                if (config.target.serviceKey) {
+                    config.target.serviceKey.uaa.username = credentials.username;
+                    config.target.serviceKey.uaa.password = credentials.password;
+                }
+                else {
+                    config.credentials = credentials;
+                }
+                // Need to re-init the provider with the updated credentials
+                provider = yield createProvider(config, logger);
+                yield command(provider, config, logger, archive);
+                return true;
             }
-            // Need to re-init the provider with the updated credentials
-            provider = yield createProvider(config, logger);
-            yield command(provider, config, logger, archive);
-            return true;
-        }
-        else {
-            return false;
         }
+        return false;
     });
 }
 /**

package/dist/base/validate.d.ts

@@ -56,8 +56,16 @@ export declare function formatSummary(summary: SummaryRecord[]): string;
  * Returns true if specified destination is on-premise and if environment is App Studio
  * to show additional info.
  *
- * @param destination Indentifier for destination to be checked.
+ * @param destination Identifier for destination to be checked.
  * @returns Promise boolean.
  */
 export declare function showAdditionalInfoForOnPrem(destination: string): Promise<boolean>;
+/**
+ * Validates if the credentials are required for the destination based on the Authentication type.
+ *
+ * @param destination Identifier for destination to be checked.
+ * @param logger Logger from the calling context.
+ * @returns Promise boolean.
+ */
+export declare function checkForCredentials(destination: string | undefined, logger: Logger): Promise<boolean>;
 //# sourceMappingURL=validate.d.ts.map

package/dist/base/validate.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showAdditionalInfoForOnPrem = exports.formatSummary = exports.validateBeforeDeploy = exports.summaryMessage = exports.SummaryStatus = void 0;
+exports.checkForCredentials = exports.showAdditionalInfoForOnPrem = exports.formatSummary = exports.validateBeforeDeploy = exports.summaryMessage = exports.SummaryStatus = void 0;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const chalk_1 = require("chalk");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
@@ -33,6 +33,7 @@ exports.summaryMessage = {
     transportNotRequired: 'Transport Request is not required for local package',
     atoAdtAccessError: 'Development prefix could not be validated. Please check manually.'
 };
+let cachedDestinationsList = {};
 /**
  * Validation of deploy configuration before running deploy-test.
  *
@@ -351,7 +352,7 @@ function validateTransportRequestWithAdt(input, output, provider, logger) {
  * Returns true if specified destination is on-premise and if environment is App Studio
  * to show additional info.
  *
- * @param destination Indentifier for destination to be checked.
+ * @param destination Identifier for destination to be checked.
  * @returns Promise boolean.
  */
 function showAdditionalInfoForOnPrem(destination) {
@@ -365,4 +366,38 @@ function showAdditionalInfoForOnPrem(destination) {
     });
 }
 exports.showAdditionalInfoForOnPrem = showAdditionalInfoForOnPrem;
+/**
+ * Validates if the credentials are required for the destination based on the Authentication type.
+ *
+ * @param destination Identifier for destination to be checked.
+ * @param logger Logger from the calling context.
+ * @returns Promise boolean.
+ */
+function checkForCredentials(destination, logger) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let check = true;
+        if (destination && (0, btp_utils_1.isAppStudio)()) {
+            const destinations = yield getDestinations();
+            if (destinations[destination].Authentication === btp_utils_1.Authentication.SAML_ASSERTION) {
+                logger.warn(`The SAP BTP destination is misconfigured, please check you have the appropriate trusts and permissions enabled.`);
+                check = false;
+            }
+        }
+        return check;
+    });
+}
+exports.checkForCredentials = checkForCredentials;
+/**
+ * Return a list of Destinations.
+ *
+ * @returns Array of Destination objects
+ */
+function getDestinations() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (Object.keys(cachedDestinationsList).length === 0) {
+            cachedDestinationsList = yield (0, btp_utils_1.listDestinations)();
+        }
+        return cachedDestinationsList;
+    });
+}
 //# sourceMappingURL=validate.js.map

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%3Adeploy-tooling"
   },
-  "version": "0.14.38",
+  "version": "0.14.40",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -35,14 +35,14 @@
     "@sap-ux/axios-extension": "1.13.1",
     "@sap-ux/btp-utils": "0.14.4",
     "@sap-ux/logger": "0.5.1",
-    "@sap-ux/system-access": "0.4.1",
+    "@sap-ux/system-access": "0.4.2",
     "@sap-ux/ui5-config": "0.22.8",
     "@sap-ux/project-input-validator": "0.2.3"
   },
   "devDependencies": {
     "@types/prompts": "2.4.4",
     "@types/adm-zip": "0.5.5",
-    "@sap-ux/store": "0.5.0"
+    "@sap-ux/store": "0.6.0"
   },
   "ui5": {
     "dependencies": []