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

fix: computeApi approach loginRequired callback

This commit is contained in:
Mihajlo Medjedovic
2020-07-29 12:33:18 +02:00
parent 1a25c354fa
commit 5de84c07a8

View File

@@ -510,35 +510,45 @@ export default class SASjs {
sasjsWaitingRequest.requestPromise.promise = new Promise( sasjsWaitingRequest.requestPromise.promise = new Promise(
async (resolve, reject) => { async (resolve, reject) => {
resolve( const session = await this.checkSession();
await this.sasViyaApiClient
?.executeComputeJob( if (!session.isLoggedIn) {
sasJob, if (loginRequiredCallback) loginRequiredCallback(true);
config.contextName, sasjsWaitingRequest.requestPromise.resolve = resolve;
config.debug, sasjsWaitingRequest.requestPromise.reject = reject;
data, sasjsWaitingRequest.config = config;
accessToken this.sasjsWaitingRequests.push(sasjsWaitingRequest);
) } else {
.then((response) => { resolve(
if (!config.debug) { await this.sasViyaApiClient
this.appendSasjsRequest(null, sasJob, null); ?.executeComputeJob(
} else { sasJob,
this.appendSasjsRequest(response, sasJob, null); config.contextName,
} config.debug,
return JSON.parse(response!.result); data,
}) accessToken
.catch((e) => { )
if (e && e.status === 401) { .then((response) => {
if (loginRequiredCallback) loginRequiredCallback(true); if (!config.debug) {
sasjsWaitingRequest.requestPromise.resolve = resolve; this.appendSasjsRequest(null, sasJob, null);
sasjsWaitingRequest.requestPromise.reject = reject; } else {
sasjsWaitingRequest.config = config; this.appendSasjsRequest(response, sasJob, null);
this.sasjsWaitingRequests.push(sasjsWaitingRequest); }
} else { return JSON.parse(response!.result);
reject({ MESSAGE: e || "Job execution failed" }); })
} .catch((e) => {
}) if (e && e.status === 401) {
); if (loginRequiredCallback) loginRequiredCallback(true);
sasjsWaitingRequest.requestPromise.resolve = resolve;
sasjsWaitingRequest.requestPromise.reject = reject;
sasjsWaitingRequest.config = config;
this.sasjsWaitingRequests.push(sasjsWaitingRequest);
} else {
reject({ MESSAGE: e || "Job execution failed" });
}
})
);
}
} }
); );
return sasjsWaitingRequest.requestPromise.promise; return sasjsWaitingRequest.requestPromise.promise;