@sap-ux/generator-adp 0.7.13 → 0.7.15

package/generators/base/questions/credentials.js

@@ -59,14 +59,13 @@ function getPasswordPrompt(abapTarget, logger) {
                 return (0, i18n_1.t)('error.pleaseProvideAllRequiredData');
             }
             try {
-                const options = {
+                const credentials = {
                     system,
                     client: abapTarget.client ?? '',
                     username: answers.username,
                     password: value
                 };
-                const abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(options, logger);
-                await (0, adp_tooling_1.getSystemUI5Version)(abapProvider, logger);
+                await assertAuthenticated(credentials, logger);
                 return true;
             }
             catch (e) {
@@ -75,4 +74,19 @@ function getPasswordPrompt(abapTarget, logger) {
         }
     };
 }
+/**
+ * Helper function which asserts whether a client is authenticated on an ABAP system or throws.
+ * Since we do not have a dedicated api call to detect if a client is authenticated we use the
+ * {@link LayeredRepositoryService.getSystemInfo} call which is a protected one.
+ *
+ * @param {ClientCredentials} credentials - Object containing client credentials to a specific ABAP system.
+ * @param {ToolsLogger} logger - The logger instance.
+ * @returns {Promise<void>} A promise resolved if the client is authenticated, otherwise rejected with
+ * an error.
+ */
+async function assertAuthenticated(credentials, logger) {
+    const abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(credentials, logger);
+    const layeredRepositoryService = abapProvider.getLayeredRepository();
+    await layeredRepositoryService.getSystemInfo();
+}
 //# sourceMappingURL=credentials.js.map

package/generators/base/sub-gen-auth-base.js

@@ -63,15 +63,10 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
     constructor(args, opts, type) {
         super(args, opts, type);
         this.generatorType = type;
-        try {
-            if (opts.data) {
-                this.projectPath = opts.data.path;
-            }
-            this.vscode = opts.vscode;
-        }
-        catch (e) {
-            this.validationError = e;
+        if (opts.data) {
+            this.projectPath = opts.data.path;
         }
+        this.vscode = opts.vscode;
     }
     /**
      * Executes logic that should happen during Yeoman's `initializing` phase.
@@ -79,22 +74,12 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
      */
     async onInit() {
         await (0, i18n_1.initI18n)();
-        if (this.validationError) {
-            this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_1.getSubGenErrorPage)(this.generatorType)));
-        }
-        else {
-            this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_1.getSubGenAuthPages)(this.generatorType, this.system)));
-        }
         this.systemLookup = new adp_tooling_1.SystemLookup(this.logger);
         const adpConfig = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, node_path_1.default.join(this.projectPath, 'ui5.yaml'));
         this.abapTarget = adpConfig.target;
         this.system = ((0, btp_utils_1.isAppStudio)() ? this.abapTarget.destination : this.abapTarget.url) ?? '';
         this.logger.log(`Successfully retrieved abap target\n${JSON.stringify(this.abapTarget, null, 2)}`);
-        if (this.validationError) {
-            this.appWizard.showError(this.validationError.message, yeoman_ui_types_1.MessageType.notification);
-            await this.handleRuntimeCrash(this.validationError.message);
-            return;
-        }
+        this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_1.getSubGenAuthPages)(this.generatorType, this.system)));
         try {
             this.requiresAuth = await this.systemLookup.getSystemRequiresAuth(this.system);
             this.logger.log(`System ${this.system} requires authentication: ${this.requiresAuth}`);

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.7.13",
+  "version": "0.7.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,17 +30,17 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.18.13",
-    "@sap-ux/axios-extension": "1.24.3",
-    "@sap-ux/feature-toggle": "0.3.4",
+    "@sap-ux/adp-tooling": "0.18.15",
+    "@sap-ux/axios-extension": "1.24.4",
     "@sap-ux/btp-utils": "1.1.5",
-    "@sap-ux/inquirer-common": "0.9.9",
+    "@sap-ux/feature-toggle": "0.3.4",
+    "@sap-ux/inquirer-common": "0.9.10",
     "@sap-ux/logger": "0.7.1",
     "@sap-ux/project-access": "1.32.12",
     "@sap-ux/store": "1.3.3",
-    "@sap-ux/system-access": "0.6.29",
-    "@sap-ux/fiori-generator-shared": "0.13.37",
+    "@sap-ux/system-access": "0.6.30",
     "@sap-ux/project-input-validator": "0.6.34",
+    "@sap-ux/fiori-generator-shared": "0.13.38",
     "@sap-ux/odata-service-writer": "0.27.33"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "6.0.1",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.10"
+    "@sap-ux/deploy-config-sub-generator": "0.5.12"
   },
   "engines": {
     "node": ">=20.x"