@sasjs/adapter 4.17.0 → 4.17.2

package/node/request/RequestClient.d.ts

@@ -12,12 +12,15 @@ export declare class RequestClient implements HttpClient {
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
+    private isRecoveringFromNetworkError;
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number, verboseMode?: VerboseMode);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;
     clearCsrfTokens(): void;
     clearLocalStorageTokens(): void;
+    resetInMemoryAuthState(): void;
+    private clearAllCookies;
     getBaseUrl(): string;
     /**
      * this method returns all requests, an array of SASjsRequest type

package/node/request/Sas9RequestClient.d.ts

@@ -7,6 +7,7 @@ import { RequestClient } from './RequestClient';
  */
 export declare class Sas9RequestClient extends RequestClient {
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    resetInMemoryAuthState(): void;
     login(username: string, password: string, jobsPath: string): Promise<void>;
     get<T>(url: string, accessToken: string | undefined, contentType?: string, overrideHeaders?: {
         [key: string]: string | number;

package/package.json

@@ -23,10 +23,24 @@
   },
   "release": {
     "plugins": [
-      "@semantic-release/npm",
-      {
-        "pkgRoot": "/build"
-      }
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      [
+        "@semantic-release/exec",
+        {
+          "prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version"
+        }
+      ],
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "package.json",
+            "package-lock.json"
+          ]
+        }
+      ],
+      "@semantic-release/github"
     ]
   },
   "keywords": [
@@ -34,14 +48,16 @@
     "viya",
     "sasjs"
   ],
-  "author": "Allan Bowe <support@macropeople.com>",
+  "author": "support@4gl.io",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sasjs/adapter"
+    "url": "git+https://github.com/sasjs/adapter.git"
   },
   "license": "ISC",
   "devDependencies": {
     "@cypress/webpack-preprocessor": "5.9.1",
+    "@semantic-release/exec": "6.0.3",
+    "@semantic-release/git": "10.0.1",
     "@types/cors": "^2.8.17",
     "@types/express": "4.17.13",
     "@types/jest": "29.5.14",
@@ -53,17 +69,17 @@
     "cp": "0.2.0",
     "cypress": "^15.7.1",
     "dotenv": "16.0.0",
-    "express": "4.17.3",
+    "express": "4.22.2",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-extended": "4.0.2",
-    "node-polyfill-webpack-plugin": "1.1.4",
+    "node-polyfill-webpack-plugin": "4.1.0",
     "path": "0.12.7",
     "pem": "1.14.5",
     "prettier": "3.8.2",
     "process": "0.11.10",
-    "semantic-release": "19.0.3",
-    "terser-webpack-plugin": "5.3.6",
+    "semantic-release": "25.0.8",
+    "terser-webpack-plugin": "5.6.1",
     "ts-jest": "29.2.6",
     "ts-loader": "9.4.0",
     "tslint": "6.1.3",
@@ -71,17 +87,17 @@
     "typedoc": "0.23.24",
     "typedoc-plugin-rename-defaults": "0.6.4",
     "typescript": "4.9.5",
-    "webpack": "5.76.2",
+    "webpack": "5.108.4",
     "webpack-cli": "4.9.2"
   },
   "main": "index.js",
   "dependencies": {
     "@sasjs/utils": "^3.5.6",
-    "axios": "1.16.0",
+    "axios": "1.18.1",
     "axios-cookiejar-support": "5.0.5",
-    "form-data": "4.0.4",
+    "form-data": "4.0.6",
     "https": "1.0.0",
     "tough-cookie": "4.1.3"
   },
-  "version": "4.17.0"
+  "version": "4.17.2"
 }

package/request/RequestClient.d.ts

@@ -12,12 +12,15 @@ export declare class RequestClient implements HttpClient {
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
+    private isRecoveringFromNetworkError;
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number, verboseMode?: VerboseMode);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;
     clearCsrfTokens(): void;
     clearLocalStorageTokens(): void;
