abap-local-client 1.3.1 → 1.4.1

package/basic-auth.mjs

@@ -46,7 +46,7 @@ export class BasicSession {
                 'Authorization':    `Basic ${this._basicAuth}`,
             },
             httpsAgent: new https.Agent({
-                rejectUnauthorized: opts.rejectUnauthorized === true,  // default false, like old client
+                rejectUnauthorized: opts.rejectUnauthorized !== undefined ? opts.rejectUnauthorized : false,
                 keepAlive: true,
             }),
         });
@@ -144,30 +144,30 @@ export class BasicSession {
         });
     }
 
-    /** POST request (auto-injects CSRF token). */
+    /** POST request. */
     async post(path, data, extraHeaders = {}) {
-        if (!this.csrfToken) await this.refreshCsrf();
+        const contentType = (data !== null && typeof data === 'object' && !extraHeaders['Content-Type'] && !extraHeaders['content-type'])
+            ? 'application/json' : 'application/xml';
         return this._client({
             method: 'POST',
             url: path,
             headers: this._headers(path, {
-                'Content-Type': 'application/xml',
-                'X-CSRF-Token': this.csrfToken,
+                'Content-Type': contentType,
                 ...extraHeaders,
             }),
             data,
         });
     }
 
-    /** PUT request (auto-injects CSRF token). */
+    /** PUT request. */
     async put(path, data, extraHeaders = {}) {
-        if (!this.csrfToken) await this.refreshCsrf();
+        const contentType = (data !== null && typeof data === 'object' && !extraHeaders['Content-Type'] && !extraHeaders['content-type'])
+            ? 'application/json' : 'application/xml';
         return this._client({
             method: 'PUT',
             url: path,
             headers: this._headers(path, {
-                'Content-Type': 'application/xml',
-                'X-CSRF-Token': this.csrfToken,
+                'Content-Type': contentType,
                 ...extraHeaders,
             }),
             data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abap-local-client",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "SAP Local Client — WebSocket bridge with Basic, SPNEGO, X.509, SAML & SNC authentication",
   "main": "sso-sap-client.mjs",
   "type": "module",

package/sap-rfc-client.js

@@ -677,15 +677,47 @@ export class SAPRFCClient {
     }
 
     /** Fetch a fresh CSRF token via GET /sap/bc/adt/discovery */
-    async fetchCsrfToken() {
+    async fetchCsrfToken(httpSession) {
         console.log('[RFC] Fetching CSRF token...');
-        const resp = await this.callADT('GET', '/sap/bc/adt/discovery', {
-            'X-CSRF-Token': 'Fetch',
-            'Accept': 'application/atomsvc+xml',
-        }, null);
-        if (resp.headers['x-csrf-token']) {
-            this.csrfToken = resp.headers['x-csrf-token'];
-            console.log(`[RFC] CSRF token: ${this.csrfToken.substring(0, 15)}...`);
+
+        if (httpSession && httpSession.csrfToken) {
+            this.csrfToken = httpSession.csrfToken;
+            console.log(`[RFC] CSRF token from existing HTTP session: ${this.csrfToken.substring(0, 15)}...`);
+            return;
+        }
+
+        if (httpSession && typeof httpSession.get === 'function') {
+            try {
+                const resp = await httpSession.get('/sap/bc/adt/discovery', {
+                    'X-CSRF-Token': 'Fetch',
+                    'Accept': 'application/atomsvc+xml',
+                });
+                if (resp.headers?.['x-csrf-token']) {
+                    this.csrfToken = resp.headers['x-csrf-token'];
+                    httpSession.csrfToken = this.csrfToken;
+                    console.log(`[RFC] CSRF token via HTTP session: ${this.csrfToken.substring(0, 15)}...`);
+                    return;
+                }
+            } catch (e) {
+                console.log(`[RFC] HTTP session CSRF fetch failed: ${e.message}, falling back to RFC`);
+            }
+        }
+
+        console.log('[RFC] Attempting CSRF fetch via RFC callADT...');
+        try {
+            const resp = await this.callADT('GET', '/sap/bc/adt/discovery', {
+                'X-CSRF-Token': 'Fetch',
+                'Accept': 'application/atomsvc+xml',
+            }, null);
+            console.log(`[RFC] callADT response: status=${resp.status}, headers=${JSON.stringify(resp.headers)}`);
+            if (resp.headers['x-csrf-token']) {
+                this.csrfToken = resp.headers['x-csrf-token'];
+                console.log(`[RFC] CSRF token: ${this.csrfToken.substring(0, 15)}...`);
+            } else {
+                console.log('[RFC] No x-csrf-token in response headers!');
+            }
+        } catch (e) {
+            console.log(`[RFC] callADT CSRF fetch failed: ${e.message}`);
         }
     }