@sap/cds-dk 9.8.4 → 9.9.1

package/lib/init/template/http/index.js

@@ -1,5 +1,4 @@
 const https = require('node:https')
-const axios = require('axios')
 const asJson = require("../data/as-json")
 const cds = require('../../../cds')
 const cf = require('../../../util/cf')
@@ -255,13 +254,42 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const { url, clientid, clientsecret, certurl, certificate, key } = credentials
       if (!url) throw new Error('No authentication service found in the environment of ' + app)
 
-      const auth = certificate ? { maxRedirects: 0, httpsAgent: new https.Agent({ cert: certificate, key }) }
-                               : { auth: { username: clientid, password: clientsecret } }
       const suffix = xsuaa ? 'oauth/token' : 'oauth2/token'
-      const authUrl = `${certurl ?? url}/${suffix}`
+      const authUrl = new URL(`${certurl ?? url}/${suffix}`)
       const data = `grant_type=client_credentials&client_id=${encodeURI(clientid)}`
-      const config = { method: 'POST', timeout: 5000, data, ...auth }
-      const { access_token } = (await axios(authUrl, config)).data
+      const headers = { 'Content-Type': 'application/x-www-form-urlencoded' }
+      let access_token
+      if (certificate) {
+        const raw = await new Promise((resolve, reject) => {
+          const req = https.request({
+            hostname: authUrl.hostname,
+            port: authUrl.port || 443,
+            path: authUrl.pathname + authUrl.search,
+            cert: certificate, key,
+            method: 'POST',
+            headers
+          }, res => {
+            const chunks = []
+            res.on('data', x => chunks.push(x))
+            res.on('end', () => {
+              if (res.statusCode >= 200 && res.statusCode < 300) resolve(Buffer.concat(chunks).toString())
+              else reject(new Error(`Failed to fetch access token: ${res.statusCode}`))
+            })
+          })
+          req.on('error', reject)
+          req.end(data)
+        });
+        ({ access_token } = JSON.parse(raw))
+      } else {
+        headers['Authorization'] = 'Basic ' + Buffer.from(`${clientid}:${clientsecret}`).toString('base64')
+        const response = await fetch(authUrl.toString(), {
+          method: 'POST',
+          headers,
+          body: data
+        })
+        if (!response.ok) throw new Error(`Failed to fetch access token: ${response.status} ${response.statusText}`)
+        ;({ access_token } = await response.json())
+      }
       const approuterAuth = `x-approuter-authorization: bearer ${access_token}`
       return [hostname, approuterAuth]
     }

package/lib/init/template/kyma/index.js

@@ -16,6 +16,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
       },
       'y': {
         type: 'boolean',
+        help: 'Skip interactive prompts.'
       }
     }
   }

package/lib/init/template/lint/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
     "@sap/eslint-plugin-cds": "^4",
-    "eslint": "^9"
+    "eslint": "^10"
   }
 }

package/lib/init/template/nodejs/files/package.json.hbs

@@ -5,7 +5,7 @@
     "@sap/cds": "^9"
   },
   "devDependencies": {
-    "@cap-js/sqlite": "^2"
+    "@cap-js/sqlite": "^2.4"
   },
   "scripts": {
     "start": "cds-serve"

package/lib/init/template/pipeline/files/ui5.yaml.hbs

@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
+# yaml-language-server: $schema=https://ui5.github.io/cli/schema/ui5.yaml.json
 specVersion: '4.0'
 metadata:
   name: {{app}}

package/lib/init/template/postgres/files/values.yaml.hbs

@@ -3,7 +3,7 @@ srv:
   bindings:
     postgres:
       serviceInstanceName: postgres
-postgres-db-deployer:
+postgres-deployer:
   image:
     repository: {{appName}}-postgres-deployer
   bindings:

package/lib/init/template/postgres/index.js

@@ -21,7 +21,7 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
     const project = readProject()
     const { configFile, isJava } = project
     project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
-    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
+    await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true })
     if (isJava) await mvn.add('postgresql')
 
     await sort('package.json', 'dependencies')

