From fb02c77a3ae607cb2ddda997ce429edbcd02f37c Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Wed, 29 Jul 2020 13:20:03 +0200 Subject: [PATCH] fix: login required callback --- src/SASViyaApiClient.ts | 7 ++----- src/SASjs.ts | 10 ---------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/SASViyaApiClient.ts b/src/SASViyaApiClient.ts index de4acab..4f70e00 100644 --- a/src/SASViyaApiClient.ts +++ b/src/SASViyaApiClient.ts @@ -313,6 +313,7 @@ export class SASViyaApiClient { } ).then((res: any) => res.result.items.map((i: any) => i.line).join("\n")); } + return { result: jobResult?.result, log }; // } else { // console.error( @@ -621,7 +622,6 @@ export class SASViyaApiClient { if (!this.rootFolder) { await this.populateRootFolder(accessToken); } - if (!this.rootFolder) { throw new Error("Root folder was not found"); } @@ -869,10 +869,7 @@ export class SASViyaApiClient { const rootFolder = await this.request( `${this.serverUrl}${url}`, requestInfo - ).catch((e) => { - error = e; - return null; - }); + ); this.rootFolder = rootFolder?.result || null; if (error) { diff --git a/src/SASjs.ts b/src/SASjs.ts index c3991b9..bc55b7c 100644 --- a/src/SASjs.ts +++ b/src/SASjs.ts @@ -510,15 +510,6 @@ export default class SASjs { sasjsWaitingRequest.requestPromise.promise = new Promise( async (resolve, reject) => { - const session = await this.checkSession(); - - if (!session.isLoggedIn) { - if (loginRequiredCallback) loginRequiredCallback(true); - sasjsWaitingRequest.requestPromise.resolve = resolve; - sasjsWaitingRequest.requestPromise.reject = reject; - sasjsWaitingRequest.config = config; - this.sasjsWaitingRequests.push(sasjsWaitingRequest); - } else { resolve( await this.sasViyaApiClient ?.executeComputeJob( @@ -549,7 +540,6 @@ export default class SASjs { }) ); } - } ); return sasjsWaitingRequest.requestPromise.promise; }