@sap-ux/adp-tooling 1.0.1 → 1.0.4

package/dist/btp/api.d.ts

@@ -20,6 +20,15 @@ export declare function getToken(uaa: Uaa, logger?: ToolsLogger): Promise<string
  * @returns The destinationConfiguration object (e.g. Name, ProxyType, URL, Authentication) or undefined on failure.
  */
 export declare function getBtpDestinationConfig(uri: string, token: string, destinationName: string, logger?: ToolsLogger): Promise<BtpDestinationConfig | undefined>;
+/**
+ * Normalise destination-service credentials (nested `{ uaa: { ... } }` or flat) into a flat UAA + `uri`.
+ *
+ * @param credentials - Destination service credentials.
+ * @returns Flat UAA credentials, or `undefined` if any required field is missing.
+ */
+export declare function getDestinationServiceUaa(credentials: CfDestinationServiceCredentials | undefined): (Uaa & {
+    uri: string;
+}) | undefined;
 /**
  * Lists all subaccount destinations from the BTP Destination Configuration API.
  *

package/dist/btp/api.js

@@ -53,6 +53,22 @@ export async function getBtpDestinationConfig(uri, token, destinationName, logge
         return undefined;
     }
 }
+/**
+ * Normalise destination-service credentials (nested `{ uaa: { ... } }` or flat) into a flat UAA + `uri`.
+ *
+ * @param credentials - Destination service credentials.
+ * @returns Flat UAA credentials, or `undefined` if any required field is missing.
+ */
+export function getDestinationServiceUaa(credentials) {
+    if (!credentials) {
+        return undefined;
+    }
+    const uaa = 'uaa' in credentials ? credentials.uaa : credentials;
+    if (!uaa?.clientid || !uaa.clientsecret || !uaa.url || !uaa.uri) {
+        return undefined;
+    }
+    return uaa;
+}
 /**
  * Lists all subaccount destinations from the BTP Destination Configuration API.
  *
@@ -60,11 +76,12 @@ export async function getBtpDestinationConfig(uri, token, destinationName, logge
  * @returns {Promise<Destinations>} Map of destination name to Destination object.
  */
 export async function listBtpDestinations(credentials) {
-    const uaa = 'uaa' in credentials
-        ? credentials.uaa
-        : { clientid: credentials.clientid, clientsecret: credentials.clientsecret, url: credentials.url };
+    const uaa = getDestinationServiceUaa(credentials);
+    if (!uaa) {
+        throw new Error(t('error.failedToListBtpDestinations', { error: t('error.incompleteDestinationServiceCredentials') }));
+    }
     const token = await getToken(uaa);
-    const url = `${credentials.uri}/destination-configuration/v1/subaccountDestinations`;
+    const url = `${uaa.uri}/destination-configuration/v1/subaccountDestinations`;
     try {
         const response = await axios.get(url, {
             headers: { Authorization: `Bearer ${token}` }

package/dist/translations/adp-tooling.i18n.json

@@ -128,6 +128,7 @@
         "couldNotFetchServiceKeys": "Cannot fetch the service keys. Error: {{error}}",
         "metadataFetchingNotSupportedForCF": "Metadata fetching is not supported for Cloud Foundry projects.",
         "failedToListBtpDestinations": "Failed to list BTP destinations. Error: {{error}}",
+        "incompleteDestinationServiceCredentials": "Incomplete destination service credentials",
         "destinationServiceNotFoundInMtaYaml": "Destination service instance not found in mta.yaml. Ensure a resource with 'service: destination' is declared.",
         "noServiceKeysFoundForDestination": "No service keys found for destination service instance '{{serviceInstanceName}}'. Ensure the service is provisioned and try again.",
         "errorFetchingDestinations": "An error occurred when fetching destinations. For more information, see the logs.",

package/dist/types.d.ts

@@ -788,14 +788,23 @@ export interface XsApp {
 export interface Uaa {
     clientid: string;
     clientsecret: string;
+    /** Auth server URL (used to request OAuth tokens). */
     url: string;
+    /** Present on destination-service uaa bindings. */
+    uri?: string;
 }
+/**
+ * CF destination-service service-key credentials.
+ * - nested: `{ uaa: { clientid, clientsecret, url, uri, ... } }`
+ * - flat:   `{ clientid, clientsecret, url, uri, ... }`
+ */
 export type CfDestinationServiceCredentials = {
+    uaa: Uaa & {
+        uri: string;
+    };
+} | (Uaa & {
     uri: string;
-    uaa: Uaa;
-} | ({
-    uri: string;
-} & Uaa);
+});
 export interface CfAppParams {
     appName: string;
     appVersion: string;

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "1.0.1",
+  "version": "1.0.4",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -40,15 +40,15 @@
     "@sap-ux/axios-extension": "2.0.0",
     "@sap-ux/btp-utils": "2.0.0",
     "@sap-ux/i18n": "1.0.0",
-    "@sap-ux/inquirer-common": "1.0.1",
+    "@sap-ux/inquirer-common": "1.0.3",
     "@sap-ux/logger": "1.0.0",
-    "@sap-ux/nodejs-utils": "1.0.0",
-    "@sap-ux/odata-service-writer": "1.0.1",
-    "@sap-ux/project-access": "2.0.1",
-    "@sap-ux/project-input-validator": "1.0.1",
+    "@sap-ux/nodejs-utils": "1.0.1",
+    "@sap-ux/odata-service-writer": "1.0.2",
+    "@sap-ux/project-access": "2.0.2",
+    "@sap-ux/project-input-validator": "1.0.2",
     "@sap-ux/store": "2.0.0",
     "@sap-ux/system-access": "1.0.0",
-    "@sap-ux/ui5-config": "1.0.0",
+    "@sap-ux/ui5-config": "1.0.1",
     "@sap-ux/ui5-info": "1.0.0"
   },
   "devDependencies": {