+    resetInMemoryAuthState(): void;
+    private clearAllCookies;
     getBaseUrl(): string;
     /**
      * this method returns all requests, an array of SASjsRequest type

package/request/Sas9RequestClient.d.ts

@@ -7,6 +7,7 @@ import { RequestClient } from './RequestClient';
  */
 export declare class Sas9RequestClient extends RequestClient {
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    resetInMemoryAuthState(): void;
     login(username: string, password: string, jobsPath: string): Promise<void>;
     get<T>(url: string, accessToken: string | undefined, contentType?: string, overrideHeaders?: {
         [key: string]: string | number;

package/src/auth/AuthManager.ts

@@ -375,7 +375,7 @@ export class AuthManager {
    *
    */
   public async logOut() {
-    this.requestClient.clearCsrfTokens()
+    this.requestClient.resetInMemoryAuthState()
 
     return this.requestClient.get(this.logoutUrl, undefined).then(() => true)
   }

package/src/request/RequestClient.ts

@@ -28,6 +28,9 @@ import {
 import { InvalidSASjsCsrfError } from '../types/errors/InvalidSASjsCsrfError'
 import { inspect } from 'util'
 
+const getLogger = () =>
+  (typeof process !== 'undefined' && process.logger) || console
+
 export class RequestClient implements HttpClient {
   private requests: SASjsRequest[] = []
   private requestsLimit: number = 10
@@ -37,6 +40,7 @@ export class RequestClient implements HttpClient {
   protected csrfToken: CsrfToken = { headerName: '', value: '' }
   protected fileUploadCsrfToken: CsrfToken | undefined
   protected httpClient!: AxiosInstance
+  private isRecoveringFromNetworkError = false
 
   constructor(
     protected baseUrl: string,
@@ -77,6 +81,25 @@ export class RequestClient implements HttpClient {
     localStorage.setItem('refreshToken', '')
   }
 
+  public resetInMemoryAuthState() {
+    this.clearCsrfTokens()
+    if (typeof localStorage !== 'undefined') {
+      this.clearLocalStorageTokens()
+    }
+    if (typeof document !== 'undefined') {
+      this.clearAllCookies()
+    }
+  }
+
+  private clearAllCookies() {
+    const cookies = document.cookie.split(';')
+    for (const cookie of cookies) {
+      const name = cookie.split('=')[0].trim()
+      if (!name) continue
+      document.cookie = `${name}=; Max-Age=0; Path=/;`
+    }
+  }
+
   public getBaseUrl() {
     return this.httpClient.defaults.baseURL || ''
   }
@@ -354,6 +377,7 @@ export class RequestClient implements HttpClient {
     const csrfTokenKey = Object.keys(params).find((k) =>
       k?.toLowerCase().includes('csrf')
     )
+
     if (csrfTokenKey) {
       this.csrfToken.value = params[csrfTokenKey]
       this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token'
@@ -378,7 +402,7 @@ export class RequestClient implements HttpClient {
       })
       .then((res) => res.data)
       .catch((error) => {
-        const logger = process.logger || console
+        const logger = getLogger()
         logger.error(error)
       })
   }
@@ -687,6 +711,45 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
       throw new CertificateError(e.message)
     }
 
+    if (
+      e.isAxiosError &&
+      !response &&
+      e.code === 'ERR_NETWORK' &&
+      !this.isRecoveringFromNetworkError
+    ) {
+      // Opaque ERR_NETWORK usually means the server rejected stale credentials.
+      // Wipe in-memory auth state, re-establish session via GET /,
+      // then retry the original request.
+      this.resetInMemoryAuthState()
+      this.isRecoveringFromNetworkError = true
+      try {
+        // Re-establish session and CSRF cookie
+        const rootResponse = await this.httpClient
+          .get('/', { withXSRFToken: true })
+          .catch((err) => err.response)
+
+        if (rootResponse?.data) {
+          const cookie =
+            /<script>document.cookie = '(XSRF-TOKEN=.*; Max-Age=86400; SameSite=Strict; Path=\/;)'<\/script>/.exec(
+              rootResponse.data
+            )?.[1]
+
+          if (cookie && typeof document !== 'undefined') {
+            document.cookie = cookie
+          }
+
+          this.parseAndSetCsrfToken(rootResponse)
+        }
+
+        return await callback()
+      } catch {
+        // Session could not be recovered — surface LoginRequiredError
+        throw new LoginRequiredError()
+      } finally {
+        this.isRecoveringFromNetworkError = false
+      }
+    }
+
     if (e.message) throw e
     else throw prefixMessage(e, 'Error while handling error. ')
   }

package/src/request/Sas9RequestClient.ts

@@ -23,6 +23,13 @@ export class Sas9RequestClient extends RequestClient {
     }
   }
 
+  public resetInMemoryAuthState() {
+    super.resetInMemoryAuthState()
+    if (this.httpClient.defaults.jar) {
+      ;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookiesSync()
+    }
+  }
+
   public async login(username: string, password: string, jobsPath: string) {
     const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
     if (this.httpClient.defaults.jar) {