sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-09 05:20:05 +00:00
Code Issues Projects Releases Wiki Activity

Added suggestions

Browse Source
This commit is contained in:
Yury
2020-07-16 15:02:40 -04:00
parent 334a849caa
commit 9598c11f42
31 changed files with 258 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
example.html
View File

@@ -1,107 +1,114 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" /> <meta charset='utf-8' http-equiv='X-UA-Compatible' content='IE=edge' />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> <link rel='stylesheet' href='https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css' integrity='sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh' crossorigin='anonymous'>
<script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1"></script> <script src='https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1'></script>
<script> <script>
var sasJs = new SASjs.default({appLoc: "/Products/demo/readme" const sasJs = new SASjs.default({
,serverType:"SAS9", debug: "false" appLoc: '/Products/demo/readme',
}); serverType:'SAS9',
function initSasJs() { debug: 'false'
$('#loading-spinner').show() })
// instantiate sasjs with options such as backend app location
// login (it's also possible to set an autologin when making requests) const initSasJs = () => {
sasJs.logIn( $('#loading-spinner').show()
$('#username')[0].value
,$('#password')[0].value // instantiate sasJs with options such as backend app location
).then((response) => { // login (it's also possible to set an auto login when making requests)
if (response.isLoggedIn === true) { sasJs.logIn($('#username')[0].value, $('#password')[0].value)
$('#loading-spinner').hide() .then((response) => {
$('.login').hide() if (response.isLoggedIn === true) {
$('#getdata').show() $('#loading-spinner').hide()
$('#cars').show() $('.login').hide()
} $('#getDataBtn').show()
}) $('#cars').show()
} }
function getData(){ })
$('#loading-spinner').show()
$('#myChart').remove();
$('#chart-container').append('<canvas id="myChart" style="display: none;"></canvas>')
// make a request to a SAS service
var type = $("#cars")[0].options[$("#cars")[0].selectedIndex].value;
// request data from an endpoint under your appLoc
sasJs.request("/common/getdata", {
// send data as an array of objects - each object is one row
fromjs: [{ type: type }]
}).then((response) => {
$('#myChart').show();
var labels = []
var data = []
response.areas.map((d) => {
labels.push(d.MAKE);
data.push(d.AVPRICE);
})
$('#loading-spinner').hide()
initGraph(labels, data, type);
})
}
function initGraph(labels, data, type){
var myCanvas = document.getElementById("myChart");
var ctx = myCanvas.getContext("2d");
var myChart = new Chart(ctx, {
type: 'bar',
data: {
labels: labels,
datasets: [{
label: "Average Invoice Price in USD for " + type + " Cars by Manufacturer",
data: data,
backgroundColor: "rgba(255,99,132,0.2)",
borderColor: "rgba(255,99,132,1)",
borderWidth: 1,
hoverBackgroundColor: "rgba(255,99,132,0.4)",
hoverBorderColor: "rgba(255,99,132,1)",
}]
},
options: {
maintainAspectRatio: false,
scales: {yAxes: [{ticks: {beginAtZero: true}}]}
} }
});
} // make a request to a SAS service
</script> const getData = () => {
</head> $('#loading-spinner').show()
<body> $('#myChart').remove()
<div class="container-fluid" style="text-align: center; margin-top: 10px;"> $('#chart-container').append("<canvas id='myChart' style='display: none'></canvas>")
<div class="row">
<div class="col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto"> const type = $('#cars')[0].options[$('#cars')[0].selectedIndex].value
<h1>Demo Seed App for <span class="code">SASjs</span></h1>
<div class="login" id="login-form"> // request data from an endpoint under your appLoc
<div class="form-group"> // send data as an array of objects - each object is one row
<input class="form-control" type="text" id="username" placeholder="Enter username" /> sasJs.request('/common/getdata', {fromjs: [{ type: type }]})
.then((response) => {
$('#myChart').show()
$('#loading-spinner').hide()
const labels = response.areas.map(area => area.MAKE)
const data = response.areas.map(area => area.AVPRICE)
initGraph(labels, data, type)
})
}
const initGraph = (labels, data, type) => {
const myCanvas = document.getElementById('myChart')
const ctx = myCanvas.getContext('2d')
const myChart = new Chart(ctx, {
type: 'bar',
data: {
labels: labels,
datasets: [{
label: `Average Invoice Price in USD for ${type} Cars by Manufacturer`,
data: data,
backgroundColor: 'rgba(255,99,132,0.2)',
borderColor: 'rgba(255,99,132,1)',
borderWidth: 1,
hoverBackgroundColor: 'rgba(255,99,132,0.4)',
hoverBorderColor: 'rgba(255,99,132,1)',
}]
},
options: {
maintainAspectRatio: false,
scales: {yAxes: [{ticks: {beginAtZero: true}}]}
}
})
}
</script>
</head>
<body>
<div class='container-fluid' style='text-align: center; margin-top: 10px'>
<div class='row'>
<div class='col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto'>
<h1>Demo Seed App for <span class='code'>SASjs</span></h1>
<div class='login' id='login-form'>
<div class='form-group'>
<input class='form-control' type='text' id='username' placeholder='Enter username' />
</div>
<div class='form-group'>
<input class='form-control' type='password' id='password' placeholder='Enter password' />
</div>
<button id='login' onclick='initSasJs()' class='login btn btn-primary' style='margin-bottom: 5px'>Log In</button>
</div>
<select name='cars' id='cars' style='margin-bottom: 5px; display: none' class='form-control'>
<option value='Hybrid'>Hybrid</option>
<option value='SUV'>SUV</option>
<option value='Sedan'>Sedan</option>
<option value='Sports'>Sports</option>
<option value='Truck'>Truck</option>
<option value='Wagon'>Wagon</option>
</select>
<button id='getDataBtn' onclick='getData()' style='margin-bottom: 5px; display: none' class='btn btn-success'>Get Data</button>
<br>
<br>
<div id='loading-spinner' class='spinner-border text-primary' role='status' style='display: none'>
<span class='sr-only'>Loading...</span>
</div>
<br>
</div>
</div> </div>
<div class="form-group">
<input class="form-control" type="password" id="password" placeholder="Enter password" />
</div>
<button id="login" onclick="initSasJs()" class="login btn btn-primary" style="margin-bottom: 5px;">Log In</button>
</div>
<select name="cars" id="cars" style="margin-bottom: 5px; display: none;" class="form-control">
<option value="Hybrid">Hybrid</option>
<option value="SUV">SUV</option>
<option value="Sedan">Sedan</option>
<option value="Sports">Sports</option>
<option value="Truck">Truck</option>
<option value="Wagon">Wagon</option>
</select>
<button id="getdata" onclick="getData()" style="margin-bottom: 5px; display: none;" class="btn btn-success">Get Data</button><br><br>
<div id="loading-spinner" class="spinner-border text-primary" role="status" style="display: none;">
<span class="sr-only">Loading...</span>
</div><br>
</div> </div>
</div> <div id='chart-container' style='height: 65vh; width: 100%; position: relative; margin: auto'>
</div> <canvas id='myChart' style='display: none'></canvas>
<div id="chart-container" style="height: 65vh; width: 100%; position: relative; margin: auto;"> </div>
<canvas id="myChart" style="display: none;"></canvas> </body>
</div>
</body>
</head> </head>

