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

Compare commits

..

4 Commits

Author SHA1 Message Date
Allan Bowe
f27444bc52 Merge pull request #48 from sasjs/issue47
fix: login not working on non english browsers
2020-08-23 18:24:36 +02:00
Mihajlo Medjedovic
de426c9a92 fix: login not working on non english browsers 2020-08-23 18:17:35 +02:00
Allan Bowe
a006ead205 Merge pull request #46 from sasjs/issue45
fix: jobViaWeb config override
2020-08-23 17:07:47 +02:00
Mihajlo Medjedovic
422c2a1fd5 fix: jobViaWeb config override 2020-08-23 17:04:39 +02:00

View File

@@ -291,7 +291,7 @@ export default class SASjs {
public async checkSession() { public async checkSession() {
const loginResponse = await fetch(this.loginUrl.replace(".do", "")); const loginResponse = await fetch(this.loginUrl.replace(".do", ""));
const responseText = await loginResponse.text(); const responseText = await loginResponse.text();
const isLoggedIn = /You have signed in./gm.test(responseText); const isLoggedIn = /<button.+onClick.+logout/gm.test(responseText);
return Promise.resolve({ return Promise.resolve({
isLoggedIn, isLoggedIn,
@@ -730,7 +730,7 @@ export default class SASjs {
}`; }`;
const requestParams = { const requestParams = {
...this.getRequestParamsWeb(), ...this.getRequestParamsWeb(config),
}; };
const formData = new FormData(); const formData = new FormData();
@@ -941,14 +941,14 @@ export default class SASjs {
this.sasjsWaitingRequests = []; this.sasjsWaitingRequests = [];
} }
private getRequestParamsWeb(): any { private getRequestParamsWeb(config: any): any {
const requestParams: any = {}; const requestParams: any = {};
if (this.csrfTokenWeb) { if (this.csrfTokenWeb) {
requestParams["_csrf"] = this.csrfTokenWeb.value; requestParams["_csrf"] = this.csrfTokenWeb.value;
} }
if (this.sasjsConfig.debug) { if (config.debug) {
requestParams["_omittextlog"] = "false"; requestParams["_omittextlog"] = "false";
requestParams["_omitsessionresults"] = "false"; requestParams["_omitsessionresults"] = "false";