sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-18 17:40:06 +00:00
Code Issues Projects Releases Wiki Activity

fix: web request method - login callback handling

Browse Source
This commit is contained in:
Mihajlo Medjedovic
2022-04-26 17:37:13 +02:00
parent 936e4f8c0a
commit fc47222830
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/job-execution/WebJobExecutor.ts
View File

@@ -47,7 +47,7 @@ export class WebJobExecutor extends BaseJobExecutor {
authConfig?: AuthConfig, authConfig?: AuthConfig,
extraResponseAttributes: ExtraResponseAttributes[] = [] extraResponseAttributes: ExtraResponseAttributes[] = []
) { ) {
const loginCallback = loginRequiredCallback || (() => Promise.resolve()) const loginCallback = loginRequiredCallback
const program = isRelativePath(sasJob) const program = isRelativePath(sasJob)
? config.appLoc ? config.appLoc
? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '') ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
@@ -80,7 +80,7 @@ export class WebJobExecutor extends BaseJobExecutor {
) )
}) })
await loginCallback() if (loginCallback) await loginCallback()
} else { } else {
reject(new ErrorResponse(e?.message, e)) reject(new ErrorResponse(e?.message, e))
} }
@@ -221,16 +221,15 @@ export class WebJobExecutor extends BaseJobExecutor {
} }
if (e instanceof LoginRequiredError) { if (e instanceof LoginRequiredError) {
switch (this.serverType) { if (!loginRequiredCallback) {
case ServerType.Sasjs:
reject( reject(
new ErrorResponse( new ErrorResponse(
'Request is not authenticated. Make sure .env file exists with valid credentials.', 'Request is not authenticated. Make sure .env file exists with valid credentials.',
e e
) )
) )
break }
default:
this.appendWaitingRequest(() => { this.appendWaitingRequest(() => {
return this.execute( return this.execute(
sasJob, sasJob,
@@ -249,8 +248,7 @@ export class WebJobExecutor extends BaseJobExecutor {
) )
}) })
await loginCallback() if (loginCallback) await loginCallback()
}
} else { } else {
reject(new ErrorResponse(e?.message, e)) reject(new ErrorResponse(e?.message, e))
} }