@sasjs/adapter 2.12.0 → 3.1.0

package/src/test/SAS_server_app.ts

@@ -0,0 +1,38 @@
+import express = require('express')
+
+export const app = express()
+
+export const mockedAuthResponse = {
+  access_token: 'access_token',
+  token_type: 'bearer',
+  id_token: 'id_token',
+  refresh_token: 'refresh_token',
+  expires_in: 43199,
+  scope: 'openid',
+  jti: 'jti'
+}
+
+app.get('/', function (req: any, res: any) {
+  res.send('Hello World')
+})
+
+app.post('/SASLogon/oauth/token', function (req: any, res: any) {
+  let valid = true
+  // capture the encoded form data
+  req.on('data', (data: any) => {
+    const resData = data.toString()
+
+    if (resData.includes('incorrect')) valid = false
+  })
+
+  // send a response when finished reading
+  // the encoded form data
+  req.on('end', () => {
+    if (valid) res.status(200).send(mockedAuthResponse)
+    else
+      res.status(401).send({
+        error: 'unauthorized',
+        error_description: 'Bad credentials'
+      })
+  })
+})

package/src/types/ExecuteScript.ts

@@ -1,5 +1,4 @@
 export interface ExecutionQuery {
   _program: string
   _debug?: number
-  _log?: boolean
 }

package/src/types/SASjsConfig.ts

@@ -1,3 +1,4 @@
+import * as https from 'https'
 import { ServerType } from '@sasjs/utils/types'
 
 /**
@@ -11,6 +12,11 @@ export class SASjsConfig {
    * streamed.
    */
   serverUrl: string = ''
+  /**
+   * The location of the STP Process Web Application.  By default the adapter
+   * will use '/SASjsApi/stp/execute' on SAS JS.
+   */
+  pathSASJS?: string = ''
   /**
    * The location of the Stored Process Web Application.  By default the adapter
    * will use '/SASStoredProcess/do' on SAS 9.
@@ -54,11 +60,11 @@ export class SASjsConfig {
    */
   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.
-   * Changing this setting is not recommended.
+   * Optional settings to configure HTTPS Agent.
+   * By providing `key`, `cert`, `ca` to connect with server
+   * Other options can be set `rejectUnauthorized` and `requestCert`
    */
-  allowInsecureRequests = false
+  httpsAgentOptions?: https.AgentOptions
   /**
    * Supported login mechanisms are - Redirected and Default
    */

package/src/utils/createAxiosInstance.ts

@@ -0,0 +1,7 @@
+import axios from 'axios'
+import * as https from 'https'
+
+export const createAxiosInstance = (
+  baseURL: string,
+  httpsAgent?: https.Agent
+) => axios.create({ baseURL, httpsAgent })

package/src/utils/getValidJson.ts

@@ -4,7 +4,7 @@ import { JsonParseArrayError, InvalidJsonError } from '../types/errors'
  * if string passed then parse the string to json else if throw error for all other types unless it is not a valid json object.
  * @param str - string to check.
  */