package/lib/init/template/react/files/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>catalog</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>

package/lib/init/template/react/files/package.json.hbs

@@ -0,0 +1,22 @@
+{
+  "name": "{{app}}",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^19",
+    "react-dom": "^19"
+  },
+  "devDependencies": {
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "@vitejs/plugin-react": "^6",
+    "adm-zip": "^0",
+    "vite": "^8"
+  }
+}

package/lib/init/template/react/files/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 56 56" aria-hidden="true"><path fill="#5A7A94" d="M45.84 21.462a8.489 8.489 0 0 0-12.783-5.713A10.747 10.747 0 0 0 22.41 8.5C10 8.5 11.09 21.488 11.09 21.488A10.3 10.3 0 0 0 13 41.5v-3a7.477 7.477 0 0 1-5.639-5 7.247 7.247 0 0 1 4.666-9.164l2.279-.768-.286-1.5A7.521 7.521 0 0 1 13.9 20a10.535 10.535 0 0 1 2.188-5.828 7.375 7.375 0 0 1 6.4-2.824c3.264 0 7.286 2.9 8.221 5.636l.934 2.732 2.424-1.318a7.6 7.6 0 0 1 3.39-.894 5.546 5.546 0 0 1 5.443 4.518l.288 1.528 1.125.514A7.809 7.809 0 0 1 48.891 29.7 7.809 7.809 0 0 1 43 38.5v3.02A10.793 10.793 0 0 0 52 31a10.483 10.483 0 0 0-6.16-9.538"/><g fill="#0092D1" transform="scale(1.05 1.2)"><g transform="translate(-2 -7)"><path d="M24.561 38.939l-6-6a1.5 1.5 0 0 0-2.122 2.122L21.379 40l-4.94 4.939a1.5 1.5 0 0 0 2.122 2.122l6-6a1.5 1.5 0 0 0 0-2.122"/><path d="M26.5 35.5h12a1.5 1.5 0 0 0 0-3h-12a1.5 1.5 0 0 0 0 3"/><path d="M38.5 38.5h-9a1.5 1.5 0 0 0 0 3h9a1.5 1.5 0 0 0 0-3"/><path d="M38.5 44.5h-12a1.5 1.5 0 0 0 0 3h12a1.5 1.5 0 0 0 0-3"/></g></g></svg>

package/lib/init/template/react/files/src/App.jsx.hbs

