@sonisoft/now-sdk-ext-core 6.6.3 → 6.8.0

package/dist/comm/http/FormRecordWriter.js

@@ -0,0 +1,385 @@
+import { isPolicyRefusal } from "../../policy/PolicyRefusal.js";
+import { InvalidParameterException } from "../../exception/InvalidParameterException.js";
+import { FormSubmitError } from "../../exception/FormSubmitError.js";
+import { READ_ONLY } from "../../policy/PolicyTypes.js";
+import { Logger } from "../../util/Logger.js";
+import { redactMessage, stripSecretsFromError } from "../../util/redact.js";
+import { parseFormHtml, parseFormMessages, parseFormResponse } from "./FormHtmlParser.js";
+import { SessionManager } from "./SessionManager.js";
+const NAME = /^[a-z0-9_]+$/i;
+const SYS_ID = /^[0-9a-f]{32}$/i;
+/** Where a successful submit lands. Small, and it echoes back the action and sys_id. */
+const GOTO_URL = "modal_dialog_form_response.do?sysparm_returned_action=$action&sysparm_returned_sysid=$sys_id";
+/**
+ * Writes a record through its classic UI form (`/<table>.do`), exactly as a browser does:
+ * load the form, then submit it with the form's tokens.
+ *
+ * This is a low-level tool for writing directly to an instance when the record is NOT
+ * authored in a now-sdk application. Its reason to exist is variable-backed records
+ * (any table with a glide_var column, e.g. `wf_activity.vars`): the form submit is the
+ * path that writes their `sys_variable_value` rows, where REST writes to that table run
+ * into ACLs. Records that belong in a now-sdk app (ATF tests, flows, …) should be
+ * authored there instead.
+ *
+ * Why two requests: a new record's form carries values that are not form inputs —
+ * anything set through `sysparm_query` at load time, such as the record's variable
+ * model — inside the signed `sysparm_encoded_record`. A submit without it inserts the
+ * record but silently drops every variable.
+ *
+ * Only the values you pass are posted. The instance fills in everything else the same
+ * way the form would: variable defaults on insert, current values on update.
+ */
+class FormTransport {
+    _logger = new Logger("FormRecordWriter");
+    _instance;
+    constructor(instance) {
+        this._instance = instance;
+    }
+    /**
+     * Load a record's form.
+     *
+     * @param table Table name
+     * @param sysId Record sys_id, or `-1` for a new record
+     * @param options View and, for new records, the initial query
+     * @throws Error when the page is not the expected form, or the record does not exist
+     */
+    async loadForm(table, sysId = "-1", options = {}) {
+        this.requireTable(table);
+        if (sysId !== "-1" && !SYS_ID.test(sysId)) {
+            throw new InvalidParameterException("sysId must be -1 or a 32-character sys_id");
+        }
+        const query = { ...options.query, sys_id: sysId };
+        if (options.view)
+            query.sysparm_view = options.view;
+        if (options.initialQuery)
+            query.sysparm_query = options.initialQuery;
+        try {
+            const response = await this.request().get({
+                method: "GET", path: `/${table}.do`, headers: null, body: null, query,
+                requires: READ_ONLY, responseFormat: "text", sensitive: options.sensitive,
+                ...(options.sensitive ? { redirect: "manual" } : {}),
+            });
+            const snapshot = parseFormHtml(this.text(response.data), table, options);
+            if (sysId !== "-1" && (snapshot.isNewRecord || snapshot.sysId !== sysId)) {
+                throw new Error(`Record ${table}/${sysId} was not found or is not readable`);
+            }
+            return snapshot;
+        }
+        catch (error) {
+            if (options.sensitive && !isPolicyRefusal(error) && !(error instanceof FormSubmitError)) {
+                const code = error instanceof Error && ["csrf_token_unavailable", "csrf_rejected"].includes(error.message) ? error.message : "Form request failed";
+                throw new Error(code);
+            }
+            throw this.sanitizeError(error);
+        }
+    }
+    /**
+     * Submit a form you already loaded. Use this to inspect the form's variables (names,
+     * types, choices) before deciding what to write.
+     */
+    async submit(snapshot, action, options = {}) {
+        const table = snapshot.table;
+        let posted;
+        try {
+            posted = this.buildFields(snapshot, options);
+        }
+        catch (error) {
+            if (options.sensitive)
+                throw new InvalidParameterException("Invalid form field or variable value");
+            throw error;
+        }
+        try {
+            const session = (await this.request().getUserSession());
+            if (options.tokenSource === "page" ? !snapshot.pageToken : !session?.userToken) {
+                throw new Error("An authenticated ServiceNow session token is required to submit a form");
+            }
+            const fields = {
+                ...(options.postAllRenderedInputs ? snapshot.renderedInputs : {}),
+                sys_target: table,
+                sys_uniqueName: "sys_id",
+                sys_uniqueValue: snapshot.sysId,
+                sys_row: snapshot.isNewRecord ? "-1" : "0",
+                sys_modCount: snapshot.modCount,
+                onLoad_sys_updated_on: snapshot.updatedOn,
+                sys_action: options.actionValue ?? snapshot.actions[action] ?? action,
+                sysparm_ck: options.tokenSource === "page" ? snapshot.pageToken : session.userToken,
+                sysparm_encoded_record: snapshot.encodedRecord,
+                sysparm_goto_url: GOTO_URL,
+                isFormPage: "true",
+                ...(options.view ? { sysparm_view: options.view } : {}),
+                ...posted,
+                ...options.extraFields,
+            };
+            this._logger.info(`Submitting ${action} for ${table}/${snapshot.sysId}`);
+            const response = await this.request().post({
+                method: "POST", path: `/${table}.do`, headers: null, query: null, body: null,
+                fields, responseFormat: "text", redirect: options.redirect, sensitive: options.sensitive,
+            });
+            if (options.landing === "guarded") {
+                return await this.guardedLanding(snapshot, action, response.status, response.headers, this.text(response.data), fields);
+            }
+            const html = this.text(response.data);
+            const accepted = parseFormResponse(html);
+            const messages = parseFormMessages(html);
+            if (!accepted || accepted.action !== action) {
+                throw new FormSubmitError(table, `The ${table} form submit was not accepted`, messages.errors);
+            }
+            return { sysId: accepted.sysId, action, messages: messages.info };
+        }
+        catch (error) {
+            if (options.sensitive && !isPolicyRefusal(error) && !(error instanceof FormSubmitError)) {
+                const code = error instanceof Error && ["csrf_token_unavailable", "csrf_rejected"].includes(error.message) ? error.message : "Form request failed";
+                throw new Error(code);
+            }
+            throw this.sanitizeError(error);
+        }
+    }
+    /** Validate caller values without submitting the form. */
+    validate(snapshot, options) {
+        try {
+            this.buildFields(snapshot, options);
+        }
+        catch {
+            throw new InvalidParameterException("Invalid form field or variable value");
+        }
+    }
+    /**
+     * Turn caller values into posted form parameters, validating variables against the
+     * form so a misspelt element fails loudly instead of being silently ignored.
+     */
+    buildFields(snapshot, options) {
+        const table = snapshot.table;
+        const out = {};
+        for (const [field, value] of Object.entries(options.fields ?? {})) {
+            if (!NAME.test(field))
+                throw new InvalidParameterException(`Invalid field name '${field}'`);
+            const name = `${table}.${field}`;
+            out[name] = encodeFormValue(value, snapshot.fields[name]);
+        }
+        const values = Object.entries(options.variables ?? {});
+        if (values.length) {
+            const available = this.variablesFor(snapshot, options.variableField);
+            for (const [element, value] of values) {
+                const control = available[element];
+                if (!control) {
+                    const known = Object.keys(available).sort().join(", ") || "(none)";
+                    throw new InvalidParameterException(`Unknown variable '${element}' on the ${table} form. Available: ${known}`);
+                }
+                out[control.name] = encodeFormValue(value, control);
+            }
+        }
+        return out;
+    }
+    variablesFor(snapshot, field) {
+        const all = Object.values(snapshot.variables);
+        const columns = [...new Set(all.map(v => v.field))];
+        if (!columns.length) {
+            throw new InvalidParameterException(`The ${snapshot.table} form has no variables`);
+        }
+        const column = field ?? (columns.length === 1 ? columns[0] : undefined);
+        if (!column || !columns.includes(column)) {
+            throw new InvalidParameterException(`Specify variableField for the ${snapshot.table} form; it has variables on: ${columns.join(", ")}`);
+        }
+        return Object.fromEntries(all.filter(v => v.field === column).map(v => [v.element, v]));
+    }
+    async requireExists(table, sysId) {
+        const read = () => this.request().get({
+            method: "GET", path: `/api/now/table/${table}`, headers: { Accept: "application/json" }, body: null,
+            query: { sysparm_query: `sys_id=${sysId}`, sysparm_fields: "sys_id", sysparm_limit: "1" },
+        });
+        let response = await read();
+        // 202: the instance queued the request behind others in this session; ask again.
+        for (let attempt = 1; response?.status === 202 && attempt <= 3; attempt++) {
+            await new Promise(resolve => setTimeout(resolve, 500 * attempt));
+            response = await read();
+        }
+        if (response?.status !== 200) {
+            // The insert was reported; only the check failed. Say so, so nobody inserts again.
+            throw new FormSubmitError(table, `The ${table} form reported inserting record ${sysId}, `
+                + `but checking that it exists failed (status ${response?.status ?? "unknown"})`);
+        }
+        if (!response.bodyObject?.result?.length) {
+            throw new FormSubmitError(table, `The ${table} form reported an insert, but record ${sysId} does not exist`);
+        }
+    }
+    async guardedLanding(snapshot, action, status, headers, html, fields) {
+        const session = await this.request().getUserSession();
+        const withheld = new Set([...Object.values(fields), session.userToken ?? "",
+            ...(session.cookie?.getCookiesSync(String(session.instanceUrl)) ?? []).map(cookie => cookie.value)]);
+        for (const value of [...withheld])
+            for (const line of value.split(/[\r\n]+/))
+                if (line)
+                    withheld.add(line);
+        const clean = (text) => {
+            text = text.replace(/\s+/g, " ").trim();
+            for (const value of [...withheld].filter(Boolean).sort((a, b) => b.length - a.length)) {
+                text = text.split(value.replace(/\s+/g, " ").trim()).join("[redacted]");
+                text = text.split(encodeURIComponent(value)).join("[redacted]");
+            }
+            text = redactMessage(text).replace(/https?:\/\/\S+/g, "[url]").replace(/[A-Za-z0-9_+/=.-]{24,}/g, "[redacted]");
+            return /(?:Class\.create|\.prototype|function\s*\(|[{};]|<script)/i.test(text)
+                ? "[message withheld: script content]" : text.slice(0, 200);
+        };
+        const messages = parseFormMessages(html);
+        const location = headers.location ?? headers.Location;
+        if (status >= 300 && status < 400 && location) {
+            const origin = new URL(String(session.instanceUrl));
+            const url = new URL(location, origin);
+            if (url.pathname === "/security_interceptor.do")
+                throw new Error("csrf_rejected");
+            const allowed = new Set(["sys_id", "sysparm_transaction_scope", "sysparm_isdevstudio", "sysparm_nameofstack", "sysparm_view", "sysparm_referring_url"]);
+            const unexpectedDestination = url.origin !== origin.origin || url.username || url.password || url.hash ||
+                url.pathname !== `/${snapshot.table}.do`;
+            const parameters = [...url.searchParams.keys()];
+            const unexpectedParameters = parameters.some(key => !allowed.has(key) || url.searchParams.getAll(key).length !== 1);
+            const unexpectedScope = url.searchParams.has("sysparm_transaction_scope") &&
+                url.searchParams.get("sysparm_transaction_scope") !== fields.sysparm_transaction_scope;
+            const unexpectedRecord = !url.searchParams.has("sys_id") ||
+                ![snapshot.sysId, "-1"].includes(url.searchParams.get("sys_id"));
+            if (unexpectedDestination || unexpectedParameters || unexpectedScope || unexpectedRecord) {
+                throw new FormSubmitError(snapshot.table, "Unexpected form redirect");
+            }
+            const landing = await this.request().get({ path: url.pathname,
+                query: Object.fromEntries(url.searchParams), headers: null, body: null,
+                requires: READ_ONLY, responseFormat: "text", sensitive: true, redirect: "manual" });
+            if (landing.status >= 300)
+                throw new FormSubmitError(snapshot.table, "Unexpected landing redirect");
+            const parsed = parseFormMessages(this.text(landing.data));
+            messages.errors.push(...parsed.errors);
+            messages.info.push(...parsed.info);
+        }
+        return { sysId: snapshot.sysId, action, messages: messages.info.map(clean), errors: messages.errors.map(clean) };
+    }
+    request() {
+        // One session for the form load, the submit and the follow-up read: the submit's
+        // token must belong to the session that loaded the form.
+        return SessionManager.getInstance().getRequest(this._instance);
+    }
+    requireTable(table) {
+        if (!table || !NAME.test(table))
+            throw new InvalidParameterException("A valid table name is required");
+    }
+    text(data) {
+        return typeof data === "string" ? data : "";
+    }
+    sanitizeError(error) {
+        if (error instanceof Error)
+            error.message = redactMessage(error.message);
+        return stripSecretsFromError(error);
+    }
+}
+/** Shared internal transport. Excluded from the package barrel. */
+export function createFormTransport(instance) {
+    return new FormTransport(instance);
+}
+/** Write ordinary records through classic forms with the established defaults. */
+export class FormRecordWriter {
+    _transport;
+    constructor(instance) { this._transport = createFormTransport(instance); }
+    loadForm(table, sysId = "-1", options = {}) {
+        return this._transport.loadForm(table, sysId, options);
+    }
+    /**
+     * Insert a record through its form.
+     *
+     * @param table Table name
+     * @param options Field values, variable values, view and initial query
+     * @returns The new record's sys_id and any info messages
+     * @throws InvalidParameterException for unknown variables or invalid choice values
+     * @throws FormSubmitError when the instance does not accept the submit
+     */
+    async insert(table, options = {}) {
+        const snapshot = await this.loadForm(table, "-1", options);
+        const result = await this.submit(snapshot, "sysverb_insert", options);
+        await this._transport.requireExists(table, result.sysId);
+        return result;
+    }
+    /**
+     * Update a record through its form. Fields and variables you do not pass keep their
+     * current values.
+     *
+     * @param table Table name
+     * @param sysId Record sys_id
+     * @param options Field values, variable values and view
+     * @throws InvalidParameterException for unknown variables or invalid choice values
+     * @throws FormSubmitError when the instance does not accept the submit
+     */
+    async update(table, sysId, options = {}) {
+        if (!SYS_ID.test(sysId ?? ""))
+            throw new InvalidParameterException("sysId must be a 32-character sys_id");
+        const snapshot = await this.loadForm(table, sysId, { view: options.view });
+        return await this.submit(snapshot, "sysverb_update", options);
+    }
+    async submit(snapshot, action, options = {}) {
+        return await this._transport.submit(snapshot, action, options);
+    }
+}
+/**
+ * Encode a caller value the way the form posts it.
+ *
+ * @param value The caller's value
+ * @param control The form control it is going to, when known (drives duration and choice handling)
+ */
+export function encodeFormValue(value, control) {
+    if (value === null || value === undefined)
+        return "";
+    if (Array.isArray(value))
+        return value.join(",");
+    if (typeof value === "boolean")
+        return value ? "true" : "false";
+    if (control?.type === "glide_duration")
+        return encodeDuration(value);
+    if (typeof value === "object") {
+        throw new InvalidParameterException(`An object value is only valid for a duration field (${control?.name ?? "unknown field"})`);
+    }
+    const text = String(value);
+    if (control?.choices?.length)
+        return resolveChoice(text, control);
+    return text;
+}
+/**
+ * Durations post in the form's display format, `D HH:MM:SS`. The stored format
+ * (`1970-01-03 01:02:03`) and plain seconds are not understood by the form, so both are
+ * converted here.
+ */
+export function encodeDuration(value) {
+    let total;
+    if (typeof value === "number") {
+        total = value;
+    }
+    else if (typeof value === "object") {
+        total = ((value.days ?? 0) * 86400) + ((value.hours ?? 0) * 3600) + ((value.minutes ?? 0) * 60) + (value.seconds ?? 0);
+    }
+    else {
+        const text = value.trim();
+        if (text === "")
+            return "";
+        const stored = /^1970-01-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/.exec(text);
+        if (stored) {
+            total = ((Number(stored[1]) - 1) * 86400) + (Number(stored[2]) * 3600) + (Number(stored[3]) * 60) + Number(stored[4]);
+        }
+        else if (/^\d+$/.test(text)) {
+            total = Number(text);
+        }
+        else {
+            return text;
+        }
+    }
+    if (!Number.isFinite(total) || total < 0)
+        throw new InvalidParameterException(`Invalid duration: ${JSON.stringify(value)}`);
+    total = Math.floor(total);
+    const days = Math.floor(total / 86400);
+    const pad = (n) => String(n).padStart(2, "0");
+    return `${days} ${pad(Math.floor((total % 86400) / 3600))}:${pad(Math.floor((total % 3600) / 60))}:${pad(total % 60)}`;
+}
+function resolveChoice(text, control) {
+    const choices = control.choices;
+    if (choices.some(c => c.value === text))
+        return text;
+    const byLabel = choices.find(c => c.label.toLowerCase() === text.toLowerCase());
+    if (byLabel)
+        return byLabel.value;
+    const allowed = choices.map(c => (c.value === "" ? `'' (${c.label})` : c.value)).join(", ");
+    throw new InvalidParameterException(`'${text}' is not a choice for ${control.name}. Allowed: ${allowed}`);
+}
+//# sourceMappingURL=FormRecordWriter.js.map

package/dist/comm/http/FormRecordWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FormRecordWriter.js","sourceRoot":"","sources":["../../../src/comm/http/FormRecordWriter.ts"],"names":[],"mappings":"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"}

package/dist/comm/http/HTTPRequest.d.ts

@@ -9,6 +9,10 @@ export interface HTTPRequest {
     json?: object | null;
     /** Keep successful HTML/XML responses as text without attempting JSON parsing. */
     responseFormat?: "json" | "text";
+    /** Opt in to returning redirects to the caller. Defaults to fetch's follow behavior. */
+    redirect?: "follow" | "manual";
+    /** Exclude payloads, query values and raw errors from request diagnostics. */
+    sensitive?: boolean;
     /**
      * What permission this request needs, when the HTTP verb would get it wrong.
      *

package/dist/comm/http/RequestHandler.d.ts

@@ -67,5 +67,6 @@ export declare class RequestHandler implements IRequestHandler {
     get<T>(request: HTTPRequest): Promise<IHttpResponse<T>>;
     delete<T>(request: HTTPRequest): Promise<IHttpResponse<T>>;
     private getRequestConfig;
+    private diagnostic;
     private getQueryString;
 }

package/dist/comm/http/RequestHandler.js

@@ -5,7 +5,7 @@ import { DOMParser } from '@xmldom/xmldom';
 import { StaleInstanceError } from '../../exception/StaleInstanceError.js';
 import { stripSecretsFromError, redactValue } from '../../util/redact.js';
 import { checkRequirement } from '../../policy/Policy.js';
-import { policyRefusal } from '../../policy/PolicyRefusal.js';
+import { isPolicyRefusal, policyRefusal } from '../../policy/PolicyRefusal.js';
 import { classify } from '../../policy/internal/Classify.js';
 import { SessionAuthError } from '../../auth/SessionAuthError.js';
 //axios.defaults.withCredentials = true;
@@ -76,7 +76,10 @@ export class RequestHandler {
      * are stripped first, because the consumer's logger has no redaction format of its
      * own.
      */
-    toThrowable(ex) {
+    toThrowable(ex, request) {
+        if (request?.sensitive && !isPolicyRefusal(ex) && !(ex instanceof SessionAuthError) && !(ex instanceof StaleInstanceError)) {
+            return new Error("Sensitive request failed; no payload diagnostics retained");
+        }
         if (ex instanceof Error) {
             return stripSecretsFromError(ex);
         }
@@ -183,7 +186,7 @@ export class RequestHandler {
     async doRequest(request, retried = false) {
         let response = null;
         const { config } = await this.getRequestConfig(request);
-        this._logger.debug("Retrieved Configuration", { config: config });
+        this._logger.debug("Retrieved Configuration", this.diagnostic(request, { config: config }));
         //const { auth, path, params, fields, json, headers: baseHeaders, ...rest } = opts;
         // let opts = {
         //     auth: this._session,
@@ -205,17 +208,19 @@ export class RequestHandler {
             this._authHandler.pinSession?.();
         }
         let responseBodyString = null;
-        if (!resp.ok) {
+        if (!resp.ok && !(request.redirect === "manual" && resp.status >= 300 && resp.status < 400)) {
             try {
                 responseBodyString = await resp.text();
             }
             catch (e) {
                 responseBodyString = null;
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                this._logger.error("Error parsing response body.", { error: e });
+                this._logger.error("Error parsing response body.", this.diagnostic(request, { error: e }, resp.status));
             }
-            this._logger.error("Error during request.", { error: resp, request: request });
-            this._logger.error("Response Details:", { body: responseBodyString, status: resp.status });
+            this._logger.error("Error during request.", this.diagnostic(request, { error: resp, request: request }, resp.status));
+            this._logger.error("Response Details:", this.diagnostic(request, { body: responseBodyString, status: resp.status }, resp.status));
+            if (request.sensitive)
+                throw new Error(`Request failed with status ${resp.status}`);
             throw new Error("Error during request. Status: " + resp.status + " Body: " + (responseBodyString !== null ? responseBodyString : "[no response body]"));
         }
         else {
@@ -225,7 +230,7 @@ export class RequestHandler {
             catch (e) {
                 responseBodyString = null;
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                this._logger.error("Error parsing response body.", { error: e });
+                this._logger.error("Error parsing response body.", this.diagnostic(request, { error: e }, resp.status));
             }
         }
         // let responseBodyReader = resp.body.getReader();
@@ -276,7 +281,7 @@ export class RequestHandler {
         const response = null;
         try {
             const response = await this.doRequest(request);
-            this._logger.debug("Http SN POST Response Received", response);
+            this._logger.debug("Http SN POST Response Received", this.diagnostic(request, response, response.status));
             try {
                 if (!((response.data) instanceof String)) {
                     const rpObj = response.data;
@@ -284,13 +289,13 @@ export class RequestHandler {
                 }
             }
             catch (ex) {
-                this._logger.error("Error setting response.bodyObject.", { error: ex, response: response, request: request });
+                this._logger.error("Error setting response.bodyObject.", this.diagnostic(request, { error: ex, response: response, request: request }));
             }
             return response;
         }
         catch (ex) {
-            this._logger.error("Error during POST request.", { error: ex, response: response, request: request });
-            throw this.toThrowable(ex);
+            this._logger.error("Error during POST request.", this.diagnostic(request, { error: ex, response: response, request: request }));
+            throw this.toThrowable(ex, request);
         }
     }
     async put(request) {
@@ -298,7 +303,7 @@ export class RequestHandler {
         const response = null;
         try {
             const response = await this.doRequest(request);
-            this._logger.debug("Http PUT Response Received", response);
+            this._logger.debug("Http PUT Response Received", this.diagnostic(request, response, response.status));
             try {
                 if (!((response.data) instanceof String)) {
                     const rpObj = response.data;
@@ -311,8 +316,8 @@ export class RequestHandler {
             return response;
         }
         catch (ex) {
-            this._logger.error("Error during PUT request.", { error: ex, response: response, request: request });
-            throw this.toThrowable(ex);
+            this._logger.error("Error during PUT request.", this.diagnostic(request, { error: ex, response: response, request: request }));
+            throw this.toThrowable(ex, request);
         }
     }
     async get(request) {
@@ -320,7 +325,7 @@ export class RequestHandler {
         const response = null;
         try {
             const response = await this.doRequest(request);
-            this._logger.debug("Http SN GET Response Received", response);
+            this._logger.debug("Http SN GET Response Received", this.diagnostic(request, response, response.status));
             try {
                 if (!((response.data) instanceof String)) {
                     const rpObj = response.data;
@@ -328,13 +333,13 @@ export class RequestHandler {
                 }
             }
             catch (ex) {
-                this._logger.error("Error setting response.bodyObject.", { error: ex, response: response, request: request });
+                this._logger.error("Error setting response.bodyObject.", this.diagnostic(request, { error: ex, response: response, request: request }));
             }
             return response;
         }
         catch (ex) {
-            this._logger.error("Error during GET request.", { error: ex, response: response, request: request });
-            throw this.toThrowable(ex);
+            this._logger.error("Error during GET request.", this.diagnostic(request, { error: ex, response: response, request: request }));
+            throw this.toThrowable(ex, request);
         }
     }
     async delete(request) {
@@ -349,13 +354,13 @@ export class RequestHandler {
                 }
             }
             catch (ex) {
-                this._logger.error("Error setting response.bodyObject.", { error: ex, response: response, request: request });
+                this._logger.error("Error setting response.bodyObject.", this.diagnostic(request, { error: ex, response: response, request: request }));
             }
             return response;
         }
         catch (ex) {
-            this._logger.error("Error during DELETE request.", { error: ex, response: response, request: request });
-            throw this.toThrowable(ex);
+            this._logger.error("Error during DELETE request.", this.diagnostic(request, { error: ex, response: response, request: request }));
+            throw this.toThrowable(ex, request);
         }
     }
     async getRequestConfig(request) {
@@ -386,8 +391,15 @@ export class RequestHandler {
         config.headers = request.headers;
         config.path = request.path;
         config.method = request.method;
+        if (request.redirect)
+            config.redirect = request.redirect;
         return { config: config };
     }
+    diagnostic(request, legacy, status) {
+        return request.sensitive
+            ? { method: request.method, path: request.path.split("?")[0], status }
+            : legacy;
+    }
     getQueryString(queryObj) {
         const params = new URLSearchParams();
         for (const prop in queryObj) {