84
src/SAS9ApiClient.ts
View File

@@ -3,49 +3,49 @@
* *
*/ */
export class SAS9ApiClient { export class SAS9ApiClient {
constructor(private serverUrl: string) {} constructor(private serverUrl: string) {}
/** /**
* returns on object containing the server URL * @returns an object containing the server URL
*/ */
public getConfig() { public getConfig() {
return { return {
serverUrl: this.serverUrl, serverUrl: this.serverUrl,
}; }
} }
/** /**
* Updates serverurl which is not null * Updates serverUrl which is not null
* @param serverUrl - the URL of the server. * @param serverUrl - the URL of the server.
*/ */
public setConfig(serverUrl: string) { public setConfig(serverUrl: string) {
if (serverUrl) this.serverUrl = serverUrl; if (serverUrl) this.serverUrl = serverUrl
} }
/** /**
* Executes code on a SAS9 server. * Executes code on a SAS9 server.
* @param linesOfCode - an array of lines of code to execute * @param linesOfCode - an array of lines of code to execute
* @param serverName - the server to execute the code on * @param serverName - the server to execute the code on
* @param repositoryName - the repository to execute the code on * @param repositoryName - the repository to execute the code on
*/ */
public async executeScript( public async executeScript(
linesOfCode: string[], linesOfCode: string[], // FIXME: rename
serverName: string, serverName: string,
repositoryName: string repositoryName: string
) { ) {
const requestPayload = linesOfCode.join("\n"); const requestPayload = linesOfCode.join('\n')
const executeScriptRequest = { const executeScriptRequest = {
method: "PUT", method: 'PUT',
headers: { headers: {Accept: 'application/json'},
Accept: "application/json", body: `command=${requestPayload}`,
}, }
body: `command=${requestPayload}`, // FIXME: use axios instead of fetch
}; const executeScriptResponse = await fetch(
const executeScriptResponse = await fetch( `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
`${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`, executeScriptRequest
executeScriptRequest ).then((res) => res.text())
).then((res) => res.text()); // FIXME: no catch block
return executeScriptResponse; return executeScriptResponse
} }
} }

12
src/SASViyaApiClient.ts
View File

@@ -1,3 +1,13 @@
/**
* TODO: needs to be split into logical blocks:
* - Folder
* - Config
* - Context
* - Session
* - Job
* - Auth
*/
import { import {
isAuthorizeFormRequired, isAuthorizeFormRequired,
parseAndSubmitAuthorizeForm, parseAndSubmitAuthorizeForm,
@@ -32,7 +42,7 @@ export class SASViyaApiClient {
if (this.rootFolderMap.size) { if (this.rootFolderMap.size) {
return this.rootFolderMap; return this.rootFolderMap;
} }
this.populateRootFolderMap(); this.populateRootFolderMap();
return this.rootFolderMap; return this.rootFolderMap;
} }

1
src/SASjs.spec.ts
View File

@@ -2,6 +2,7 @@ import SASjs from "./index";
const adapter = new SASjs(); const adapter = new SASjs();
// FIXME: adapter doesn't have 'parseSAS9SourceCode' and 'parseGeneratedCode'
it("should parse SAS9 source code", async done => { it("should parse SAS9 source code", async done => {
expect(sampleResponse).toBeTruthy(); expect(sampleResponse).toBeTruthy();
const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse); const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse);

16
src/SASjs.ts
View File

@@ -1,3 +1,16 @@
/**
* TODO: needs to be split into logical blocks:
* - Execute
* - Context
* - Session
* - Folder and services
* - Job
* - Auth
* - Config
* - Debug
* - Response
*/
import "isomorphic-fetch"; import "isomorphic-fetch";
import * as e6p from "es6-promise"; import * as e6p from "es6-promise";
(e6p as any).polyfill(); (e6p as any).polyfill();
@@ -839,6 +852,7 @@ export default class SASjs {
} }
} }
// FIXME: this method never used
private fetchLogFileContent(logLink: string) { private fetchLogFileContent(logLink: string) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fetch(logLink, { fetch(logLink, {
@@ -1038,4 +1052,4 @@ export default class SASjs {
); );
}); });
} }
} }

12
src/index.ts
View File

@@ -1,5 +1,7 @@
import SASjs from "./SASjs"; import SASjs from './SASjs'
export * from "./types";
export * from "./SASViyaApiClient"; export * from './types'
export * from "./SAS9ApiClient"; export * from './SASViyaApiClient'
export default SASjs; export * from './SAS9ApiClient'
export default SASjs

2
src/types/Context.ts
View File

@@ -3,4 +3,4 @@ export interface Context {
id: string; id: string;
createdBy: string; createdBy: string;
version: number; version: number;
} }

2
src/types/CsrfToken.ts
View File

@@ -1,4 +1,4 @@
export interface CsrfToken { export interface CsrfToken {
headerName: string; headerName: string;
value: string; value: string;
} }

2
src/types/Folder.ts
View File

@@ -4,4 +4,4 @@ export interface Folder {
id: string; id: string;
uri: string; uri: string;
links: Link[]; links: Link[];
} }

2
src/types/Job.ts
View File

@@ -8,4 +8,4 @@ export interface Job {
createdBy: string; createdBy: string;
links: Link[]; links: Link[];
results: JobResult; results: JobResult;
} }

2
src/types/JobResult.ts
View File

@@ -1,3 +1,3 @@
export interface JobResult { export interface JobResult {
"_webout.json": string; "_webout.json": string;
} }

2
src/types/Link.ts
View File

@@ -4,4 +4,4 @@ export interface Link {
href: string; href: string;
uri: string; uri: string;
type: string; type: string;
} }

1
src/types/SASjsConfig.ts
View File

@@ -10,6 +10,7 @@ export class SASjsConfig {
* Can be omitted, eg if serving directly from the SAS Web Server or being * Can be omitted, eg if serving directly from the SAS Web Server or being
* streamed. * streamed.
*/ */
// TODO: we should clarify what location we are talking about
serverUrl: string = ""; serverUrl: string = "";
pathSAS9: string = ""; pathSAS9: string = "";
pathSASViya: string = ""; pathSASViya: string = "";

2
src/types/SASjsRequest.ts
View File

@@ -9,4 +9,4 @@ export interface SASjsRequest {
generatedCode: string; generatedCode: string;
logFile: string; logFile: string;
SASWORK: any; SASWORK: any;
} }

2
src/types/SASjsWaitingRequest.ts
View File

@@ -2,6 +2,8 @@
* Represents requests that are queued, pending a signon event * Represents requests that are queued, pending a signon event
* *
*/ */
// FIXME: be more specific on type declaration
export interface SASjsWaitingRequest { export interface SASjsWaitingRequest {
requestPromise: { requestPromise: {
promise: any; promise: any;

2
src/types/ServerType.ts
View File

@@ -5,4 +5,4 @@
export enum ServerType { export enum ServerType {
SASViya = "SASVIYA", SASViya = "SASVIYA",
SAS9 = "SAS9", SAS9 = "SAS9",
} }

2
src/types/Session.ts
View File

@@ -1,3 +1,3 @@
export interface Session { export interface Session {
id: string; id: string;
} }

2
src/types/index.ts
View File

@@ -7,4 +7,4 @@ export * from "./SASjsConfig";
export * from "./SASjsRequest"; export * from "./SASjsRequest";
export * from "./SASjsWaitingRequest"; export * from "./SASjsWaitingRequest";
export * from "./ServerType"; export * from "./ServerType";
export * from "./Session"; export * from "./Session";

3
src/utils/asyncForEach.ts
View File

@@ -1,5 +1,6 @@
// FIXME: use ES6
export async function asyncForEach(array: any[], callback: any) { export async function asyncForEach(array: any[], callback: any) {
for (let index = 0; index < array.length; index++) { for (let index = 0; index < array.length; index++) {
await callback(array[index], index, array); await callback(array[index], index, array);
} }
} }

1
src/utils/compareTimestamps.ts
View File

@@ -2,7 +2,6 @@ import { SASjsRequest } from "../types/SASjsRequest";
/** /**
* Comparator for SASjs request timestamps * Comparator for SASjs request timestamps
*
*/ */
export const compareTimestamps = (a: SASjsRequest, b: SASjsRequest) => { export const compareTimestamps = (a: SASjsRequest, b: SASjsRequest) => {
return b.timestamp.getTime() - a.timestamp.getTime(); return b.timestamp.getTime() - a.timestamp.getTime();

37
src/utils/convertToCsv.ts
View File

@@ -3,43 +3,43 @@
* @param data - the JSON object to convert. * @param data - the JSON object to convert.
*/ */
export const convertToCSV = (data: any) => { export const convertToCSV = (data: any) => {
const replacer = (key: any, value: any) => (value === null ? "" : value); const replacer = (key: any, value: any) => (value === null ? "" : value); // FIXME: 'key' parameter was not used, why do we compare with null (undefined, NaN)?
const headerFields = Object.keys(data[0]); const headerFields = Object.keys(data[0]); // FIXME: data can be of any type, but we are working with it as with object
let csvTest; let csvTest;
let invalidString = false; let invalidString = false;
const headers = headerFields.map((field) => { const headers = headerFields.map((field) => {
let firstFoundType: string | null = null; let firstFoundType: string | null = null;
let hasMixedTypes: boolean = false; let hasMixedTypes: boolean = false; // FIXME: unnecessary type declaration
let rowNumError: number = -1; let rowNumError: number = -1; // FIXME: unnecessary type declaration
const longestValueForField = data const longestValueForField = data
.map((row: any, index: number) => { .map((row: any, index: number) => { // FIXME: row should be of type string | number
if (row[field] || row[field] === "") { if (row[field] || row[field] === "") {
if (firstFoundType) { if (firstFoundType) {
let currentFieldType = let currentFieldType = // FIXME: use const
row[field] === "" || typeof row[field] === "string" row[field] === "" || typeof row[field] === "string" // FIXME: "" is also of type string
? "chars" ? "chars"
: "number"; : "number";
if (!hasMixedTypes) { if (!hasMixedTypes) {
hasMixedTypes = currentFieldType !== firstFoundType; hasMixedTypes = currentFieldType !== firstFoundType;
rowNumError = hasMixedTypes ? index + 1 : -1; rowNumError = hasMixedTypes ? index + 1 : -1; // TODO: refactor
} }
} else { } else {
if (row[field] === "") { if (row[field] === "") {
firstFoundType = "chars"; firstFoundType = "chars";
} else { } else {
firstFoundType = firstFoundType =
typeof row[field] === "string" ? "chars" : "number"; typeof row[field] === "string" ? "chars" : "number"; // TODO: refactor
} }
} }
let byteSize; let byteSize;
if (typeof row[field] === "string") { if (typeof row[field] === "string") {
let doubleQuotesFound = row[field] let doubleQuotesFound = row[field] // FIXME: use const
.split("") .split("")
.filter((char: any) => char === '"'); .filter((char: any) => char === '"'); // FIXME: why char is of type any?
byteSize = getByteSize(row[field]); byteSize = getByteSize(row[field]);
@@ -52,16 +52,18 @@ export const convertToCSV = (data: any) => {
} }
}) })
.sort((a: number, b: number) => b - a)[0]; .sort((a: number, b: number) => b - a)[0];
if (longestValueForField && longestValueForField > 32765) {
if (longestValueForField && longestValueForField > 32765) { // FIXME: longestValueForField is an array and it is not comparable to a number
invalidString = true; invalidString = true;
} }
if (hasMixedTypes) { if (hasMixedTypes) {
console.error( console.error(
`Row (${rowNumError}), Column (${field}) has mixed types: ERROR` `Row (${rowNumError}), Column (${field}) has mixed types: ERROR`
); );
} }
return `${field}:${firstFoundType === "chars" ? "$" : ""}${ return `${field}:${firstFoundType === "chars" ? "$" : ""}${ // TODO: format return string before return statement
longestValueForField longestValueForField
? longestValueForField ? longestValueForField
: firstFoundType === "chars" : firstFoundType === "chars"
@@ -73,10 +75,11 @@ export const convertToCSV = (data: any) => {
if (invalidString) { if (invalidString) {
return "ERROR: LARGE STRING LENGTH"; return "ERROR: LARGE STRING LENGTH";
} }
csvTest = data.map((row: any) => { csvTest = data.map((row: any) => {
const fields = Object.keys(row).map((fieldName, index) => { const fields = Object.keys(row).map((fieldName, index) => {
let value; let value;
let containsSpecialChar = false; let containsSpecialChar = false; // FIXME: should be const
const currentCell = row[fieldName]; const currentCell = row[fieldName];
if (JSON.stringify(currentCell).search(/(\\t|\\n|\\r)/gm) > -1) { if (JSON.stringify(currentCell).search(/(\\t|\\n|\\r)/gm) > -1) {
@@ -89,7 +92,7 @@ export const convertToCSV = (data: any) => {
value = value.replace(/\\\\/gm, "\\"); value = value.replace(/\\\\/gm, "\\");
if (containsSpecialChar) { if (containsSpecialChar) {
if (value.includes(",") || value.includes('"')) { if (value.includes(",") || value.includes('"')) { // FIXME: use `"`
value = '"' + value + '"'; value = '"' + value + '"';
} }
} else { } else {
@@ -112,6 +115,7 @@ export const convertToCSV = (data: any) => {
return value; return value;
}); });
return fields.join(","); return fields.join(",");
}); });
@@ -121,6 +125,7 @@ export const convertToCSV = (data: any) => {
return finalCSV; return finalCSV;
}; };
// TODO: refactor
const getByteSize = (str: string) => { const getByteSize = (str: string) => {
let byteSize = str.length; let byteSize = str.length;
for (let i = str.length - 1; i >= 0; i--) { for (let i = str.length - 1; i >= 0; i--) {
@@ -130,4 +135,4 @@ const getByteSize = (str: string) => {
if (code >= 0xdc00 && code <= 0xdfff) i--; //trail surrogate if (code >= 0xdc00 && code <= 0xdfff) i--; //trail surrogate
} }
return byteSize; return byteSize;
}; };

2
src/utils/isAuthorizeFormRequired.ts
View File

@@ -1,3 +1,3 @@
export const isAuthorizeFormRequired = (response: string): boolean => { export const isAuthorizeFormRequired = (response: string): boolean => {
return /<form.+action="(.*Logon\/oauth\/authorize[^"]*).*>/gm.test(response); return /<form.+action="(.*Logon\/oauth\/authorize[^"]*).*>/gm.test(response);
}; };