@@ -0,0 +1,29 @@
+import { useEffect, useState } from 'react'
+
+export default function App() {
+  const [books, setBooks] = useState([])
+
+  useEffect(() => {
+    fetch('/odata/v4/{{#isJava}}CatalogService{{/isJava}}{{^isJava}}catalog{{/isJava}}/Books')
+      .then(r => r.json())
+      .then(r => setBooks(r.value))
+  }, [])
+
+  return (
+    <>
+      <h1>Books</h1>
+      <table>
+        <tbody>
+          {books.map(b => (
+            <tr key={b.ID}>
+              <td>
+                <span className="title">{b.title}</span>{{^isJava}}
+                <span className="author"><i> by {b.author}</i></span>{{/isJava}}
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </>
+  )
+}

package/lib/init/template/react/files/src/index.css

@@ -0,0 +1,28 @@
+:root {
+  --text: #111;
+  --text-muted: #777;
+  --bg: #fff;
+  --sans: system-ui, 'Segoe UI', Roboto, sans-serif;
+  font-family: var(--sans);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --text: #fff;
+    --text-muted: #a3a3a3;
+    --bg: #16171d;
+  }
+}
+
+body {
+  color: var(--text);
+  background: var(--bg);
+}
+
+.title {
+  color: var(--text);
+}
+
+.author {
+  color: var(--text-muted);
+}

package/lib/init/template/react/files/src/main.jsx

@@ -0,0 +1,10 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import './index.css'
+import App from './App.jsx'
+
+createRoot(document.getElementById('root')).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+)

package/lib/init/template/react/files/vite.config.js

@@ -0,0 +1,19 @@
+import { defineConfig } from 'vite'
+import AdmZip from 'adm-zip'
+import react from '@vitejs/plugin-react'
+
+export default defineConfig({
+  plugins: [react(), {
+      name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
+      closeBundle() {
+        const zip = new AdmZip()
+        zip.addLocalFolder('dist')
+        zip.writeZip('dist/catalog.zip')
+      }
+  }],
+  server: {
+    proxy: {
+      '/odata': 'http://localhost:4004'
+    }
+  }
+})

package/lib/init/template/react/index.js

@@ -0,0 +1,29 @@
+const cds = require('../../../cds')
+const { path, sh: $ } = cds.utils
+const { ask4 } = require('../../../util/question')
+const { renderAndCopy } = require('../../template')
+
+module.exports = class ReactTemplate extends require('../../plugin') {
+
+  options() {
+    return {
+      'into': {
+        type: 'string',
+        short: 'i',
+        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'.`
+      }
+    }
+  }
+
+  static help() {
+    return 'user interface for React'
+  }
+
+  async run() {
+    const app = cds.cli.options.into ?? await ask4([`app name: `])
+    let into = path.join(cds.env.folders.app, app)
+    await renderAndCopy(path.join(__dirname, 'files'), into, { app, isJava: cds.env['project-nature'] === 'java' })
+    if (cds.cli.command === 'init') into = path.join(cds.cli.argv[0], into)
+    await $`npm i --prefix ${into}`
+  }
+}

package/lib/init/template/sample/index.js

@@ -2,7 +2,6 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { read, write, copy } = cds.utils
 const { readProject } = require('../../projectReader')
-const { merge } = require('../../merge')
 const { renderAndCopy } = require('../../template')
 const mvn = require('../../mvn')
 
@@ -46,8 +45,6 @@ module.exports = class SampleTemplate extends require('../../plugin') {
             ])
         }
 