-export const getValidJson = (str: string | object) => {
+export const getValidJson = (str: string | object): object => {
   try {
     if (str === null || str === undefined) throw new InvalidJsonError()
 

package/src/utils/index.ts

@@ -1,6 +1,7 @@
 export * from './asyncForEach'
 export * from './compareTimestamps'
 export * from './convertToCsv'
+export * from './createAxiosInstance'
 export * from './delay'
 export * from './isNode'
 export * from './isRelativePath'

package/src/utils/parseWeboutResponse.ts

@@ -1,6 +1,6 @@
 import { WeboutResponseError } from '../types/errors'
 
-export const parseWeboutResponse = (response: string, url?: string) => {
+export const parseWeboutResponse = (response: string, url?: string): string => {
   let sasResponse = ''
 
   if (response.includes('>>weboutBEGIN<<')) {

package/test/RequestClient.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/test/SAS_server_app.d.ts

@@ -0,0 +1,10 @@
+export declare const app: import("express-serve-static-core").Express;
+export declare const mockedAuthResponse: {
+    access_token: string;
+    token_type: string;
+    id_token: string;
+    refresh_token: string;
+    expires_in: number;
+    scope: string;
+    jti: string;
+};

package/types/ExecuteScript.d.ts

@@ -1,5 +1,4 @@
 export interface ExecutionQuery {
     _program: string;
     _debug?: number;
-    _log?: boolean;
 }

package/types/SASjsConfig.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import * as https from 'https';
 import { ServerType } from '@sasjs/utils/types';
 /**
  * Specifies the configuration for the SASjs instance - eg where and how to
@@ -10,6 +12,11 @@ export declare class SASjsConfig {
      * streamed.
      */
     serverUrl: string;
+    /**
+     * The location of the STP Process Web Application.  By default the adapter
+     * will use '/SASjsApi/stp/execute' on SAS JS.
+     */
+    pathSASJS?: string;
     /**
      * The location of the Stored Process Web Application.  By default the adapter
      * will use '/SASStoredProcess/do' on SAS 9.
@@ -53,11 +60,11 @@ export declare class SASjsConfig {
      */
     useComputeApi: boolean | null;
     /**
-     * Defaults to `false`.
-     * When set to `true`, the adapter will allow requests to SAS servers that use a self-signed SSL certificate.
-     * Changing this setting is not recommended.
+     * Optional settings to configure HTTPS Agent.
+     * By providing `key`, `cert`, `ca` to connect with server
+     * Other options can be set `rejectUnauthorized` and `requestCert`
      */
-    allowInsecureRequests: boolean;
+    httpsAgentOptions?: https.AgentOptions;
     /**
      * Supported login mechanisms are - Redirected and Default
      */

package/utils/createAxiosInstance.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+import * as https from 'https';
+export declare const createAxiosInstance: (baseURL: string, httpsAgent?: https.Agent | undefined) => import("axios").AxiosInstance;

package/utils/getValidJson.d.ts

@@ -2,4 +2,4 @@
  * if string passed then parse the string to json else if throw error for all other types unless it is not a valid json object.
  * @param str - string to check.
  */
-export declare const getValidJson: (str: string | object) => any;
+export declare const getValidJson: (str: string | object) => object;

package/utils/index.d.ts

@@ -1,6 +1,7 @@
 export * from './asyncForEach';
 export * from './compareTimestamps';
 export * from './convertToCsv';
+export * from './createAxiosInstance';
 export * from './delay';
 export * from './isNode';
 export * from './isRelativePath';

package/utils/parseViyaDebugResponse.d.ts

@@ -9,4 +9,4 @@ import { RequestClient } from '../request/RequestClient';
  * @param serverUrl
  * @returns
  */
-export declare const parseSasViyaDebugResponse: (response: string, requestClient: RequestClient, serverUrl: string) => Promise<any>;
+export declare const parseSasViyaDebugResponse: (response: string, requestClient: RequestClient, serverUrl: string) => Promise<object>;

package/CHANGELOG.md

@@ -1,213 +0,0 @@
-# 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>
-# [1.9.0](https://github.com/macropeople/sasjs/compare/v1.8.0...v1.9.0) (2020-03-05)
-
-
-### Bug Fixes
-
-* special chars regex, csv function improvements ([5c8e3fe](https://github.com/macropeople/sasjs/commit/5c8e3fe))
-* splitting tests in different files ([95e1d8b](https://github.com/macropeople/sasjs/commit/95e1d8b))
-* switching crlfs to lfs in values ([277cf3f](https://github.com/macropeople/sasjs/commit/277cf3f))
-
-
-### Features
-
-* fixing tests to fit adapter behaviour ([6146189](https://github.com/macropeople/sasjs/commit/6146189))
-
-
-
-<a name="1.8.0"></a>
-# [1.8.0](https://github.com/macropeople/sasjs/compare/v1.7.2...v1.8.0) (2020-03-03)
-
-
-### Bug Fixes
-
-* parsing error from response ([ff5fa1b](https://github.com/macropeople/sasjs/commit/ff5fa1b))
-
-
-### Features
-
-* update SASjs configuration after initializaton ([ee1255c](https://github.com/macropeople/sasjs/commit/ee1255c))
-
-
-
-<a name="1.7.2"></a>
-## [1.7.2](https://github.com/macropeople/sasjs/compare/v1.7.1...v1.7.2) (2020-03-02)
-
-
-
-<a name="1.7.1"></a>
-## [1.7.1](https://github.com/macropeople/sasjs/compare/v1.7.0...v1.7.1) (2020-03-02)
-
-
-### Bug Fixes
-
-* header data types, empty numerics ([c95c9fc](https://github.com/macropeople/sasjs/commit/c95c9fc))
-
-
-
-<a name="1.7.0"></a>
-# [1.7.0](https://github.com/macropeople/sasjs/compare/v1.6.5...v1.7.0) (2020-03-01)
-
-
-### Bug Fixes
-
-* adapter upgrade ([7c221dc](https://github.com/macropeople/sasjs/commit/7c221dc))
-* failing test ([12b29b0](https://github.com/macropeople/sasjs/commit/12b29b0))
-* retry on redirect only with SAS9 ([69d08e5](https://github.com/macropeople/sasjs/commit/69d08e5))
-* test rewrite ([aeb636b](https://github.com/macropeople/sasjs/commit/aeb636b))
-
-
-### Features
-
-*  tests for sasjs, also bumping cypress version and setting cypress tsconfig to ES6 (we'll be using cypress browsers) ([e8193c1](https://github.com/macropeople/sasjs/commit/e8193c1))
-*  tests for sasjs, also bumping cypress version and setting cypress tsconfig to ES6 (we'll be using cypress browsers) ([a197344](https://github.com/macropeople/sasjs/commit/a197344))
-
-
-
-<a name="1.6.5"></a>
-## [1.6.5](https://github.com/macropeople/sasjs/compare/v1.6.4...v1.6.5) (2020-03-01)
-
-
-
-<a name="1.6.4"></a>
-## [1.6.4](https://github.com/macropeople/sasjs/compare/v1.6.3...v1.6.4) (2020-03-01)
-
-
-
-<a name="1.6.3"></a>
-## [1.6.3](https://github.com/macropeople/sasjs/compare/v1.6.2...v1.6.3) (2020-02-26)
-
-
-### Bug Fixes
-
-* always check session before trying to log in ([6f256ac](https://github.com/macropeople/sasjs/commit/6f256ac))
-
-
-
-<a name="1.6.2"></a>
-## [1.6.2](https://github.com/macropeople/sasjs/compare/v1.6.1...v1.6.2) (2020-02-26)
-
-
-### Bug Fixes
-
-* SAS9 response fix ([4917d38](https://github.com/macropeople/sasjs/commit/4917d38))
-
-
-
-<a name="1.6.1"></a>
-## [1.6.1](https://github.com/macropeople/sasjs/compare/v1.6.0...v1.6.1) (2020-02-23)
-
-
-
-<a name="1.6.0"></a>
-# [1.6.0](https://github.com/macropeople/sasjs/compare/v1.5.4...v1.6.0) (2020-02-23)
-
-
-### Features
-
-* adding sasjs JS file in dist folder ([a4d7e87](https://github.com/macropeople/sasjs/commit/a4d7e87))
-
-
-
-<a name="1.5.4"></a>
-## [1.5.4](https://github.com/macropeople/sasjs/compare/v1.5.3...v1.5.4) (2020-02-22)
-
-
-### Bug Fixes
-
-* splice log only if there is a log in Viya ([d72a987](https://github.com/macropeople/sasjs/commit/d72a987))
-
-
-
-<a name="1.5.3"></a>
-## [1.5.3](https://github.com/macropeople/sasjs/compare/v1.5.2...v1.5.3) (2020-02-22)
-
-
-### Bug Fixes
-
-* capturing and parsing program code in Viya, plus replacement of console logs with console errors ([f4d6ac7](https://github.com/macropeople/sasjs/commit/f4d6ac7))
-
-
-
-<a name="1.5.2"></a>
-## [1.5.2](https://github.com/macropeople/sasjs/compare/v1.5.1...v1.5.2) (2020-02-22)
-
-
-
-<a name="1.5.1"></a>
-## [1.5.1](https://github.com/macropeople/sasjs/compare/v1.5.0...v1.5.1) (2020-02-21)
-
-
-### Bug Fixes
-
-* parse code only when log is available ([92fadff](https://github.com/macropeople/sasjs/commit/92fadff))
-
-
-
-<a name="1.5.0"></a>
-# [1.5.0](https://github.com/macropeople/sasjs/compare/v1.4.2...v1.5.0) (2020-02-21)
-
-
-### Bug Fixes
-
-* fetch login form data if not available ([d7e7b2f](https://github.com/macropeople/sasjs/commit/d7e7b2f))
-* revert unnecessary change ([34ed2a0](https://github.com/macropeople/sasjs/commit/34ed2a0))
-
-
-### Features
-
-* add checkSession API ([dc170fe](https://github.com/macropeople/sasjs/commit/dc170fe))
-
-
-
-<a name="1.4.2"></a>
-## [1.4.2](https://github.com/macropeople/sasjs/compare/v1.4.0...v1.4.2) (2020-02-20)
-
-
-### Bug Fixes
-
-* premature assignment of loginLink ([0c8a967](https://github.com/macropeople/sasjs/commit/0c8a967))
-
-
-
-<a name="1.4.0"></a>
-# [1.4.0](https://github.com/macropeople/sasjs/compare/v1.3.0...v1.4.0) (2020-02-20)
-
-
-### Bug Fixes
-
-* putting param export in right place ([6372ea2](https://github.com/macropeople/sasjs/commit/6372ea2))
-
-
-### Features
-
-* switching from file based upload to params for Viya.  Fixes [#13](https://github.com/macropeople/sasjs/issues/13) ([2aeba78](https://github.com/macropeople/sasjs/commit/2aeba78))
-
-
-
-<a name="1.3.0"></a>
-# 1.3.0 (2020-02-17)
-
-
-### Bug Fixes
-
-*  closes #issue6 ([efe1510](https://github.com/macropeople/sasjs/commit/efe1510)), closes [#issue6](https://github.com/macropeople/sasjs/issues/issue6)
-* add setter for debug state ([10945a6](https://github.com/macropeople/sasjs/commit/10945a6))
-* config renaming ([f8ace78](https://github.com/macropeople/sasjs/commit/f8ace78))
-
-
-### Features
-
-*  adding MIT license ([ef19e2a](https://github.com/macropeople/sasjs/commit/ef19e2a))
-* add parsing of source and generated code from response ([892122a](https://github.com/macropeople/sasjs/commit/892122a))
-* add support for SAS9 responses ([96c31c8](https://github.com/macropeople/sasjs/commit/96c31c8))
-* code of conduct ([cf31ce6](https://github.com/macropeople/sasjs/commit/cf31ce6))
-* initial commit ([6957dac](https://github.com/macropeople/sasjs/commit/6957dac))