mirror of
https://github.com/sasjs/adapter.git
synced 2026-01-20 18:40:06 +00:00
fix: web request method - login callback handling
This commit is contained in:
@@ -47,7 +47,7 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
authConfig?: AuthConfig,
|
||||
extraResponseAttributes: ExtraResponseAttributes[] = []
|
||||
) {
|
||||
const loginCallback = loginRequiredCallback || (() => Promise.resolve())
|
||||
const loginCallback = loginRequiredCallback
|
||||
const program = isRelativePath(sasJob)
|
||||
? config.appLoc
|
||||
? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
|
||||
@@ -80,7 +80,7 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
)
|
||||
})
|
||||
|
||||
await loginCallback()
|
||||
if (loginCallback) await loginCallback()
|
||||
} else {
|
||||
reject(new ErrorResponse(e?.message, e))
|
||||
}
|
||||
@@ -221,16 +221,15 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
}
|
||||
|
||||
if (e instanceof LoginRequiredError) {
|
||||
switch (this.serverType) {
|
||||
case ServerType.Sasjs:
|
||||
if (!loginRequiredCallback) {
|
||||
reject(
|
||||
new ErrorResponse(
|
||||
'Request is not authenticated. Make sure .env file exists with valid credentials.',
|
||||
e
|
||||
)
|
||||
)
|
||||
break
|
||||
default:
|
||||
}
|
||||
|
||||
this.appendWaitingRequest(() => {
|
||||
return this.execute(
|
||||
sasJob,
|
||||
@@ -249,8 +248,7 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
)
|
||||
})
|
||||
|
||||
await loginCallback()
|
||||
}
|
||||
if (loginCallback) await loginCallback()
|
||||
} else {
|
||||
reject(new ErrorResponse(e?.message, e))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user