-        await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: { appPath }})
-
         // manifest.json IDs must be unique -> otherwise deployment failures on conflicts
         await Promise.all(project.appUIPaths.map(async p => {
             const manifest = await read(join(appPath, p, 'webapp/manifest.json'))
@@ -55,7 +52,7 @@ module.exports = class SampleTemplate extends require('../../plugin') {
             await write(join(appPath, p, 'webapp/manifest.json'), manifest, { spaces: 2 })
         }))
 
-        if (project.isNodejs) { // REVISIT: align with Java samples
+        if (project.isNodejs) {
             const fioriSandboxConfigPath = join(appPath, 'appconfig/fioriSandboxConfig.json')
             const fioriSandboxConfig = await read(fioriSandboxConfigPath)
             const sampleInbounds = { BrowseBooks: 'browse', ManageAuthors: 'admin-authors', BrowseGenres: 'genres', ManageBooks: 'admin-books' }

package/lib/init/template/test/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-test": ">=0.4.1"
+    "@cap-js/cds-test": "^1"
   },
   "scripts": {
     "test": "node --test"

package/lib/init/template/test/files/test/test.xs.hbs

@@ -2,15 +2,15 @@
 {{#hasEsmStyle}}
 import cds from '@sap/cds'
 
-const { GET, POST, expect, axios } = cds.test (import.meta.dirname+'/..')
+const { GET, POST, expect, defaults } = cds.test (import.meta.dirname+'/..')
 {{/hasEsmStyle}}
 {{^hasEsmStyle}}
 const cds = require('@sap/cds')
 
-const { GET, POST, expect, axios } = cds.test (__dirname+'/..')
+const { GET, POST, expect, defaults } = cds.test (__dirname+'/..')
 {{/hasEsmStyle}}
 {{#user}}
-axios.defaults.auth = { username: '{{user}}', password: '{{password}}' }
+defaults.auth = { username: '{{user}}', password: '{{password}}' }
 {{/user}}
 
 describe('{{serviceName}} OData APIs', () => {

package/lib/init/template/typer/index.js

@@ -28,7 +28,7 @@ module.exports = class TyperTemplate extends require('../../plugin') {
     }
     await merge(template('package.json')).into('package.json')
     await mergeGitignore('.gitignore', template('gitignore'))
-    console.log(dim(`  adding '@cds-models' to .gitignore to ignore generated types`)) // REVISIT: other facets are silent wrt. what they change
+    console.log(dim(`  adding '@cds-models' to .gitignore to ignore generated types`))
     console.log(dim('  added new dependencies to the project. Run ') + bold('npm i') + dim(' to install.'))
     try {
       await merge(source).into(target)

package/lib/init/template/typescript/files/package.json

@@ -3,6 +3,6 @@
     "@cap-js/cds-types": "^0.16.0",
     "@types/node": "^24.0.0",
     "tsx": "^4",
-    "typescript": "^5"
+    "typescript": "^6.0.0"
   }
 }

package/lib/init/template/typescript/index.js

@@ -34,6 +34,6 @@ module.exports = class TypescriptTemplate extends require('../../plugin') {
         : e
     }
     await merge(join(__dirname, 'files', 'package.json')).into('package.json')
-    await new TyperTemplate().run() // REVISIT: we should avoid referencing other plugins
+    await new TyperTemplate().run()
   }
 }

package/lib/init/template/ui5/index.js

@@ -8,7 +8,8 @@ module.exports = class extends require('../../plugin') {
     const startPage = path.join(cds.root, cds.env.folders.app, 'index.html')
     const packageJson = path.join(cds.root, 'package.json')
     return exists(startPage) && fs.readFileSync(startPage).includes('https://sapui5') ||
-           exists(packageJson) && fs.readFileSync(packageJson).includes('"sapux":')
+           exists(packageJson) && fs.readFileSync(packageJson).includes('"sapux":') ||
+           exists(path.join(cds.root, cds.env.folders.app, 'fiori-apps.html'))
   }
 
   static help() {

package/lib/init/template/vue/files/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>catalog</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.js"></script>
+  </body>
+</html>

package/lib/init/template/vue/files/package.json.hbs

@@ -0,0 +1,19 @@
+{
+  "name": "{{app}}",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^6",
+    "adm-zip": "^0",
+    "vite": "^8"
+  }
+}

package/lib/init/template/vue/files/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 56 56" aria-hidden="true"><path fill="#5A7A94" d="M45.84 21.462a8.489 8.489 0 0 0-12.783-5.713A10.747 10.747 0 0 0 22.41 8.5C10 8.5 11.09 21.488 11.09 21.488A10.3 10.3 0 0 0 13 41.5v-3a7.477 7.477 0 0 1-5.639-5 7.247 7.247 0 0 1 4.666-9.164l2.279-.768-.286-1.5A7.521 7.521 0 0 1 13.9 20a10.535 10.535 0 0 1 2.188-5.828 7.375 7.375 0 0 1 6.4-2.824c3.264 0 7.286 2.9 8.221 5.636l.934 2.732 2.424-1.318a7.6 7.6 0 0 1 3.39-.894 5.546 5.546 0 0 1 5.443 4.518l.288 1.528 1.125.514A7.809 7.809 0 0 1 48.891 29.7 7.809 7.809 0 0 1 43 38.5v3.02A10.793 10.793 0 0 0 52 31a10.483 10.483 0 0 0-6.16-9.538"/><g fill="#0092D1" transform="scale(1.05 1.2)"><g transform="translate(-2 -7)"><path d="M24.561 38.939l-6-6a1.5 1.5 0 0 0-2.122 2.122L21.379 40l-4.94 4.939a1.5 1.5 0 0 0 2.122 2.122l6-6a1.5 1.5 0 0 0 0-2.122"/><path d="M26.5 35.5h12a1.5 1.5 0 0 0 0-3h-12a1.5 1.5 0 0 0 0 3"/><path d="M38.5 38.5h-9a1.5 1.5 0 0 0 0 3h9a1.5 1.5 0 0 0 0-3"/><path d="M38.5 44.5h-12a1.5 1.5 0 0 0 0 3h12a1.5 1.5 0 0 0 0-3"/></g></g></svg>

package/lib/init/template/vue/files/src/App.vue.hbs

@@ -0,0 +1,34 @@
+<script setup>
+import { ref, onMounted } from 'vue'
+
+const books = ref([])
+
+onMounted(async () => {
+  const r = await fetch('/odata/v4/{{#isJava}}CatalogService{{/isJava}}{{^isJava}}catalog{{/isJava}}/Books')
+  books.value = (await r.json()).value
+})
+</script>
+
+<template>
+  <main>
+    <h1>Books</h1>
+    <table>
+      <tr v-for="b in books" :key="b.ID">
+        <td>
+          <span class="title">{{#literal}}{{ b.title }}{{/literal}}</span>{{^isJava}}
+          <span class="author"><i>{{#literal}} by {{ b.author }}{{/literal}}</i></span>{{/isJava}}
+        </td>
+      </tr>
+    </table>
+  </main>
+</template>
+
+<style scoped>
+.title {
+  color: var(--text);
+}
+
+.author {
+  color: var(--text-muted);
+}
+</style>

package/lib/init/template/vue/files/src/main.js

@@ -0,0 +1,5 @@
+import { createApp } from 'vue'
+import './style.css'
+import App from './App.vue'
+
+createApp(App).mount('#app')

package/lib/init/template/vue/files/src/style.css

@@ -0,0 +1,20 @@
+:root {
+  --text: #111;
+  --text-muted: #777;
+  --bg: #fff;
+  --sans: system-ui, 'Segoe UI', Roboto, sans-serif;
+  font-family: var(--sans);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --text: #fff;
+    --text-muted: #a3a3a3;
+    --bg: #16171d;
+  }
+}
+
+body {
+  color: var(--text);
+  background: var(--bg);
+}

package/lib/init/template/vue/files/vite.config.js

@@ -0,0 +1,19 @@
+import { defineConfig } from 'vite'
+import AdmZip from 'adm-zip'
+import vue from '@vitejs/plugin-vue'
+
+export default defineConfig({
+  plugins: [vue(), {
+      name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
+      closeBundle() {
+        const zip = new AdmZip()
+        zip.addLocalFolder('dist')
+        zip.writeZip('dist/catalog.zip')
+      }
+  }],
+  server: {
+    proxy: {
+      '/odata': 'http://localhost:4004'
+    }
+  }
+})

package/lib/init/template/vue/index.js

@@ -0,0 +1,30 @@
+const cds = require('../../../cds')
+const { path, sh: $ } = cds.utils
+const { ask4 } = require('../../../util/question')
+const { renderAndCopy } = require('../../template')
+
+module.exports = class VueTemplate extends require('../../plugin') {
+
+  options() {
+    return {
+      'into': {
+        type: 'string',
+        short: 'i',
+        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'.`
+      }
+    }
+  }
+
+  static help() {
+    return 'user interface for Vue.js'
+  }
+
+  async run() {
+    const app = cds.cli.options.into ?? await ask4([`app name: `])
+    let into = path.join(cds.env.folders.app, app)
+    await renderAndCopy(path.join(__dirname, 'files'), into, { app, isJava: cds.env['project-nature'] === 'java', literal: () => text => text,
+ })
+    if (cds.cli.command === 'init') into = path.join(cds.cli.argv[0], into)
+    await $`npm i --prefix ${into}`
+  }
+}

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -56,10 +56,10 @@ resources:
     parameters:
       service: destination
       service-plan: lite
+      {{#hasMultitenancy}}
       config:
         HTML5Runtime_enabled: true
         init_data:
-          {{#hasMultitenancy}}
           subaccount:
             existing_destinations_policy: update
             destinations:
@@ -69,18 +69,7 @@ resources:
                 ProxyType: Internet
                 URL: https://${org}.launchpad.${default-domain}
                 CEP.HTML5contentprovider: true
-          {{/hasMultitenancy}}
-          instance:
-            existing_destinations_policy: update
-            destinations:
-              - Name: srv-api
-                URL: ~{srv-api/srv-url}
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-                HTML5.ForwardAuthToken: true
-                HTML5.DynamicDestination: true
-                {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
+      {{/hasMultitenancy}}
     requires:
       - name: srv-api
 

package/lib/init/xml.js

@@ -16,8 +16,6 @@ function _removeTextAttributes(value, parentElement) {
   }
 }
 
-// REVISIT: Simplify config
-// REVISIT: fast-xml-parser
 /**
  * Parse a given string containing xml
  * used to remove the _text object from converted json i.e. from xml-js.

package/lib/mtx/auth_manager.js

@@ -1,11 +1,8 @@
-const axios = require('axios');
-
 const cds = require('../cds');
 const { SettingsManager } = require('./settings_manager');
 const { ParamCollection } = require('./params');
 const { getMessage } = require('./util/logging');
-
-require('../util/axios').pruneErrors();
+const { buildResponseError, buildNetworkError, parseResponseBody } = require('./util/request');
 
 const DEBUG = cds.debug('cli');
 const REASONS = { invalid_scope: /\binvalid_scope\b/ };
@@ -71,7 +68,7 @@ async function fetchToken(params) {
         return;
     }
 
-    let response, error;
+    let responseData, error;
     const method = 'post';
     do {
         const { url, data, ignored } = reqParams(method, params);
@@ -81,11 +78,23 @@ async function fetchToken(params) {
         DEBUG?.(`Getting authentication token from ${method.toUpperCase()} ${params.obfuscateQueryParams(url)}`);
         error = undefined;
         try {
-            response = await axios[method](url, data);
+            const response = await fetch(url, {
+                method: method.toUpperCase(),
+                body: data,
+                headers: { 'content-type': 'application/x-www-form-urlencoded' }
+            });
+            if (!response.ok) {
+                throw await buildResponseError(method, url, response);
+            }
+            responseData = await parseResponseBody(response);
             break;
         } catch (e) {
-            error = e;
-            DEBUG?.(`HTTP status ${e.status}`);
+            if (e.status) {
+                error = e;
+            } else {
+                error = buildNetworkError(method, url, e);
+            }
+            DEBUG?.(`HTTP status ${error.status}`);
             if (params.has('refreshToken')) {
                 DEBUG?.('Discarding invalid refresh token');
                 params.delete('refreshToken');
@@ -93,8 +102,8 @@ async function fetchToken(params) {
                 break;
             }
         }
-    } while (!response);
-    const data = response?.data ?? error?.auth;
+    } while (!responseData);
+    const data = responseData ?? error?.auth;
     assign(params, data);
     if (error) {
         let message;
@@ -126,7 +135,8 @@ module.exports = class AuthManager {
         const params = new ParamCollection(paramValues);
         await SettingsManager.loadAndMergeSettings(params);
         if (params.has('username')) {
-            params.set('reqAuth', { auth: { username: params.get('username'), password: params.get('password') } });
+            const encoded = Buffer.from(`${params.get('username')}:${params.get('password')}`).toString('base64');
+            params.set('reqAuth', { headers: { Authorization: `Basic ${encoded}` } });
         } else if (!params.get('skipToken')) {
             try {
                 await fetchToken(params);