chore(*): add tests for SessionManager

.github/workflows/build.yml

@@ -27,6 +27,16 @@ jobs:
         run: npm run lint
       - name: Run unit tests
         run: npm test
+        env:
+          CI: true
+          CLIENT: ${{secrets.CLIENT}}
+          SECRET: ${{secrets.SECRET}}
+          SAS_USERNAME: ${{secrets.SAS_USERNAME}}
+          SAS_PASSWORD: ${{secrets.SAS_PASSWORD}}
+          SERVER_URL: ${{secrets.SERVER_URL}}
+          SERVER_TYPE: ${{secrets.SERVER_TYPE}}
+          ACCESS_TOKEN: ${{secrets.ACCESS_TOKEN}}
+          REFRESH_TOKEN: ${{secrets.REFRESH_TOKEN}}
       - name: Build Package
         run: npm run package:lib
         env:

package-lock.json

@@ -3688,6 +3688,12 @@
         "is-obj": "^2.0.0"
       }
     },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "dev": true
+    },
     "duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",

package.json

@@ -39,6 +39,7 @@
     "@types/isomorphic-fetch": "0.0.35",
     "@types/jest": "^26.0.15",
     "cp": "^0.2.0",
+    "dotenv": "^8.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
     "rimraf": "^3.0.2",

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.18.3",
+      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.18.3.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.12.0.tgz",
-      "integrity": "sha512-wzDFJRyt2dXFeQP+JzqRGunYUbujrAbU/Jc4IWg5URsCkGAzwsNl/4G0xJVbqOTy1MvoZ431rfCnvhkUlg7D3Q==",
+      "integrity": "sha512-0uGQH9ynomWzdBaEujEtcR38q6V7LCgG0mrb1Wellv6cC/IHD3j6WfeZZAgtiMPeOSJjbCDBOlVnzC2TlBqJFw==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",

sasjs-tests/package.json

@@ -4,7 +4,7 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.18.2",
+    "@sasjs/adapter": "^1.12.0",
     "@sasjs/test-framework": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",

sasjs-tests/src/App.test.js

@@ -0,0 +1,9 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import App from "./App";
+
+test("renders learn react link", () => {
+  const { getByText } = render(<App />);
+  const linkElement = getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});

sasjs-tests/src/testSuites/Basic.ts

@@ -3,12 +3,12 @@ import { TestSuite } from "@sasjs/test-framework";
 
 const defaultConfig: SASjsConfig = {
   serverUrl: window.location.origin,
-  pathSAS9: '/SASStoredProcess/do',
+  pathSAS9: "/SASStoredProcess/do",
-  pathSASViya: '/SASJobExecution',
+  pathSASViya: "/SASJobExecution",
-  appLoc: '/Public/seedapp',
+  appLoc: "/Public/seedapp",
   serverType: ServerType.SASViya,
-  debug: false,
+  debug: true,
-  contextName: 'SAS Job Execution compute context',
+  contextName: "SAS Job Execution compute context",
   useComputeApi: false
 };
 
@@ -57,7 +57,6 @@ export const basicTests = (
       },
       assertion: (sasjsInstance: SASjs) => {
         const sasjsConfig = sasjsInstance.getSasjsConfig();
-
         return (
           sasjsConfig.serverUrl === defaultConfig.serverUrl &&
           sasjsConfig.pathSAS9 === defaultConfig.pathSAS9 &&

sasjs-tests/src/testSuites/RequestData.ts

@@ -88,7 +88,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
         return adapter.request("common/sendArr", data).catch((e) => e);
       },
       assertion: (error: any) => {
-        return !!error && !!error.error && !!error.error.message;
+        return !!error && !!error.body && !!error.body.message;
       }
     },
     {
@@ -185,7 +185,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         };
         return adapter.request("common/sendObj", invalidData).catch((e) => e);
       },
