1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-10 22:00:05 +00:00

Compare commits

..

3 Commits

Author SHA1 Message Date
Allan Bowe
9ed64e5a2c Merge pull request #42 from sasjs/issue41
fix: csrfTokenWeb setter callback
2020-08-18 13:22:33 +02:00
Mihajlo Medjedovic
0479a5d651 fix: csrfTokenWeb setter callback 2020-08-18 13:17:29 +02:00
Allan Bowe
005f10bb47 Update CONTRIBUTING.md 2020-08-18 11:24:30 +02:00
3 changed files with 20 additions and 2 deletions

View File

@@ -70,6 +70,14 @@ parmcards4;
%webout(CLOSE) %webout(CLOSE)
;;;; ;;;;
%mp_createwebservice(path=/Public/app/common,name=sendArr) %mp_createwebservice(path=/Public/app/common,name=sendArr)
filename ft15f001 temp;
parmcards4;
If you can keep your head when all about you
Are losing theirs and blaming it on you,
If you can trust yourself when all men doubt you,
But make allowance for their doubting too;
;;;;
%mp_createwebservice(path=/Public/app/common,name=makeErr)
``` ```
The above services will return anything you send. To run the tests simply launch `npm run cypress`. The above services will return anything you send. To run the tests simply launch `npm run cypress`.

View File

@@ -9,7 +9,8 @@ export class FileUploader {
private appLoc: string, private appLoc: string,
private serverUrl: string, private serverUrl: string,
private jobsPath: string, private jobsPath: string,
private csrfToken: CsrfToken | null = null private setCsrfTokenWeb: any,
private csrfToken: CsrfToken | null = null,
) {} ) {}
private retryCount = 0; private retryCount = 0;
@@ -61,6 +62,8 @@ export class FileUploader {
headerName: tokenHeader, headerName: tokenHeader,
value: token || "", value: token || "",
}; };
this.setCsrfTokenWeb(this.csrfToken);
} }
} }
} }

View File

@@ -399,8 +399,10 @@ export default class SASjs {
this.sasjsConfig.appLoc, this.sasjsConfig.appLoc,
this.sasjsConfig.serverUrl, this.sasjsConfig.serverUrl,
this.jobsPath, this.jobsPath,
this.setCsrfTokenWeb,
this.csrfTokenWeb this.csrfTokenWeb
); );
return fileUploader.uploadFile(sasJob, files, params); return fileUploader.uploadFile(sasJob, files, params);
} }
@@ -911,6 +913,10 @@ export default class SASjs {
return sasjsWaitingRequest.requestPromise.promise; return sasjsWaitingRequest.requestPromise.promise;
} }
private setCsrfTokenWeb = (csrfToken: CsrfToken) => {
this.csrfTokenWeb = csrfToken;
};
private setCsrfTokenApi = (csrfToken: CsrfToken) => { private setCsrfTokenApi = (csrfToken: CsrfToken) => {
this.csrfTokenApi = csrfToken; this.csrfTokenApi = csrfToken;
@@ -1177,7 +1183,8 @@ export default class SASjs {
this.fileUploader = new FileUploader( this.fileUploader = new FileUploader(
this.sasjsConfig.appLoc, this.sasjsConfig.appLoc,
this.sasjsConfig.serverUrl, this.sasjsConfig.serverUrl,
this.jobsPath this.jobsPath,
this.setCsrfTokenWeb
); );
} }