5
src/utils/isLoginRequired.ts
View File

@@ -1,5 +1,6 @@
export const isLogInRequired = (response: string): boolean => { export const isLogInRequired = (response: string): boolean => {
const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/gm; const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/gm; // FIXME: unnecessary type declaration
const matches = pattern.test(response); const matches = pattern.test(response);
return matches; return matches;
}; };

3
src/utils/isLoginSuccess.ts
View File

@@ -1,2 +1 @@
export const isLogInSuccess = (response: string): boolean => export const isLogInSuccess = (response: string): boolean => /You have signed in/gm.test(response); // TODO: maybe we have more reliable way to verify that login was successful?
/You have signed in/gm.test(response);

22
src/utils/makeRequest.ts
View File

@@ -2,30 +2,33 @@ import { CsrfToken } from "../types";
export async function makeRequest<T>( export async function makeRequest<T>(
url: string, url: string,
request: RequestInit, request: RequestInit, // Where 'RequestInit' is coming from?
callback: (value: CsrfToken) => any, callback: (value: CsrfToken) => any,
contentType: "text" | "json" = "json" contentType: "text" | "json" = "json"
): Promise<T> { ): Promise<T> {
const responseTransform = const responseTransform = contentType === "json" ?
contentType === "json" (res: Response) => res.json()
? (res: Response) => res.json() :
: (res: Response) => res.text(); (res: Response) => res.text();
const result = await fetch(url, request).then((response) => {
if (!response.ok) { const result = await fetch(url, request).then((response) => { // FIXME: use axios instead of fetch
if (!response.ok) { // FIXME we can just check if status === 403
if (response.status === 403) { if (response.status === 403) {
const tokenHeader = response.headers.get("X-CSRF-HEADER"); const tokenHeader = response.headers.get("X-CSRF-HEADER");
if (tokenHeader) { if (tokenHeader) {
const token = response.headers.get(tokenHeader); const token = response.headers.get(tokenHeader) || ''; // TODO: refactor
callback({ callback({
headerName: tokenHeader, headerName: tokenHeader,
value: token || "", value: token,
}); });
const retryRequest = { const retryRequest = {
...request, ...request,
headers: { ...request.headers, [tokenHeader]: token }, headers: { ...request.headers, [tokenHeader]: token },
}; };
return fetch(url, retryRequest).then(responseTransform); return fetch(url, retryRequest).then(responseTransform);
} }
} }
@@ -33,5 +36,6 @@ export async function makeRequest<T>(
return responseTransform(response); return responseTransform(response);
} }
}); });
return result; return result;
} }

3
src/utils/needsRetry.ts
View File

@@ -1,3 +1,4 @@
// TODO: refactor
export const needsRetry = (responseText: string): boolean => { export const needsRetry = (responseText: string): boolean => {
return ( return (
(responseText.includes('"errorCode":403') && (responseText.includes('"errorCode":403') &&
@@ -8,4 +9,4 @@ export const needsRetry = (responseText: string): boolean => {
(responseText.includes('"status":449') && (responseText.includes('"status":449') &&
responseText.includes("Authentication success, retry original request")) responseText.includes("Authentication success, retry original request"))
); );
}; };

8
src/utils/parseAndSubmitAuthorizeForm.ts
View File

@@ -6,7 +6,7 @@ export const parseAndSubmitAuthorizeForm = async (
const params: any = {}; const params: any = {};
const responseBody = response.split("<body>")[1].split("</body>")[0]; const responseBody = response.split("<body>")[1].split("</body>")[0];
const bodyElement = document.createElement("div"); const bodyElement = document.createElement("div"); // TODO: rename
bodyElement.innerHTML = responseBody; bodyElement.innerHTML = responseBody;
const form = bodyElement.querySelector("#application_authorization"); const form = bodyElement.querySelector("#application_authorization");
@@ -24,7 +24,7 @@ export const parseAndSubmitAuthorizeForm = async (
const formData = new FormData(); const formData = new FormData();
for (const key in params) { for (const key in params) { // TODO: use forEach
if (params.hasOwnProperty(key)) { if (params.hasOwnProperty(key)) {
formData.append(key, params[key]); formData.append(key, params[key]);
} }
@@ -32,7 +32,7 @@ export const parseAndSubmitAuthorizeForm = async (
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (authUrl) { if (authUrl) {
fetch(authUrl, { fetch(authUrl, { // TODO use axios instead of fetch
method: "POST", method: "POST",
credentials: "include", credentials: "include",
body: formData, body: formData,
@@ -46,4 +46,4 @@ export const parseAndSubmitAuthorizeForm = async (
reject("Auth form url is null"); reject("Auth form url is null");
} }
}); });
}; };

4
src/utils/parseGeneratedCode.ts
View File

@@ -1,7 +1,7 @@
export const parseGeneratedCode = (log: string) => { export const parseGeneratedCode = (log: string) => {
const startsWith = "MPRINT"; const startsWith = "MPRINT";
const isGeneratedCodeLine = (line: string) => const isGeneratedCodeLine = (line: string) => line.trim().startsWith(startsWith);
line.trim().startsWith(startsWith);
const logLines = log.split("\n").filter(isGeneratedCodeLine); const logLines = log.split("\n").filter(isGeneratedCodeLine);
return logLines.join("\r\n"); return logLines.join("\r\n");
}; };

7
src/utils/parseSasViyaLog.ts
View File

@@ -1,12 +1,15 @@
export const parseSasViyaLog = (logResponse: { items: any[] }) => { export const parseSasViyaLog = (logResponse: { items: any[] }) => { // TODO: be more specific on type declaration
let log; let log;
try { try {
log = logResponse.items log = logResponse.items
? logResponse.items.map((i) => i.line).join("\n") ? logResponse.items.map((i) => i.line).join("\n")
: JSON.stringify(logResponse); : JSON.stringify(logResponse);
} catch (e) { } catch (e) { // TODO: rename parameter to err or error
console.error("An error has occurred while parsing the log response", e); console.error("An error has occurred while parsing the log response", e);
log = logResponse; log = logResponse;
} }
return log; return log;
}; };

4
src/utils/parseSourceCode.ts
View File

@@ -1,6 +1,6 @@
export const parseSourceCode = (log: string): string => { export const parseSourceCode = (log: string): string => {
const isSourceCodeLine = (line: string) => const isSourceCodeLine = (line: string) => line.trim().substring(0, 10).trimStart().match(/^\d/);
line.trim().substring(0, 10).trimStart().match(/^\d/);
const logLines = log.split("\n").filter(isSourceCodeLine); const logLines = log.split("\n").filter(isSourceCodeLine);
return logLines.join("\r\n"); return logLines.join("\r\n");
}; };

8
src/utils/serialize.ts
View File

@@ -1,6 +1,7 @@
export const serialize = (obj: any) => { export const serialize = (obj: any) => { // TODO: be more specific on type declaration
const str: any[] = []; const str: any[] = [];
for (const p in obj) {
for (const p in obj) { // FIXME: name variables properly
if (obj.hasOwnProperty(p)) { if (obj.hasOwnProperty(p)) {
if (obj[p] instanceof Array) { if (obj[p] instanceof Array) {
for (let i = 0, n = obj[p].length; i < n; i++) { for (let i = 0, n = obj[p].length; i < n; i++) {
@@ -11,5 +12,6 @@ export const serialize = (obj: any) => {
} }
} }
} }
return str.join("&"); return str.join("&");
}; };