Merge pull request #431 from sasjs/issue-409

fix: if response does not contain valid JSON throw error #409

.git-hooks/commit-msg

@@ -6,7 +6,7 @@ GREEN="\033[1;32m"
 # temporary file which holds the message).
 commit_message=$(cat "$1")
 
-if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-]+\))?!?: .+$") then
+if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-\*]+\))?!?: .+$") then
    echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
    exit 0
 fi

.github/reviewer-lottery.yml

@@ -7,3 +7,8 @@ groups:
       - saadjutt01
       - medjedovicm
       - allanbowe
+      - sabhas
+  - name: SASjs QA
+    reviewers: 1
+    usernames:
+      - VladislavParhomchik

PULL_REQUEST_TEMPLATE.md

@@ -12,6 +12,8 @@ What code changes have been made to achieve the intent.
 
 ## Checks
 
+No PR (that involves a non-trivial code change) should be merged, unless all four of the items below are confirmed!  If an urgent fix is needed - use a tar file.
+
 - [ ] Code is formatted correctly (`npm run lint:fix`).
 - [ ] All unit tests are passing (`npm test`).
 - [ ] All `sasjs-cli` unit tests are passing (`npm test`).

README.md

@@ -172,35 +172,39 @@ Configuration on the client side involves passing an object on startup, which ca
 * `serverType` - either `SAS9` or `SASVIYA`.
 * `serverUrl` - the location (including http protocol and port) of the SAS Server. Can be omitted, eg if serving directly from the SAS Web Server, or in streaming mode.
 * `debug` - if `true` then SAS Logs and extra debug information is returned.
