Fix - CAP doesn't consistently return credentials from cds.env (until fix is available use fallback API)

Author: jung-thomas

bin/btp.js

@@ -44,20 +44,23 @@ export async function handler(argv) {
             let tree = []
             for (let item of hierarchy.children) {
                 let children = []
-                for (let itemSub of item.subaccounts) {
-                    let child = {
-                        name: `🧾 ${itemSub.displayName}`,
-                        value: `{"guid": "${itemSub.guid}", "type": "item" }`,
-                        short: `Selected: ${itemSub.displayName}`
+                if(item.subaccounts){
+                    for (let itemSub of item.subaccounts) {
+                        let child = {
+                            name: `🧾 ${itemSub.displayName}`,
+                            value: `{"guid": "${itemSub.guid}", "type": "item" }`,
+                            short: `Selected: ${itemSub.displayName}`
+                        }
+                        children.push(child)
                     }
-                    children.push(child)
-                }
-                let leaf = {
-                    name: `📁 ${item.displayName}`,
-                    value: `{"guid": "${item.guid}", "type": "folder" }`,
-                    children: children
+                    let leaf = {
+                        name: `📁 ${item.displayName}`,
+                        value: `{"guid": "${item.guid}", "type": "folder" }`,
+                        children: children
+                    }
+                    tree.push(leaf)
                 }
-                tree.push(leaf)
+                
             }
             for (let item of hierarchy.subaccounts) {
                 let leaf = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hana-cli",
-  "version": "3.202309.1",
+  "version": "3.202309.2",
   "description": "HANA Developer Command Line Interface",
   "main": "index.js",
   "bin": {

utils/connections.js

@@ -147,9 +147,17 @@ export async function getConnOptions(prompts) {
             dotenv.config({ path: dotEnvFile })
         } else {
             try {
-                process.env.CDS_ENV = 'hybrid'
-                let optionsCDS = cds.env.requires.db
-                let options = { hana: optionsCDS.credentials }
+                const data = fs.readFileSync(cdsrcPrivate,
+                    { encoding: 'utf8', flag: 'r' })
+                const object = JSON.parse(data)
+                const resolveBinding = base.require('@sap/cds-dk/lib/bind/bindingResolver') //.BindingResolver(LOG)
+                let resolvedService = await resolveBinding.resolveBinding(null, object.requires['[hybrid]'].db.binding)
+                let options = { hana: resolvedService.credentials }
+
+                /*                 process.env.CDS_ENV = 'hybrid'
+                                let optionsCDS = cds.env.requires.db
+                                console.log(optionsCDS)
+                                let options = { hana: optionsCDS.credentials } */
                 options.hana.pooling = true
                 base.debug(options)
                 base.debug(base.bundle.getText("connectionFile"))
@@ -161,8 +169,8 @@ export async function getConnOptions(prompts) {
                 if (e.code !== 'MODULE_NOT_FOUND') {
                     // Re-throw not "Module not found" errors 
                     throw e
-                  }
-                  throw base.bundle.getText("cds-dk2")
+                }
+                throw base.bundle.getText("cds-dk2")
             }
         }
     }