@sasjs/adapter 3.8.2 → 3.8.5

package/node/types/errors/CertificateError.d.ts

@@ -0,0 +1,3 @@
+export declare class CertificateError extends Error {
+    constructor(message: string);
+}

package/node/types/errors/index.d.ts

@@ -1,13 +1,14 @@
 export * from './AuthorizeError';
+export * from './CertificateError';
 export * from './ComputeJobExecutionError';
+export * from './ErrorResponse';
 export * from './InternalServerError';
+export * from './InvalidJsonError';
 export * from './JobExecutionError';
 export * from './JobStatePollError';
+export * from './JsonParseArrayError';
 export * from './LoginRequiredError';
-export * from './NotFoundError';
-export * from './ErrorResponse';
 export * from './NoSessionStateError';
+export * from './NotFoundError';
 export * from './RootFolderNotFoundError';
-export * from './JsonParseArrayError';
 export * from './WeboutResponseError';
-export * from './InvalidJsonError';

package/package.json

@@ -79,5 +79,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.8.2"
+  "version": "3.8.5"
 }

package/src/SASViyaApiClient.ts

@@ -11,7 +11,11 @@ import {
   JobDefinition,
   PollOptions
 } from './types'
-import { JobExecutionError, RootFolderNotFoundError } from './types/errors'
+import {
+  CertificateError,
+  JobExecutionError,
+  RootFolderNotFoundError
+} from './types/errors'
 import { SessionManager } from './SessionManager'
 import { ContextManager } from './ContextManager'
 import { SasAuthResponse, MacroVar, AuthConfig } from '@sasjs/utils/types'