-* `useComputeApi` - if `true` and the serverType is `SASVIYA` then the REST APIs will be called directly (rather than using the JES web service).
-* `contextName` - if missing or blank, and `useComputeApi` is `true` and `serverType` is `SASVIYA` then the JES API will be used.
+* `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used.  If `false` the [JES API](#using-the-jes-api) is used.  If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.  
+* `contextName` - Compute context on which the requests will be called.  If missing or not provided, defaults to `Job Execution Compute context`.
 
 The adapter supports a number of approaches for interfacing with Viya (`serverType` is `SASVIYA`).  For maximum performance, be sure to [configure your compute context](https://sasjs.io/guide-viya/#shared-account-and-server-re-use) with `reuseServerProcesses` as `true` and a system account in `runServerAs`.  This functionality is available since Viya 3.5.  This configuration is supported when [creating contexts using the CLI](https://sasjs.io/sasjs-cli-context/#sasjs-context-create).
 
 ### Using JES Web App
 
-In this setup, all requests are routed through the JES web app, at `YOURSERVER/SASJobExecution`.  This is the most reliable method, and also the slowest.  One request is made to the JES app, and remaining requests (getting job uri, session spawning, passing parameters, running the program, fetching the log) are made on the SAS server by the JES app.
-
-```
-{
-  appLoc:"/Your/Path",
-  serverType:"SASVIYA"
-}
-```
-
-### Using the JES API
-Here we are running Jobs using the Job Execution Service except this time we are making the requests directly using the REST API instead of through the JES Web App.  This is helpful when we need to call web services outside of a browser (eg with the SASjs CLI or other commandline tools).  To save one network request, the adapter prefetches the JOB URIs and passes them in the `__job` parameter.
+In this setup, all requests are routed through the JES web app, at `YOURSERVER/SASJobExecution?_program=/your/program`.  This is the most reliable method, and also the slowest.  One request is made to the JES app, and remaining requests (getting job uri, session spawning, passing parameters, running the program, fetching the log) are handled by the SAS server inside the JES app.
 
 ```
 {
   appLoc:"/Your/Path",
   serverType:"SASVIYA",
-  useComputeApi: true
+  contextName: 'yourComputeContext'
+}
+```
+
+Note - to use the web approach, the `useComputeApi` property must be `undefined` or `null`.
+
+### Using the JES API
+Here we are running Jobs using the Job Execution Service except this time we are making the requests directly using the REST API instead of through the JES Web App.  This is helpful when we need to call web services outside of a browser (eg with the SASjs CLI or other commandline tools).  To save one network request, the adapter prefetches the JOB URIs and passes them in the `__job` parameter.  Depending on your network bandwidth, it may or may not be faster than the JES Web approach.
+
+```
+{
+  appLoc:"/Your/Path",
+  serverType:"SASVIYA",
+  useComputeApi: false,
+  contextName: 'yourComputeContext'
 }
 ```
 
 ### Using the Compute API
-This approach is by far the fastest, as a result of the optimisations we have built into the adapter.  With this configuration, in the first sasjs request, we take a URI map of the services in the target folder, and create a session manager - which spawns an extra session.  The next time a request is made, the adapter will use the 'hot' session.  Sessions are deleted after every use, which actually makes this _less_ resource intensive than a typical JES web app, in which all sessions are kept alive by default for 15 minutes.
+This approach is by far the fastest, as a result of the optimisations we have built into the adapter.  With this configuration, in the first sasjs request, we take a URI map of the services in the target folder, and create a session manager.  This manager will spawn a additional session every time a request is made. Subsequent requests will use the existing 'hot' session, if it exists.  Sessions are always deleted after every use, which actually makes this _less_ resource intensive than a typical JES web app, in which all sessions are kept alive by default for 15 minutes.
 
 ```
 {
@@ -225,4 +229,4 @@ If you are a SAS 9 or SAS Viya customer you can also request a copy of [Data Con
 
 If you find this library useful, help us grow our star graph!
 
-![](https://starchart.cc/sasjs/adapter.svg)
+![](https://starchart.cc/sasjs/adapter.svg)

package.json

@@ -6,14 +6,14 @@
     "build": "rimraf build && rimraf node && mkdir node && cp -r src/* node && webpack && rimraf build/src && rimraf node",
     "package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
-    "lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --write 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
-    "lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --check 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
+    "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
+    "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "test": "jest --silent --coverage",
     "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
     "postpublish": "git clean -fd",
     "semantic-release": "semantic-release",
     "typedoc": "typedoc",
-    "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
+    "prepare": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
   },
   "publishConfig": {
     "access": "public"
@@ -43,32 +43,33 @@
     "@types/tough-cookie": "^4.0.0",
     "cp": "^0.2.0",
     "dotenv": "^10.0.0",
-    "jest": "^27.0.4",
+    "jest": "^27.0.6",
     "jest-extended": "^0.11.5",
     "mime": "^2.5.2",
     "path": "^0.12.7",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
-    "semantic-release": "^17.4.3",
-    "terser-webpack-plugin": "^5.1.3",
+    "semantic-release": "^17.4.4",
+    "terser-webpack-plugin": "^5.1.4",
     "ts-jest": "^27.0.3",
     "ts-loader": "^9.2.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.20.36",
+    "typedoc": "^0.21.2",
     "typedoc-neo-theme": "^1.1.1",
     "typedoc-plugin-external-module-name": "^4.0.6",
-    "typescript": "^4.3.2",
-    "webpack": "^5.38.1",
+    "typescript": "^4.3.4",
+    "webpack": "^5.41.1",
     "webpack-cli": "^4.7.2"
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^2.20.1",
+    "@sasjs/utils": "^2.21.0",
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
     "form-data": "^4.0.0",
     "https": "^1.0.0",
+    "jwt-decode": "^3.1.2",
     "tough-cookie": "^4.0.0",
     "url": "^0.11.0"
   }

sasjs-tests/src/testSuites/Compute.ts

@@ -25,7 +25,7 @@ export const computeTests = (adapter: SASjs): TestSuite => ({
           '/Public/app/common/sendArr',
           data,
           {},
-          '',
+          undefined,
           true
         )
       },

src/ContextManager.ts

@@ -2,6 +2,7 @@ import { Context, EditContextInput, ContextAllAttributes } from './types'
 import { isUrl } from './utils'
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from './request/RequestClient'
+import { AuthConfig } from '@sasjs/utils/types'
 
 export class ContextManager {
   private defaultComputeContexts = [
@@ -328,12 +329,12 @@ export class ContextManager {
 
   public async getExecutableContexts(
     executeScript: Function,
-    accessToken?: string
+    authConfig?: AuthConfig
   ) {
     const { result: contexts } = await this.requestClient
       .get<{ items: Context[] }>(
         `${this.serverUrl}/compute/contexts?limit=10000`,
-        accessToken
+        authConfig?.access_token
       )
       .catch((err) => {
         throw prefixMessage(err, 'Error while fetching compute contexts.')
@@ -350,7 +351,7 @@ export class ContextManager {
           `test-${context.name}`,
           linesOfCode,
           context.name,
-          accessToken,
+          authConfig,
           null,
           false,
           true,

src/FileUploader.ts

@@ -2,15 +2,19 @@ import { isUrl } from './utils'
 import { UploadFile } from './types/UploadFile'
 import { ErrorResponse, LoginRequiredError } from './types/errors'
 import { RequestClient } from './request/RequestClient'
+import { ServerType } from '@sasjs/utils/types'
+import SASjs from './SASjs'
+import { Server } from 'https'
+import { SASjsConfig } from './types'
+import { config } from 'process'
 
 export class FileUploader {
   constructor(
-    private appLoc: string,
-    serverUrl: string,
+    private sasjsConfig: SASjsConfig,
     private jobsPath: string,
     private requestClient: RequestClient
   ) {
-    if (serverUrl) isUrl(serverUrl)
+    if (this.sasjsConfig.serverUrl) isUrl(this.sasjsConfig.serverUrl)
   }
 
   public uploadFile(sasJob: string, files: UploadFile[], params: any) {
@@ -29,8 +33,8 @@ export class FileUploader {
       }
     }
 
-    const program = this.appLoc
-      ? this.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
+    const program = this.sasjsConfig.appLoc
+      ? this.sasjsConfig.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
       : sasJob
     const uploadUrl = `${this.jobsPath}/?${
       '_program=' + program
@@ -44,6 +48,12 @@ export class FileUploader {
 
     const csrfToken = this.requestClient.getCsrfToken('file')
     if (csrfToken) formData.append('_csrf', csrfToken.value)
+    if (this.sasjsConfig.debug) formData.append('_debug', '131')
+    if (
+      this.sasjsConfig.serverType === ServerType.SasViya &&
+      this.sasjsConfig.contextName
+    )
+      formData.append('_contextname', this.sasjsConfig.contextName)
 
     const headers = {
       'cache-control': 'no-cache',
@@ -53,9 +63,15 @@ export class FileUploader {
 
     return this.requestClient
       .post(uploadUrl, formData, undefined, 'application/json', headers)
-      .then((res) =>
-        typeof res.result === 'string' ? JSON.parse(res.result) : res.result
-      )
+      .then((res) => {
+        let result
+
+        result =
+          typeof res.result === 'string' ? JSON.parse(res.result) : res.result
+
+        return result
+        //TODO: append to SASjs requests
+      })
       .catch((err: Error) => {
         if (err instanceof LoginRequiredError) {
           return Promise.reject(

src/SASViyaApiClient.ts

@@ -3,7 +3,9 @@ import {
   isRelativePath,
   isUri,
   isUrl,
-  fetchLogByChunks
+  fetchLogByChunks,
+  isAccessTokenExpiring,
+  isRefreshTokenExpiring
 } from './utils'
 import * as NodeFormData from 'form-data'
 import {
@@ -29,7 +31,7 @@ import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
 import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
 import { RequestClient } from './request/RequestClient'
-import { SasAuthResponse, MacroVar } from '@sasjs/utils/types'
+import { SasAuthResponse, MacroVar, AuthConfig } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 import * as mime from 'mime'
 
@@ -130,14 +132,14 @@ export class SASViyaApiClient {
 
   /**
    * Returns all compute contexts on this server that the user has access to.
-   * @param accessToken - an access token for an authorized user.
+   * @param authConfig - an access token, refresh token, client and secret for an authorized user.
    */
-  public async getExecutableContexts(accessToken?: string) {
+  public async getExecutableContexts(authConfig?: AuthConfig) {
     const bindedExecuteScript = this.executeScript.bind(this)
 
     return await this.contextManager.getExecutableContexts(
       bindedExecuteScript,
-      accessToken
+      authConfig
     )
   }
 
@@ -266,7 +268,7 @@ export class SASViyaApiClient {
    * @param jobPath - the path to the file being submitted for execution.
    * @param linesOfCode - an array of code lines to execute.
    * @param contextName - the context to execute the code in.
-   * @param accessToken - an access token for an authorized user.
+   * @param authConfig - an object containing an access token, refresh token, client ID and secret.
    * @param data - execution data.
    * @param debug - when set to true, the log will be returned.
    * @param expectWebout - when set to true, the automatic _webout fileref will be checked for content, and that content returned. This fileref is used when the Job contains a SASjs web request (as opposed to executing arbitrary SAS code).
@@ -279,7 +281,7 @@ export class SASViyaApiClient {
     jobPath: string,
     linesOfCode: string[],
     contextName: string,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     data = null,
     debug: boolean = false,
     expectWebout = false,
@@ -288,17 +290,18 @@ export class SASViyaApiClient {
     printPid = false,
     variables?: MacroVar
   ): Promise<any> {
+    let access_token = (authConfig || {}).access_token
+    if (authConfig) {
+      ;({ access_token } = await this.getTokens(authConfig))
+    }
+
+    const logger = process.logger || console
+
     try {
-      const headers: any = {
-        'Content-Type': 'application/json'
-      }
-
-      if (accessToken) headers.Authorization = `Bearer ${accessToken}`
-
       let executionSessionId: string
 
       const session = await this.sessionManager
-        .getSession(accessToken)
+        .getSession(access_token)
         .catch((err) => {
           throw prefixMessage(err, 'Error while getting session. ')
         })
@@ -307,7 +310,7 @@ export class SASViyaApiClient {
 
       if (printPid) {
         const { result: jobIdVariable } = await this.sessionManager
-          .getVariable(executionSessionId, 'SYSJOBID', accessToken)
+          .getVariable(executionSessionId, 'SYSJOBID', access_token)
           .catch((err) => {
             throw prefixMessage(err, 'Error while getting session variable. ')
           })
@@ -339,7 +342,6 @@ export class SASViyaApiClient {
       if (debug) {
         jobArguments['_OMITTEXTLOG'] = false
         jobArguments['_OMITSESSIONRESULTS'] = false
-        jobArguments['_DEBUG'] = 131
       }
 
       let fileName
@@ -362,11 +364,13 @@ export class SASViyaApiClient {
 
       if (variables) jobVariables = { ...jobVariables, ...variables }
 
+      if (debug) jobVariables = { ...jobVariables, _DEBUG: 131 }
+
       let files: any[] = []
 
       if (data) {
         if (JSON.stringify(data).includes(';')) {
-          files = await this.uploadTables(data, accessToken).catch((err) => {
+          files = await this.uploadTables(data, access_token).catch((err) => {
             throw prefixMessage(err, 'Error while uploading tables. ')
           })
 
@@ -396,7 +400,7 @@ export class SASViyaApiClient {
         .post<Job>(
           `/compute/sessions/${executionSessionId}/jobs`,
           jobRequestBody,
-          accessToken
+          access_token
         )
         .catch((err) => {
           throw prefixMessage(err, 'Error while posting job. ')
@@ -405,8 +409,8 @@ export class SASViyaApiClient {
       if (!waitForResult) return session
 
       if (debug) {
-        console.log(`Job has been submitted for '${fileName}'.`)
-        console.log(
+        logger.info(`Job has been submitted for '${fileName}'.`)
+        logger.info(
           `You can monitor the job progress at '${this.serverUrl}${
             postedJob.links.find((l: any) => l.rel === 'state')!.href
           }'.`
@@ -416,7 +420,7 @@ export class SASViyaApiClient {
       const jobStatus = await this.pollJobState(
         postedJob,
         etag,
-        accessToken,
+        authConfig,
         pollOptions
       ).catch(async (err) => {
         const error = err?.response?.data
@@ -429,7 +433,7 @@ export class SASViyaApiClient {
           const logCount = 1000000
           err.log = await fetchLogByChunks(
             this.requestClient,
-            accessToken!,
+            access_token!,
             sessionLogUrl,
             logCount
           )
@@ -437,10 +441,14 @@ export class SASViyaApiClient {
         throw prefixMessage(err, 'Error while polling job status. ')
       })
 
+      if (authConfig) {
+        ;({ access_token } = await this.getTokens(authConfig))
+      }
+
       const { result: currentJob } = await this.requestClient
         .get<Job>(
           `/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
-          accessToken
+          access_token
         )
         .catch((err) => {
           throw prefixMessage(err, 'Error while getting job. ')
@@ -456,7 +464,7 @@ export class SASViyaApiClient {
         const logCount = currentJob.logStatistics?.lineCount ?? 1000000
         log = await fetchLogByChunks(
           this.requestClient,
-          accessToken!,
+          access_token!,
           logUrl,
           logCount
         )
@@ -476,7 +484,7 @@ export class SASViyaApiClient {
 
       if (resultLink) {
         jobResult = await this.requestClient
-          .get<any>(resultLink, accessToken, 'text/plain')
+          .get<any>(resultLink, access_token, 'text/plain')
           .catch(async (e) => {
             if (e instanceof NotFoundError) {
               if (logLink) {
@@ -484,7 +492,7 @@ export class SASViyaApiClient {
                 const logCount = currentJob.logStatistics?.lineCount ?? 1000000
                 log = await fetchLogByChunks(
                   this.requestClient,
-                  accessToken!,
+                  access_token!,
                   logUrl,
                   logCount
                 )
@@ -503,7 +511,7 @@ export class SASViyaApiClient {
       }
 
       await this.sessionManager
-        .clearSession(executionSessionId, accessToken)
+        .clearSession(executionSessionId, access_token)
         .catch((err) => {
           throw prefixMessage(err, 'Error while clearing session. ')
         })
@@ -515,7 +523,7 @@ export class SASViyaApiClient {
           jobPath,
           linesOfCode,
           contextName,
-          accessToken,
+          authConfig,
           data,
           debug,
           false,
@@ -602,6 +610,7 @@ export class SASViyaApiClient {
     accessToken?: string,
     isForced?: boolean
   ): Promise<Folder> {
+    const logger = process.logger || console
     if (!parentFolderPath && !parentFolderUri) {
       throw new Error('Path or URI of the parent folder is required.')
     }
@@ -609,7 +618,7 @@ export class SASViyaApiClient {
     if (!parentFolderUri && parentFolderPath) {
       parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
       if (!parentFolderUri) {
-        console.log(
+        logger.info(
           `Parent folder at path '${parentFolderPath}' is not present.`
         )
 
@@ -621,7 +630,7 @@ export class SASViyaApiClient {
         if (newParentFolderPath === '') {
           throw new Error('Root folder has to be present on the server.')
         }
-        console.log(
+        logger.info(
           `Creating parent folder:\n'${newFolderName}' in '${newParentFolderPath}'`
         )
         const parentFolder = await this.createFolder(
@@ -630,7 +639,7 @@ export class SASViyaApiClient {
           undefined,
           accessToken
         )
-        console.log(
+        logger.info(
           `Parent folder '${newFolderName}' has been successfully created.`
         )
         parentFolderUri = `/folders/folders/${parentFolder.id}`
@@ -872,13 +881,18 @@ export class SASViyaApiClient {
     contextName: string,
     debug?: boolean,
     data?: any,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     waitForResult = true,
     expectWebout = false,
     pollOptions?: PollOptions,
     printPid = false,
     variables?: MacroVar
   ) {
+    let access_token = (authConfig || {}).access_token
+    if (authConfig) {
+      ;({ access_token } = await this.getTokens(authConfig))
+    }
+
     if (isRelativePath(sasJob) && !this.rootFolderName) {
       throw new Error(
         'Relative paths cannot be used without specifying a root folder name'
@@ -892,7 +906,7 @@ export class SASViyaApiClient {
       ? `${this.rootFolderName}/${folderPath}`
       : folderPath
 
-    await this.populateFolderMap(fullFolderPath, accessToken).catch((err) => {
+    await this.populateFolderMap(fullFolderPath, access_token).catch((err) => {
       throw prefixMessage(err, 'Error while populating folder map. ')
     })
 
@@ -904,12 +918,6 @@ export class SASViyaApiClient {
       )
     }
 
-    const headers: any = { 'Content-Type': 'application/json' }
-
-    if (!!accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`
-    }
-
     const jobToExecute = jobFolder?.find((item) => item.name === jobName)
 
     if (!jobToExecute) {
@@ -930,7 +938,7 @@ export class SASViyaApiClient {
       const { result: jobDefinition } = await this.requestClient
         .get<JobDefinition>(
           `${this.serverUrl}${jobDefinitionLink.href}`,
-          accessToken
+          access_token
         )
         .catch((err) => {
           throw prefixMessage(err, 'Error while getting job definition. ')
@@ -950,7 +958,7 @@ export class SASViyaApiClient {
       sasJob,
       linesToExecute,
       contextName,
-      accessToken,
+      authConfig,
       data,
       debug,
       expectWebout,
@@ -974,8 +982,12 @@ export class SASViyaApiClient {
     contextName: string,
     debug: boolean,
     data?: any,
-    accessToken?: string
+    authConfig?: AuthConfig
   ) {
+    let access_token = (authConfig || {}).access_token
+    if (authConfig) {
+      ;({ access_token } = await this.getTokens(authConfig))
+    }
     if (isRelativePath(sasJob) && !this.rootFolderName) {
       throw new Error(
         'Relative paths cannot be used without specifying a root folder name.'
@@ -988,7 +1000,7 @@ export class SASViyaApiClient {
     const fullFolderPath = isRelativePath(sasJob)
       ? `${this.rootFolderName}/${folderPath}`
       : folderPath
-    await this.populateFolderMap(fullFolderPath, accessToken)
+    await this.populateFolderMap(fullFolderPath, access_token)
 
     const jobFolder = this.folderMap.get(fullFolderPath)
     if (!jobFolder) {
@@ -1001,7 +1013,7 @@ export class SASViyaApiClient {
 
     let files: any[] = []
     if (data && Object.keys(data).length) {
-      files = await this.uploadTables(data, accessToken)
+      files = await this.uploadTables(data, access_token)
     }
 
     if (!jobToExecute) {
@@ -1013,7 +1025,7 @@ export class SASViyaApiClient {
 
     const { result: jobDefinition } = await this.requestClient.get<Job>(
       `${this.serverUrl}${jobDefinitionLink}`,
-      accessToken
+      access_token
     )
 
     const jobArguments: { [key: string]: any } = {
@@ -1049,18 +1061,18 @@ export class SASViyaApiClient {
     const { result: postedJob, etag } = await this.requestClient.post<Job>(
       `${this.serverUrl}/jobExecution/jobs?_action=wait`,
       postJobRequestBody,
-      accessToken
+      access_token
     )
     const jobStatus = await this.pollJobState(
       postedJob,
       etag,
-      accessToken
+      authConfig
     ).catch((err) => {
       throw prefixMessage(err, 'Error while polling job status. ')
     })
     const { result: currentJob } = await this.requestClient.get<Job>(
       `${this.serverUrl}/jobExecution/jobs/${postedJob.id}`,
-      accessToken
+      access_token
     )
 
     let jobResult
@@ -1071,13 +1083,13 @@ export class SASViyaApiClient {
     if (resultLink) {
       jobResult = await this.requestClient.get<any>(
         `${this.serverUrl}${resultLink}/content`,
-        accessToken,
+        access_token,
         'text/plain'
       )
     }
     if (debug && logLink) {
       log = await this.requestClient
-        .get<any>(`${this.serverUrl}${logLink.href}/content`, accessToken)
+        .get<any>(`${this.serverUrl}${logLink.href}/content`, access_token)
         .then((res: any) => res.result.items.map((i: any) => i.line).join('\n'))
     }
     if (jobStatus === 'failed') {
@@ -1127,12 +1139,18 @@ export class SASViyaApiClient {
   private async pollJobState(
     postedJob: any,
     etag: string | null,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     pollOptions?: PollOptions
   ) {
+    const logger = process.logger || console
+
     let POLL_INTERVAL = 300
     let MAX_POLL_COUNT = 1000
     let MAX_ERROR_COUNT = 5
+    let access_token = (authConfig || {}).access_token
+    if (authConfig) {
+      ;({ access_token } = await this.getTokens(authConfig))
+    }
 
     if (pollOptions) {
       POLL_INTERVAL = pollOptions.POLL_INTERVAL || POLL_INTERVAL
@@ -1146,8 +1164,8 @@ export class SASViyaApiClient {
       'Content-Type': 'application/json',
       'If-None-Match': etag
     }
-    if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`
+    if (access_token) {
+      headers.Authorization = `Bearer ${access_token}`
     }
     const stateLink = postedJob.links.find((l: any) => l.rel === 'state')
     if (!stateLink) {
@@ -1157,7 +1175,7 @@ export class SASViyaApiClient {
     const { result: state } = await this.requestClient
       .get<string>(
         `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
-        accessToken,
+        access_token,
         'text/plain',
         {},
         this.debug
@@ -1185,11 +1203,15 @@ export class SASViyaApiClient {
           postedJobState === 'pending' ||
           postedJobState === 'unavailable'
         ) {
+          if (authConfig) {
+            ;({ access_token } = await this.getTokens(authConfig))
+          }
+
           if (stateLink) {
             const { result: jobState } = await this.requestClient
               .get<string>(
                 `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
-                accessToken,
+                access_token,
                 'text/plain',
                 {},
                 this.debug
@@ -1218,8 +1240,8 @@ export class SASViyaApiClient {
             }
 
             if (this.debug && printedState !== postedJobState) {
-              console.log('Polling job status...')
-              console.log(`Current job state: ${postedJobState}`)
+              logger.info('Polling job status...')
+              logger.info(`Current job state: ${postedJobState}`)
 
               printedState = postedJobState
             }
@@ -1409,6 +1431,9 @@ export class SASViyaApiClient {
       accessToken
     )
 
+    if (!sourceFolderUri) {
+      return undefined
+    }
     const sourceFolderId = sourceFolderUri?.split('/').pop()
 
     const { result: folder } = await this.requestClient
@@ -1463,4 +1488,21 @@ export class SASViyaApiClient {
 
     return movedFolder
   }
+
+  private async getTokens(authConfig: AuthConfig): Promise<AuthConfig> {
+    const logger = process.logger || console
+    let { access_token, refresh_token, client, secret } = authConfig
+    if (
+      isAccessTokenExpiring(access_token) ||
+      isRefreshTokenExpiring(refresh_token)
+    ) {
+      logger.info('Refreshing access and refresh tokens.')
+      ;({ access_token, refresh_token } = await this.refreshTokens(
+        client,
+        secret,
+        refresh_token
+      ))
+    }
+    return { access_token, refresh_token, client, secret }
+  }
 }

src/SASjs.ts

@@ -4,7 +4,7 @@ import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
 import { FileUploader } from './FileUploader'
 import { AuthManager } from './auth'
-import { ServerType, MacroVar } from '@sasjs/utils/types'
+import { ServerType, MacroVar, AuthConfig } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import {
   JobExecutor,
@@ -24,7 +24,7 @@ const defaultConfig: SASjsConfig = {
   serverType: ServerType.SasViya,
   debug: false,
   contextName: 'SAS Job Execution compute context',
-  useComputeApi: false,
+  useComputeApi: null,
   allowInsecureRequests: false
 }
 
@@ -103,12 +103,12 @@ export default class SASjs {
 
   /**
    * Gets executable compute contexts.
-   * @param accessToken - an access token for an authorized user.
+   * @param authConfig - an access token, refresh token, client and secret for an authorized user.
    */
-  public async getExecutableContexts(accessToken: string) {
+  public async getExecutableContexts(authConfig: AuthConfig) {
     this.isMethodSupported('getExecutableContexts', ServerType.SasViya)
 
-    return await this.sasViyaApiClient!.getExecutableContexts(accessToken)
+    return await this.sasViyaApiClient!.getExecutableContexts(authConfig)
   }
 
   /**
@@ -240,14 +240,14 @@ export default class SASjs {
    * @param fileName - name of the file to run. It will be converted to path to the file being submitted for execution.
    * @param linesOfCode - lines of sas code from the file to run.
    * @param contextName - context name on which code will be run on the server.
-   * @param accessToken - (optional) the access token for authorizing the request.
+   * @param authConfig - (optional) the access token, refresh token, client and secret for authorizing the request.
    * @param debug - (optional) if true, global debug config will be overriden
    */
   public async executeScriptSASViya(
     fileName: string,
     linesOfCode: string[],
     contextName: string,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     debug?: boolean
   ) {
     this.isMethodSupported('executeScriptSASViya', ServerType.SasViya)
@@ -261,7 +261,7 @@ export default class SASjs {
       fileName,
       linesOfCode,
       contextName,
-      accessToken,
+      authConfig,
       null,
       debug ? debug : this.sasjsConfig.debug
     )
@@ -544,12 +544,7 @@ export default class SASjs {
   public uploadFile(sasJob: string, files: UploadFile[], params: any) {
     const fileUploader =
       this.fileUploader ||
-      new FileUploader(
-        this.sasjsConfig.appLoc,
-        this.sasjsConfig.serverUrl,
-        this.jobsPath,
-        this.requestClient!
-      )
+      new FileUploader(this.sasjsConfig, this.jobsPath, this.requestClient!)
 
     return fileUploader.uploadFile(sasJob, files, params)
   }
@@ -584,7 +579,7 @@ export default class SASjs {
     data: { [key: string]: any } | null,
     config: { [key: string]: any } = {},
     loginRequiredCallback?: () => any,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     extraResponseAttributes: ExtraResponseAttributes[] = []
   ) {
     config = {
@@ -595,14 +590,18 @@ export default class SASjs {
     const validationResult = this.validateInput(data)
 
     if (validationResult.status) {
-      if (config.serverType === ServerType.SasViya && config.contextName) {
+      if (
+        config.serverType !== ServerType.Sas9 &&
+        config.useComputeApi !== undefined &&
+        config.useComputeApi !== null
+      ) {
         if (config.useComputeApi) {
           return await this.computeJobExecutor!.execute(
             sasJob,
             data,
             config,
             loginRequiredCallback,
-            accessToken
+            authConfig
           )
         } else {
           return await this.jesJobExecutor!.execute(
@@ -610,7 +609,7 @@ export default class SASjs {
             data,
             config,
             loginRequiredCallback,
-            accessToken,
+            authConfig,
             extraResponseAttributes
           )
         }
@@ -626,7 +625,7 @@ export default class SASjs {
           data,
           config,
           loginRequiredCallback,
-          accessToken,
+          authConfig,
           extraResponseAttributes
         )
       }
@@ -777,7 +776,7 @@ export default class SASjs {
    * @param config - provide any changes to the config here, for instance to
    * enable/disable `debug`. Any change provided will override the global config,
    * for that particular function call.
-   * @param accessToken - a valid access token that is authorised to execute compute jobs.
+   * @param authConfig - a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
    * The access token is not required when the user is authenticated via the browser.
    * @param waitForResult - a boolean that indicates whether the function needs to wait for execution to complete.
    * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
@@ -788,7 +787,7 @@ export default class SASjs {
     sasJob: string,
     data: any,
     config: any = {},
-    accessToken?: string,
+    authConfig?: AuthConfig,
     waitForResult?: boolean,
     pollOptions?: PollOptions,
     printPid = false,
@@ -811,7 +810,7 @@ export default class SASjs {
       config.contextName,
       config.debug,
       data,
-      accessToken,
+      authConfig,
       !!waitForResult,
       false,
       pollOptions,
@@ -935,8 +934,7 @@ export default class SASjs {
     }
 
     this.fileUploader = new FileUploader(
-      this.sasjsConfig.appLoc,
-      this.sasjsConfig.serverUrl,
+      this.sasjsConfig,
       this.jobsPath,
       this.requestClient
     )

src/SessionManager.ts

@@ -6,10 +6,6 @@ import { RequestClient } from './request/RequestClient'
 const MAX_SESSION_COUNT = 1
 const RETRY_LIMIT: number = 3
 let RETRY_COUNT: number = 0
-const INTERNAL_SAS_ERROR = {
-  status: 304,
-  message: 'Not Modified'
-}
 
 export class SessionManager {
   constructor(
@@ -158,11 +154,13 @@ export class SessionManager {
     etag: string | null,
     accessToken?: string
   ) {
+    const logger = process.logger || console
+
     let sessionState = session.state
 
     const stateLink = session.links.find((l: any) => l.rel === 'state')
 
-    return new Promise(async (resolve, _) => {
+    return new Promise(async (resolve, reject) => {
       if (
         sessionState === 'pending' ||
         sessionState === 'running' ||
@@ -170,7 +168,7 @@ export class SessionManager {
       ) {
         if (stateLink) {
           if (this.debug && !this.printedSessionState.printed) {
-            console.log('Polling session status...')
+            logger.info('Polling session status...')
 
             this.printedSessionState.printed = true
           }
@@ -180,13 +178,13 @@ export class SessionManager {
             etag!,
             accessToken
           ).catch((err) => {
-            throw err
+            throw prefixMessage(err, 'Error while getting session state.')
           })
 
           sessionState = state.trim()
 
           if (this.debug && this.printedSessionState.state !== sessionState) {
-            console.log(`Current session state is '${sessionState}'`)
+            logger.info(`Current session state is '${sessionState}'`)
 
             this.printedSessionState.state = sessionState
             this.printedSessionState.printed = false
@@ -194,13 +192,14 @@ export class SessionManager {
 
           // There is an internal error present in SAS Viya 3.5
           // Retry to wait for a session status in such case of SAS internal error
-          if (
-            sessionState === INTERNAL_SAS_ERROR.message &&
-            RETRY_COUNT < RETRY_LIMIT
-          ) {
-            RETRY_COUNT++
+          if (!sessionState) {
+            if (RETRY_COUNT < RETRY_LIMIT) {
+              RETRY_COUNT++
 
-            resolve(this.waitForSession(session, etag, accessToken))
+              resolve(this.waitForSession(session, etag, accessToken))
+            } else {
+              reject('Could not get session state.')
+            }
           }
 
           resolve(sessionState)
@@ -220,9 +219,6 @@ export class SessionManager {
       .get(url, accessToken, 'text/plain', { 'If-None-Match': etag })
       .then((res) => res.result as string)
       .catch((err) => {
-        if (err.status === INTERNAL_SAS_ERROR.status)
-          return INTERNAL_SAS_ERROR.message
-
         throw err
       })
   }

src/auth/AuthManager.ts

@@ -1,5 +1,4 @@
 import { ServerType } from '@sasjs/utils/types'
-import { isAuthorizeFormRequired } from '.'
 import { RequestClient } from '../request/RequestClient'
 import { serialize } from '../utils'
 
@@ -61,6 +60,15 @@ export class AuthManager {
     }
 
     if (loggedIn) {
+      if (this.serverType === ServerType.Sas9) {
+        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
+
+        await this.requestClient.get<string>(
+          `/SASLogon/login?service=${casAuthenticationUrl}`,
+          undefined
+        )
+      }
+
       this.loginCallback()
     }
 

src/job-execution/ComputeJobExecutor.ts

@@ -1,4 +1,4 @@
-import { ServerType } from '@sasjs/utils/types'
+import { AuthConfig, ServerType } from '@sasjs/utils/types'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   ErrorResponse,
@@ -17,7 +17,7 @@ export class ComputeJobExecutor extends BaseJobExecutor {
     data: any,
     config: any,
     loginRequiredCallback?: any,
-    accessToken?: string
+    authConfig?: AuthConfig
   ) {
     const loginCallback = loginRequiredCallback || (() => Promise.resolve())
     const waitForResult = true
@@ -30,7 +30,7 @@ export class ComputeJobExecutor extends BaseJobExecutor {
           config.contextName,
           config.debug,
           data,
-          accessToken,
+          authConfig,
           waitForResult,
           expectWebout
         )

src/job-execution/JesJobExecutor.ts

@@ -1,4 +1,4 @@
-import { ServerType } from '@sasjs/utils/types'
+import { AuthConfig, ServerType } from '@sasjs/utils/types'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   ErrorResponse,
@@ -18,20 +18,14 @@ export class JesJobExecutor extends BaseJobExecutor {
     data: any,
     config: any,
     loginRequiredCallback?: any,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     extraResponseAttributes: ExtraResponseAttributes[] = []
   ) {
     const loginCallback = loginRequiredCallback || (() => Promise.resolve())
 
     const requestPromise = new Promise((resolve, reject) => {
       this.sasViyaApiClient
-        ?.executeJob(
-          sasJob,
-          config.contextName,
-          config.debug,
-          data,
-          accessToken
-        )
+        ?.executeJob(sasJob, config.contextName, config.debug, data, authConfig)
         .then((response: any) => {
           this.appendRequest(response, sasJob, config.debug)
 
@@ -69,7 +63,7 @@ export class JesJobExecutor extends BaseJobExecutor {
                 data,
                 config,
                 loginRequiredCallback,
-                accessToken,
+                authConfig,
                 extraResponseAttributes
               ).then(
                 (res: any) => {

src/job-execution/JobExecutor.ts

@@ -1,4 +1,4 @@
-import { ServerType } from '@sasjs/utils/types'
+import { AuthConfig, ServerType } from '@sasjs/utils/types'
 import { SASjsRequest } from '../types'
 import { ExtraResponseAttributes } from '@sasjs/utils/types'
 import { asyncForEach, parseGeneratedCode, parseSourceCode } from '../utils'
@@ -11,7 +11,7 @@ export interface JobExecutor {
     data: any,
     config: any,
     loginRequiredCallback?: any,
-    accessToken?: string,
+    authConfig?: AuthConfig,
     extraResponseAttributes?: ExtraResponseAttributes[]
   ) => Promise<any>
   resendWaitingRequests: () => Promise<void>
@@ -30,7 +30,7 @@ export abstract class BaseJobExecutor implements JobExecutor {
     data: any,
     config: any,
     loginRequiredCallback?: any,
-    accessToken?: string | undefined,
+    authConfig?: AuthConfig | undefined,
     extraResponseAttributes?: ExtraResponseAttributes[]
   ): Promise<any>
 

src/job-execution/WebJobExecutor.ts

@@ -8,8 +8,9 @@ import { generateFileUploadForm } from '../file/generateFileUploadForm'
 import { generateTableUploadForm } from '../file/generateTableUploadForm'
 import { RequestClient } from '../request/RequestClient'
 import { SASViyaApiClient } from '../SASViyaApiClient'
-import { isRelativePath } from '../utils'
+import { isRelativePath, isValidJson } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
+import { parseWeboutResponse } from '../utils/parseWeboutResponse'
 
 export interface WaitingRequstPromise {
   promise: Promise<any> | null
@@ -39,15 +40,18 @@ export class WebJobExecutor extends BaseJobExecutor {
         ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
         : sasJob
       : sasJob
-    const jobUri =
-      config.serverType === ServerType.SasViya
-        ? await this.getJobUri(sasJob)
-        : ''
-    const apiUrl = `${config.serverUrl}${this.jobsPath}/?${
-      jobUri.length > 0
-        ? '__program=' + program + '&_job=' + jobUri
-        : '_program=' + program
-    }`
+    let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`
+
+    if (config.serverType === ServerType.SasViya) {
+      const jobUri =
+        config.serverType === ServerType.SasViya
+          ? await this.getJobUri(sasJob)
+          : ''
+
+      apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''
+
+      apiUrl += config.contextName ? `&_contextname=${config.contextName}` : ''
+    }
 
     let requestParams = {
       ...this.getRequestParams(config)
@@ -97,6 +101,19 @@ export class WebJobExecutor extends BaseJobExecutor {
             this.appendRequest(res, sasJob, config.debug)
             resolve(jsonResponse)
           }
+          if (this.serverType === ServerType.Sas9 && config.debug) {
+            const jsonResponse = parseWeboutResponse(res.result as string)
+            if (jsonResponse === '') {
+              throw new Error(
+                'Valid JSON could not be extracted from response.'
+              )
+            }
+
+            isValidJson(jsonResponse)
+            this.appendRequest(res, sasJob, config.debug)
+            resolve(res.result)
+          }
+          isValidJson(res.result as string)
           this.appendRequest(res, sasJob, config.debug)
           resolve(res.result)
         })

src/request/RequestClient.ts

@@ -11,6 +11,7 @@ import {
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
 import { prefixMessage } from '@sasjs/utils/error'
 import { SAS9AuthError } from '../types/errors/SAS9AuthError'
+import { isValidJson } from '../utils'
 
 export interface HttpClient {
   get<T>(
@@ -63,6 +64,9 @@ export class RequestClient implements HttpClient {
         baseURL: baseUrl
       })
     }
+
+    this.httpClient.defaults.validateStatus = (status) =>
+      status >= 200 && status < 305
   }
 
   public getCsrfToken(type: 'general' | 'file' = 'general') {
@@ -287,7 +291,8 @@ export class RequestClient implements HttpClient {
       })
       .then((res) => res.data)
       .catch((error) => {
-        console.log(error)
+        const logger = process.logger || console
+        logger.error(error)
       })
   }
 
@@ -419,7 +424,13 @@ export class RequestClient implements HttpClient {
       }
     } catch {
       try {
-        parsedResponse = JSON.parse(parseWeboutResponse(response.data))
+        const weboutResponse = parseWeboutResponse(response.data)
+        if (weboutResponse === '') {
+          throw new Error('Valid JSON could not be extracted from response.')
+        }
+
+        isValidJson(weboutResponse)
+        parsedResponse = JSON.parse(weboutResponse)
       } catch {
         parsedResponse = response.data
       }

src/test/FileUploader.spec.ts

@@ -3,7 +3,7 @@
  */
 
 import { FileUploader } from '../FileUploader'
-import { UploadFile } from '../types'
+import { SASjsConfig, UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
 import axios from 'axios'
 jest.mock('axios')
@@ -32,9 +32,13 @@ const prepareFilesAndParams = () => {
 }
 
 describe('FileUploader', () => {
+  const config: SASjsConfig = {
+    ...new SASjsConfig(),
+    appLoc: '/sample/apploc'
+  }
+
   const fileUploader = new FileUploader(
-    '/sample/apploc',
-    'https://sample.server.com',
+    config,
     '/jobs/path',
     new RequestClient('https://sample.server.com')
   )

src/types/Process.d.ts

@@ -0,0 +1,5 @@
+declare namespace NodeJS {
+  export interface Process {
+    logger?: import('@sasjs/utils/logger').Logger
+  }
+}

src/types/SASjsConfig.ts

@@ -40,23 +40,19 @@ export class SASjsConfig {
    */
   debug: boolean = true
   /**
-   * The name of the compute context to use when calling the Viya APIs directly.
+   * The name of the compute context to use when calling the Viya services directly.
    * Example value: 'SAS Job Execution compute context'
-   * If set to missing or empty, and useComputeApi is true, the adapter will use
-   * the JES APIs.  If provided, the Job Code will be executed in pooled
-   * compute sessions on this named context.
    */
   contextName: string = ''
   /**
-   * Set to `false` to use the Job Execution Web Service.  To enhance VIYA
+   * If it's `false` adapter will use the JES API as connection approach.  To enhance VIYA
    * performance, set to `true` and provide a `contextName` on which to run
    * the code.  When running on a named context, the code executes under the
    * user identity.  When running as a Job Execution service, the code runs
-   * under the identity in the JES context.  If no `contextName` is provided,
-   * and `useComputeApi` is `true`, then the service will run as a Job, except
+   * under the identity in the JES context.  If `useComputeApi` is `null` or `undefined`, the service will run as a Job, except
    * triggered using the APIs instead of the Job Execution Web Service broker.
    */
-  useComputeApi = false
+  useComputeApi: boolean | null = null
   /**
    * Defaults to `false`.
    * When set to `true`, the adapter will allow requests to SAS servers that use a self-signed SSL certificate.

src/utils/auth.ts

@@ -0,0 +1,35 @@
+import jwtDecode from 'jwt-decode'
+
+/**
+ * Checks if the Access Token is expired or is expiring in 1 hour.  A default Access Token
+ * lasts 12 hours. If the Access Token expires, the Refresh Token is used to fetch a new
+ * Access Token. In the case that the Refresh Token is expired, 1 hour is enough to let
+ * most jobs finish.
+ * @param {string} token- token string that will be evaluated
+ */
+export function isAccessTokenExpiring(token: string): boolean {
+  if (!token) {
+    return true
+  }
+  const payload = jwtDecode<{ exp: number }>(token)
+  const timeToLive = payload.exp - new Date().valueOf() / 1000
+
+  return timeToLive <= 60 * 60 // 1 hour
+}
+
+/**
+ * Checks if the Refresh Token is expired or expiring in 30 secs. A default Refresh Token
+ * lasts 30 days.  Once the Refresh Token expires, the user must re-authenticate (provide
+ * credentials in a browser to obtain an authorisation code). 30 seconds is enough time
+ * to make a request for a final Access Token.
+ * @param {string} token- token string that will be evaluated
+ */
+export function isRefreshTokenExpiring(token?: string): boolean {
+  if (!token) {
+    return true
+  }
+  const payload = jwtDecode<{ exp: number }>(token)
+  const timeToLive = payload.exp - new Date().valueOf() / 1000
+
+  return timeToLive <= 30 // 30 seconds
+}

src/utils/fetchLogByChunks.ts

@@ -15,12 +15,14 @@ export const fetchLogByChunks = async (
   logUrl: string,
   logCount: number
 ): Promise<string> => {
+  const logger = process.logger || console
+
   let log: string = ''
 
   const loglimit = logCount < 10000 ? logCount : 10000
   let start = 0
   do {
-    console.log(
+    logger.info(
       `Fetching logs from line no: ${start + 1} to ${
         start + loglimit
       } of ${logCount}.`

src/utils/index.ts

@@ -1,4 +1,5 @@
 export * from './asyncForEach'
+export * from './auth'
 export * from './compareTimestamps'
 export * from './convertToCsv'
 export * from './isRelativePath'
@@ -12,3 +13,4 @@ export * from './serialize'
 export * from './splitChunks'
 export * from './parseWeboutResponse'
 export * from './fetchLogByChunks'
+export * from './isValidJson'

src/utils/isValidJson.ts

@@ -0,0 +1,11 @@
+/**
+ * Checks if string is in valid JSON format else throw error.
+ * @param str - string to check.
+ */
+export const isValidJson = (str: string) => {
+  try {
+    JSON.parse(str)
+  } catch (e) {
+    throw new Error('Invalid JSON response.')
+  }
+}