@sap-ux/deploy-tooling 0.7.0 → 0.7.2

package/dist/base/deploy.js

@@ -222,7 +222,13 @@ function handle401Error(command, provider, config, logger, archive) {
         const service = getUi5AbapRepositoryService(provider, config, logger);
         const credentials = yield (0, prompt_1.promptCredentials)((_a = service.defaults.auth) === null || _a === void 0 ? void 0 : _a.username);
         if (Object.keys(credentials).length) {
-            service.defaults.auth = credentials;
+            if (config.target.serviceKey) {
+                config.target.serviceKey.uaa.username = credentials.username;
+                config.target.serviceKey.uaa.password = credentials.password;
+            }
+            else {
+                service.defaults.auth = credentials;
+            }
             yield deploymentCommands[command](provider, config, logger, archive);
             return true;
         }

package/dist/cli/config.js

@@ -146,18 +146,17 @@ function mergeTarget(baseTarget, options) {
     };
 }
 /**
- * Merge CLI and environment credentials.
+ * Merge CLI credentials.
  *
  * @param taskConfig - base configuration from the file
  * @param options - CLI options
  * @returns merged credentials
  */
 function mergeCredentials(taskConfig, options) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     let credentials = taskConfig.credentials;
-    // Support CLI params and|or dotenv file
-    if (options.username || process.env.SERVICE_USERNAME) {
-        credentials = Object.assign(Object.assign({}, (credentials !== null && credentials !== void 0 ? credentials : {})), { username: (_b = (_a = options.username) !== null && _a !== void 0 ? _a : process.env.SERVICE_USERNAME) !== null && _b !== void 0 ? _b : '', password: (_d = (_c = options.password) !== null && _c !== void 0 ? _c : process.env.SERVICE_PASSWORD) !== null && _d !== void 0 ? _d : '' });
+    if (options.username || options.password) {
+        credentials = Object.assign(Object.assign({}, (credentials !== null && credentials !== void 0 ? credentials : {})), { username: (_a = options.username) !== null && _a !== void 0 ? _a : '', password: (_b = options.password) !== null && _b !== void 0 ? _b : '' });
     }
     return credentials;
 }

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.7.0",
+  "version": "0.7.2",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -33,8 +33,8 @@
     "yazl": "2.5.1",
     "@sap-ux/axios-extension": "1.4.0",
     "@sap-ux/btp-utils": "0.11.7",
-    "@sap-ux/store": "0.3.12",
     "@sap-ux/logger": "0.3.7",
+    "@sap-ux/store": "0.3.12",
     "@sap-ux/ui5-config": "0.18.2"
   },
   "devDependencies": {