fix: upgrade @types/jest from 26.0.20 to 26.0.22

Snyk has created this PR to upgrade @types/jest from 26.0.20 to 26.0.22.

See this package in npm:
https://www.npmjs.com/package/@types/jest

See this project in Snyk:
https://app.snyk.io/org/allanbowe/project/acbafb55-1a7a-485d-a36b-42650bb03cf6?utm_source=github&utm_medium=upgrade-pr

.git-hooks/commit-msg

@@ -1,18 +0,0 @@
-#!/bin/sh
-RED="\033[1;31m"
-GREEN="\033[1;32m"
-
-# Get the commit message (the parameter we're given is just the path to the
-# 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-z \-]+\))?!?: .+$") then
-   echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
-   exit 0
-fi
-
-echo "${RED}❌ Commit message does not meet the Conventional Commit standard!"
-echo "An example of a valid message is:"
-echo "  feat(login): add the 'remember me' button"
-echo "ℹ More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary"
-exit 1

.npmignore

@@ -1,4 +0,0 @@
-sasjs-tests/
-docs/
-.github/
-CONTRIBUTING.md

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Change Log
 
-Since March 2020 the changelog is managed by github releases - see [https://github.com/sasjs/adapter/releases](https://github.com/sasjs/adapter/releases).
-
-## Changes up to 5th March 2020
-
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 <a name="1.9.0"></a>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Macro People
+Copyright (c) 2020 Macro People
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,23 +1,7 @@
+[![](https://data.jsdelivr.com/v1/package/npm/@sasjs/adapter/badge)](https://www.jsdelivr.com/package/npm/@sasjs/adapter)
+
 # @sasjs/adapter
 
-[![npm package][npm-image]][npm-url]
-[![Github Workflow][githubworkflow-image]][githubworkflow-url]
-[![Dependency Status][dependency-image]][dependency-url]
-[![npm](https://img.shields.io/npm/dt/@sasjs/adapter)]()
-![Snyk Vulnerabilities for npm package](https://img.shields.io/snyk/vulnerabilities/npm/@sasjs/adapter)
-[![License](https://img.shields.io/apm/l/atomic-design-ui.svg)](/LICENSE)
-![GitHub top language](https://img.shields.io/github/languages/top/sasjs/adapter)
-![GitHub issues](https://img.shields.io/github/issues/sasjs/adapter)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/sasjs/adapter)
-
-
-[npm-image]:https://img.shields.io/npm/v/@sasjs/adapter.svg
-[npm-url]:http://npmjs.org/package/@sasjs/adapter
-[githubworkflow-image]:https://github.com/sasjs/adapter/actions/workflows/build.yml/badge.svg
-[githubworkflow-url]:https://github.com/sasjs/adapter/blob/main/.github/workflows/build.yml
-[dependency-image]:https://david-dm.org/sasjs/adapter.svg
-[dependency-url]:https://github.com/sasjs/adapter/blob/main/package.json
-
 SASjs is a open-source framework for building Web Apps on SAS® platforms. You can use as much or as little of it as you like. This repository contains the JS adapter, the part that handles the to/from SAS communication on the client side. There are 3 ways to install it:
 
 1 - `npm install @sasjs/adapter` - for use in a node project
@@ -214,15 +198,8 @@ This approach is by far the fastest, as a result of the optimisations we have bu
 
 # More resources
 
-For more information and examples specific to this adapter you can check out the [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
+For more information and examples specific to this adapter you can check out the [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation. 
 
 For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.
 
 If you are a SAS 9 or SAS Viya customer you can also request a copy of [Data Controller](https://datacontroller.io) - free for up to 5 users, this tool makes use of all parts of the SASjs framework.
-
-
-## Star Gazing
-
-If you find this library useful, help us grow our star graph!
-
-![](https://starchart.cc/sasjs/adapter.svg)

package.json

@@ -1,7 +1,6 @@
 {
   "name": "@sasjs/adapter",
   "description": "JavaScript adapter for SAS",
-  "homepage": "https://adapter.sasjs.io",
   "scripts": {
     "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",
@@ -12,8 +11,7 @@
     "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"
+    "typedoc": "typedoc"
   },
   "publishConfig": {
     "access": "public"
@@ -39,7 +37,6 @@
   "license": "ISC",
   "devDependencies": {
     "@types/jest": "^26.0.22",
-    "@types/tough-cookie": "^4.0.0",
     "cp": "^0.2.0",
     "dotenv": "^8.2.0",
     "jest": "^26.6.3",
@@ -52,7 +49,7 @@
     "ts-loader": "^9.1.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.20.36",
+    "typedoc": "^0.20.35",
     "typedoc-neo-theme": "^1.1.0",
     "typedoc-plugin-external-module-name": "^4.0.6",
     "typescript": "^3.9.9",
@@ -61,12 +58,9 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^2.14.0",
+    "@sasjs/utils": "^2.10.2",
     "axios": "^0.21.1",
-    "axios-cookiejar-support": "^1.0.1",
     "form-data": "^4.0.0",
-    "https": "^1.0.0",
-    "tough-cookie": "^4.0.0",
-    "url": "^0.11.0"
+    "https": "^1.0.0"
   }
 }

sasjs-tests/README.md

@@ -55,7 +55,6 @@ filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 filename ft15f001 temp;
 parmcards4;
-  %webout(FETCH)
   %webout(OPEN)
   %macro x();
   %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i) %end;
@@ -64,7 +63,6 @@ parmcards4;
 ;;;;
 %mm_createwebservice(path=/Public/app/common,name=sendObj)
 parmcards4;
-  %webout(FETCH)
   %webout(OPEN)
   %macro x();
   %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i) %end;

sasjs-tests/package-lock.json

@@ -2378,9 +2378,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.20",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz",
-      "integrity": "sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==",
+      "version": "26.0.22",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.22.tgz",
+      "integrity": "sha512-eeWwWjlqxvBxc4oQdkueW5OF/gtfSceKk4OnOAGlUSwS/liBRtZppbJuz1YkgbrbfGOoeBHun9fOvXnjNwrSOw==",
       "requires": {
         "jest-diff": "^26.0.0",
         "pretty-format": "^26.0.0"

sasjs-tests/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
     "@sasjs/test-framework": "^1.4.0",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^26.0.22",
     "@types/node": "^14.14.25",
     "@types/react": "^17.0.1",
     "@types/react-dom": "^17.0.0",

src/SASjs.ts

@@ -10,8 +10,7 @@ import {
   JobExecutor,
   WebJobExecutor,
   ComputeJobExecutor,
-  JesJobExecutor,
-  Sas9JobExecutor
+  JesJobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
 
@@ -42,7 +41,6 @@ export default class SASjs {
   private webJobExecutor: JobExecutor | null = null
   private computeJobExecutor: JobExecutor | null = null
   private jesJobExecutor: JobExecutor | null = null
-  private sas9JobExecutor: JobExecutor | null = null
 
   constructor(config?: any) {
     this.sasjsConfig = {
@@ -571,12 +569,6 @@ export default class SASjs {
           accessToken
         )
       }
-    } else if (
-      config.serverType === ServerType.Sas9 &&
-      config.username &&
-      config.password
-    ) {
-      return await this.sas9JobExecutor!.execute(sasJob, data, config)
     } else {
       return await this.webJobExecutor!.execute(
         sasJob,
@@ -831,12 +823,6 @@ export default class SASjs {
       this.sasViyaApiClient!
     )
 
-    this.sas9JobExecutor = new Sas9JobExecutor(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
-      this.jobsPath
-    )
-
     this.computeJobExecutor = new ComputeJobExecutor(
       this.sasjsConfig.serverUrl,
       this.sasViyaApiClient!

src/job-execution/Sas9JobExecutor.ts

@@ -1,110 +0,0 @@
-import { ServerType } from '@sasjs/utils/types'
-import * as NodeFormData from 'form-data'
-import { ErrorResponse } from '../types/errors'
-import { convertToCSV, isRelativePath } from '../utils'
-import { BaseJobExecutor } from './JobExecutor'
-import { Sas9RequestClient } from '../request/Sas9RequestClient'
-
-/**
- * Job executor for SAS9 servers for use in Node.js environments.
- * Initiates login with the provided username and password from the config
- * The cookies are stored in the request client and used in subsequent
- * job execution requests.
- */
-export class Sas9JobExecutor extends BaseJobExecutor {
-  private requestClient: Sas9RequestClient
-  constructor(
-    serverUrl: string,
-    serverType: ServerType,
-    private jobsPath: string
-  ) {
-    super(serverUrl, serverType)
-    this.requestClient = new Sas9RequestClient(serverUrl, false)
-  }
-
-  async execute(sasJob: string, data: any, config: any) {
-    const program = isRelativePath(sasJob)
-      ? config.appLoc
-        ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-        : sasJob
-      : sasJob
-    let apiUrl = `${config.serverUrl}${this.jobsPath}?${'_program=' + program}`
-    apiUrl = `${apiUrl}${
-      config.username && config.password
-        ? '&_username=' + config.username + '&_password=' + config.password
-        : ''
-    }`
-
-    let requestParams = {
-      ...this.getRequestParams(config)
-    }
-
-    let formData = new NodeFormData()
-
-    if (data) {
-      try {
-        formData = generateFileUploadForm(formData, data)
-      } catch (e) {
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      }
-    }
-
-    for (const key in requestParams) {
-      if (requestParams.hasOwnProperty(key)) {
-        formData.append(key, requestParams[key])
-      }
-    }
-
-    await this.requestClient.login(
-      config.username,
-      config.password,
-      this.jobsPath
-    )
-    const contentType =
-      data && Object.keys(data).length
-        ? 'multipart/form-data; boundary=' + (formData as any)._boundary
-        : 'text/plain'
-    return await this.requestClient!.post(
-      apiUrl,
-      formData,
-      undefined,
-      contentType,
-      {
-        Accept: '*/*',
-        Connection: 'Keep-Alive'
-      }
-    )
-  }
-
-  private getRequestParams(config: any): any {
-    const requestParams: any = {}
-
-    if (config.debug) {
-      requestParams['_debug'] = 131
-    }
-
-    return requestParams
-  }
-}
-
-const generateFileUploadForm = (
-  formData: NodeFormData,
-  data: any
-): NodeFormData => {
-  for (const tableName in data) {
-    const name = tableName
-    const csv = convertToCSV(data[tableName])
-    if (csv === 'ERROR: LARGE STRING LENGTH') {
-      throw new Error(
-        'The max length of a string value in SASjs is 32765 characters.'
-      )
-    }
-
-    formData.append(name, csv, {
-      filename: `${name}.csv`,
-      contentType: 'application/csv'
-    })
-  }
-
-  return formData
-}

src/job-execution/index.ts

@@ -1,5 +1,4 @@
 export * from './ComputeJobExecutor'
 export * from './JesJobExecutor'
 export * from './JobExecutor'
-export * from './Sas9JobExecutor'
 export * from './WebJobExecutor'

src/request/RequestClient.ts

@@ -44,11 +44,11 @@ export interface HttpClient {
 }
 
 export class RequestClient implements HttpClient {
-  protected csrfToken: CsrfToken = { headerName: '', value: '' }
-  protected fileUploadCsrfToken: CsrfToken | undefined
-  protected httpClient: AxiosInstance
+  private csrfToken: CsrfToken = { headerName: '', value: '' }
+  private fileUploadCsrfToken: CsrfToken | undefined
+  private httpClient: AxiosInstance
 
-  constructor(protected baseUrl: string, allowInsecure = false) {
+  constructor(private baseUrl: string, allowInsecure = false) {
     const https = require('https')
     if (allowInsecure && https.Agent) {
       this.httpClient = axios.create({
@@ -290,7 +290,7 @@ export class RequestClient implements HttpClient {
       })
   }
 
-  protected getHeaders = (
+  private getHeaders = (
     accessToken: string | undefined,
     contentType: string
   ) => {
@@ -315,7 +315,7 @@ export class RequestClient implements HttpClient {
     return headers
   }
 
-  protected parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
+  private parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -323,7 +323,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  protected parseAndSetCsrfToken = (response: AxiosResponse) => {
+  private parseAndSetCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -347,7 +347,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  protected handleError = async (
+  private handleError = async (
     e: any,
     callback: any,
     debug: boolean = false
@@ -405,7 +405,7 @@ export class RequestClient implements HttpClient {
     throw e
   }
 
-  protected parseResponse<T>(response: AxiosResponse<any>) {
+  private parseResponse<T>(response: AxiosResponse<any>) {
     const etag = response?.headers ? response.headers['etag'] : ''
     let parsedResponse
     let includeSAS9Log: boolean = false
@@ -439,7 +439,7 @@ export class RequestClient implements HttpClient {
   }
 }
 
-export const throwIfError = (response: AxiosResponse) => {
+const throwIfError = (response: AxiosResponse) => {
   if (response.status === 401) {
     throw new LoginRequiredError()
   }

src/request/Sas9RequestClient.ts

@@ -1,121 +0,0 @@
-import { AxiosRequestConfig } from 'axios'
-import axiosCookieJarSupport from 'axios-cookiejar-support'
-import * as tough from 'tough-cookie'
-import { prefixMessage } from '@sasjs/utils/error'
-import { RequestClient, throwIfError } from './RequestClient'
-
-/**
- * Specific request client for SAS9 in Node.js environments.
- * Handles redirects and cookie management.
- */
-export class Sas9RequestClient extends RequestClient {
-  constructor(baseUrl: string, allowInsecure = false) {
-    super(baseUrl, allowInsecure)
-    this.httpClient.defaults.maxRedirects = 0
-    this.httpClient.defaults.validateStatus = (status) =>
-      status >= 200 && status < 303
-
-    if (axiosCookieJarSupport) {
-      axiosCookieJarSupport(this.httpClient)
-      this.httpClient.defaults.jar = new tough.CookieJar()
-    }
-  }
-
-  public async login(username: string, password: string, jobsPath: string) {
-    const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
-    if (this.httpClient.defaults.jar) {
-      ;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookies()
-      await this.get(
-        `${jobsPath}?_program=${codeInjectorPath}&_username=${username}&_password=${password}`,
-        undefined,
-        'text/plain'
-      )
-    }
-  }
-
-  public async get<T>(
-    url: string,
-    accessToken: string | undefined,
-    contentType: string = 'application/json',
-    overrideHeaders: { [key: string]: string | number } = {},
-    debug: boolean = false
-  ): Promise<{ result: T; etag: string }> {
-    const headers = {
-      ...this.getHeaders(accessToken, contentType),
-      ...overrideHeaders
-    }
-
-    const requestConfig: AxiosRequestConfig = {
-      headers,
-      responseType: contentType === 'text/plain' ? 'text' : 'json',
-      withCredentials: true
-    }
-    if (contentType === 'text/plain') {
-      requestConfig.transformResponse = undefined
-    }
-
-    return this.httpClient
-      .get<T>(url, requestConfig)
-      .then((response) => {
-        if (response.status === 302) {
-          return this.get(
-            response.headers['location'],
-            accessToken,
-            contentType
-          )
-        }
-        throwIfError(response)
-        return this.parseResponse<T>(response)
-      })
-      .catch(async (e) => {
-        return await this.handleError(
-          e,
-          () =>
-            this.get<T>(url, accessToken, contentType, overrideHeaders).catch(
-              (err) => {
-                throw prefixMessage(
-                  err,
-                  'Error while executing handle error callback. '
-                )
-              }
-            ),
-          debug
-        ).catch((err) => {
-          throw prefixMessage(err, 'Error while handling error. ')
-        })
-      })
-  }
-
-  public post<T>(
-    url: string,
-    data: any,
-    accessToken: string | undefined,
-    contentType = 'application/json',
-    overrideHeaders: { [key: string]: string | number } = {}
-  ): Promise<{ result: T; etag: string }> {
-    const headers = {
-      ...this.getHeaders(accessToken, contentType),
-      ...overrideHeaders
-    }
-
-    return this.httpClient
-      .post<T>(url, data, { headers, withCredentials: true })
-      .then(async (response) => {
-        if (response.status === 302) {
-          return await this.get(
-            response.headers['location'],
-            undefined,
-            contentType,
-            overrideHeaders
-          )
-        }
-        throwIfError(response)
-        return this.parseResponse<T>(response)
-      })
-      .catch(async (e) => {
-        return await this.handleError(e, () =>
-          this.post<T>(url, data, accessToken, contentType, overrideHeaders)
-        )
-      })
-  }
-}