-      assertion: (error: any) => !!error && !!error.error && !!error.error.message
+      assertion: (error: any) => !!error && !!error.body && !!error.body.message
     },
     {
       title: "Single string value",
@@ -219,7 +219,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           .catch((e) => e);
       },
       assertion: (error: any) => {
-        return !!error && !!error.error && !!error.error.message;
+        return !!error && !!error.body && !!error.body.message;
       }
     },
     {

sasjs-tests/src/testSuites/SasjsRequests.ts

@@ -23,24 +23,22 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
     },
     {
       title: "Make error and capture log",
-      description: "Should make an error and capture log, in the same time it is testing if debug override is working",
+      description: "Should make an error and capture log",
       test: async () => {
         return new Promise(async (resolve, reject) => {
           adapter
-            .request("common/makeErr", data, {debug: true})
+            .request("common/makeErr", data)
             .then((res) => {
               //no action here, this request must throw error
             })
             .catch((err) => {
               let sasRequests = adapter.getSasRequests();
-              let makeErrRequest: any =
+              let makeErrRequest =
                 sasRequests.find((req) =>
                   req.serviceLink.includes("makeErr")
                 ) || null;
 
-              if (!makeErrRequest) resolve(false)
+              resolve(!!makeErrRequest);
-
-              resolve(!!(makeErrRequest.logFile && makeErrRequest.logFile.length > 0));
             });
         });
       },

src/SASViyaApiClient.ts

@@ -426,10 +426,10 @@ export class SASViyaApiClient {
    * @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 sessionId - optional session ID to reuse.
    * @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).
-   * @param waitForResult - when set to true, function will return the session
    */
   public async executeScript(
     jobPath: string,
@@ -437,7 +437,6 @@ export class SASViyaApiClient {
     contextName: string,
     accessToken?: string,
     data = null,
-    debug: boolean = false,
     expectWebout = false,
     waitForResult = true
   ): Promise<any> {
@@ -468,7 +467,7 @@ export class SASViyaApiClient {
         _OMITTEXTLOG: true
       }
 
-      if (debug) {
+      if (this.debug) {
         jobArguments['_OMITTEXTLOG'] = false
         jobArguments['_OMITSESSIONRESULTS'] = false
         jobArguments['_DEBUG'] = 131
@@ -536,7 +535,7 @@ export class SASViyaApiClient {
         return session
       }
 
-      if (debug) {
+      if (this.debug) {
         console.log(`Job has been submitted for '${fileName}'.`)
         console.log(
           `You can monitor the job progress at '${this.serverUrl}${
@@ -559,7 +558,7 @@ export class SASViyaApiClient {
 
       const logLink = currentJob.links.find((l) => l.rel === 'log')
 
-      if (debug && logLink) {
+      if (this.debug && logLink) {
         log = await this.request<any>(
           `${this.serverUrl}${logLink.href}/content?limit=10000`,
           {
@@ -575,7 +574,7 @@ export class SASViyaApiClient {
       }
 
       if (jobStatus === 'failed' || jobStatus === 'error') {
-        return Promise.reject({ job: currentJob, log })
+        return Promise.reject({ error: currentJob.error, log })
       }
 
       let resultLink
@@ -607,10 +606,12 @@ export class SASViyaApiClient {
                   throw err
                 })
 
-              return Promise.reject({
+              return Promise.reject(
-                status: 500,
+                new ErrorResponse('Job execution failed.', {
-                log: log
+                  status: 500,
-              })
+                  body: log
+                })
+              )
             }
           }
           return {
@@ -634,7 +635,6 @@ export class SASViyaApiClient {
           contextName,
           accessToken,
           data,
-          debug,
           false,
           true
         )
@@ -955,7 +955,6 @@ export class SASViyaApiClient {
   public async executeComputeJob(
     sasJob: string,
     contextName: string,
-    debug?: boolean,
     data?: any,
     accessToken?: string,
     waitForResult = true,
@@ -1042,7 +1041,6 @@ export class SASViyaApiClient {
       contextName,
       accessToken,
       data,
-      debug,
       expectWebout,
       waitForResult
     )

src/SASjs.ts

@@ -734,7 +734,6 @@ export default class SASjs {
     return this.sasViyaApiClient?.executeComputeJob(
       sasJob,
       config.contextName,
-      config.debug,
       data,
       accessToken,
       !!waitForResult,
@@ -767,7 +766,6 @@ export default class SASjs {
           ?.executeComputeJob(
             sasJob,
             config.contextName,
-            config.debug,
             data,
             accessToken,
             waitForResult,
@@ -897,8 +895,8 @@ export default class SASjs {
 
                 return responseJson
               })
-              .catch(async (response) => {
+              .catch(async (e) => {
-                if (needsRetry(JSON.stringify(response))) {
+                if (needsRetry(JSON.stringify(e))) {
                   if (this.retryCountJeseApi < requestRetryLimit) {
                     let retryResponse = await this.executeJobViaJesApi(
                       sasJob,
@@ -919,11 +917,11 @@ export default class SASjs {
                   }
                 }
 
-                if (response?.log) {
+                if (e?.log) {
-                  this.appendSasjsRequest(response.log, sasJob, null)
+                  this.appendSasjsRequest(e.log, sasJob, null)
                 }
 
-                if (response.toString().includes('Job was not found')) {
+                if (e.toString().includes('Job was not found')) {
                   reject(
                     new ErrorResponse('Service not found on the server.', {
                       sasJob: sasJob
@@ -931,7 +929,7 @@ export default class SASjs {
                   )
                 }
 
-                reject(new ErrorResponse('Job execution failed.', response))
+                reject(new ErrorResponse('Job execution failed.', e))
               })
           )
         }

src/test/SessionManager.spec.ts

@@ -0,0 +1,38 @@
+import dotenv from 'dotenv'
+import { SessionManager } from '../SessionManager'
+import { CsrfToken } from '../types'
+
+describe('SessionManager', () => {
+  const setCsrfToken = jest
+    .fn()
+    .mockImplementation((csrfToken: CsrfToken) => console.log(csrfToken))
+
+  beforeAll(() => {
+      dotenv.config()
+  })
+
+  it('should instantiate', () => {
+    const sessionManager = new SessionManager(
+      'http://test-server.com',
+      'test context',
+      setCsrfToken
+    )
+
+    expect(sessionManager).toBeInstanceOf(SessionManager)
+    expect(sessionManager.debug).toBeFalsy()
+    expect((sessionManager as any).serverUrl).toEqual('http://test-server.com')
+    expect((sessionManager as any).contextName).toEqual('test context')
+  })
+
+  it('should set the debug flag', () => {
+    const sessionManager = new SessionManager(
+      'http://test-server.com',
+      'test context',
+      setCsrfToken
+    )
+
+    sessionManager.debug = true
+
+    expect(sessionManager.debug).toBeTruthy()
+  })
+})