@@ -878,7 +882,8 @@ export class SASViyaApiClient {
 
     const { result: folder } = await this.requestClient
       .get<Folder>(`${this.serverUrl}${url}`, accessToken)
-      .catch(() => {
+      .catch((err) => {
+        if (err instanceof CertificateError) throw err
         return { result: null }
       })
 
@@ -899,7 +904,8 @@ export class SASViyaApiClient {
 
     const { result: folder } = await this.requestClient
       .get<Folder>(`${this.serverUrl}${url}`, accessToken)
-      .catch(() => {
+      .catch((err) => {
+        if (err instanceof CertificateError) throw err
         return { result: null }
       })
 

package/src/auth/getAccessTokenForViya.ts

@@ -1,6 +1,7 @@
 import { SasAuthResponse } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from '../request/RequestClient'
+import { CertificateError } from '../types/errors'
 
 /**
  * Exchanges the auth code for an access token for the given client.
@@ -36,6 +37,7 @@ export async function getAccessTokenForViya(
     .post(url, data, undefined, 'application/x-www-form-urlencoded', headers)
     .then((res) => res.result as SasAuthResponse)
     .catch((err) => {
+      if (err instanceof CertificateError) throw err
       throw prefixMessage(err, 'Error while getting access token. ')
     })
 

package/src/job-execution/FileUploader.ts

@@ -99,7 +99,20 @@ export class FileUploader extends BaseJobExecutor {
                     ? parseWeboutResponse(res.result, uploadUrl)
                     : res.result
                 break
+              case ServerType.Sasjs:
+                if (typeof res.result._webout === 'object') {
+                  jsonResponse = res.result._webout
+                } else {
+                  const webout = parseWeboutResponse(
+                    res.result._webout,
+                    uploadUrl
+                  )
+                  jsonResponse = getValidJson(webout)
+                }
+                break
             }
+          } else if (this.serverType === ServerType.Sasjs) {
+            jsonResponse = getValidJson(res.result._webout)
           } else {
             jsonResponse =
               typeof res.result === 'string'

package/src/request/RequestClient.ts

@@ -7,7 +7,8 @@ import {
   LoginRequiredError,
   NotFoundError,
   InternalServerError,
-  JobExecutionError
+  JobExecutionError,
+  CertificateError
 } from '../types/errors'
 import { SASjsRequest } from '../types'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
@@ -131,6 +132,26 @@ export class RequestClient implements HttpClient {
         } else {
           sasWork = response.log
         }
+      } else if (response?.result?.log) {
+        //In this scenario we know we got the response from SASJS server
+        //Log is array of `{ line: '' }` so we need to convert it back to text
+        //To be able to parse it with current functions.
+        let log: string = ''
+
+        if (typeof log !== 'string') {
+          log = response.result.log
+            .map((logLine: any) => logLine.line)
+            .join('\n')
+        }
+
+        sourceCode = parseSourceCode(log)
+        generatedCode = parseGeneratedCode(log)
+
+        if (response?.result?._webout) {
+          sasWork = response.result._webout.WORK
+        } else {
+          sasWork = log
+        }
       } else if (response?.result) {
         sourceCode = parseSourceCode(response.result)
         generatedCode = parseGeneratedCode(response.result)
@@ -497,6 +518,10 @@ export class RequestClient implements HttpClient {
       else return
     }
 
+    if (e.isAxiosError && e.code === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE') {
+      throw new CertificateError(e.message)
+    }
+
     if (e.message) throw e
     else throw prefixMessage(e, 'Error while handling error. ')
   }

package/src/types/errors/CertificateError.ts

@@ -0,0 +1,12 @@
+const instructionsToFix =
+  'https://github.com/sasjs/cli/issues/1181#issuecomment-1090638584'
+
+export class CertificateError extends Error {
+  constructor(message: string) {
+    super(
+      `${message}\nPlease visit the link below for further information on this issue:\n- ${instructionsToFix}\n`
+    )
+    this.name = 'CertificateError'
+    Object.setPrototypeOf(this, CertificateError.prototype)
+  }
+}

package/src/types/errors/index.ts

@@ -1,13 +1,14 @@
 export * from './AuthorizeError'
+export * from './CertificateError'
 export * from './ComputeJobExecutionError'
+export * from './ErrorResponse'
 export * from './InternalServerError'
+export * from './InvalidJsonError'
 export * from './JobExecutionError'
 export * from './JobStatePollError'
+export * from './JsonParseArrayError'
 export * from './LoginRequiredError'
-export * from './NotFoundError'
-export * from './ErrorResponse'
 export * from './NoSessionStateError'
+export * from './NotFoundError'
 export * from './RootFolderNotFoundError'
-export * from './JsonParseArrayError'
 export * from './WeboutResponseError'
-export * from './InvalidJsonError'

package/src/utils/parseViyaDebugResponse.ts

@@ -16,10 +16,15 @@ export const parseSasViyaDebugResponse = async (
   requestClient: RequestClient,
   serverUrl: string
 ) => {
+  // On viya 3.5, iframe is like <iframe style="width: 99%; height: 500px" src="..."></iframe>
+  // On viya 4, iframe is like <iframe style="width: 99%; height: 500px; background-color:Canvas;" src=...></iframe>
+
   const iframeStart = response.split(
-    '<iframe style="width: 99%; height: 500px" src="'
+    /<iframe style="width: 99%; height: 500px" src="|<iframe style="width: 99%; height: 500px; background-color:Canvas;" src=/
   )[1]
-  const jsonUrl = iframeStart ? iframeStart.split('"></iframe>')[0] : null
+  const jsonUrl = iframeStart
+    ? iframeStart.split(/"><\/iframe>|><\/iframe>/)[0]
+    : null
   if (!jsonUrl) {
     throw new Error('Unable to find webout file URL.')
   }

package/types/errors/CertificateError.d.ts

@@ -0,0 +1,3 @@
+export declare class CertificateError extends Error {
+    constructor(message: string);
+}

package/types/errors/index.d.ts

@@ -1,13 +1,14 @@
 export * from './AuthorizeError';
+export * from './CertificateError';
 export * from './ComputeJobExecutionError';
+export * from './ErrorResponse';
 export * from './InternalServerError';
+export * from './InvalidJsonError';
 export * from './JobExecutionError';
 export * from './JobStatePollError';
+export * from './JsonParseArrayError';
 export * from './LoginRequiredError';
-export * from './NotFoundError';
-export * from './ErrorResponse';
 export * from './NoSessionStateError';
+export * from './NotFoundError';
 export * from './RootFolderNotFoundError';
-export * from './JsonParseArrayError';
 export * from './WeboutResponseError';
-export * from './InvalidJsonError';