diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts index 23644169b90..d392606ad85 100644 --- a/ts/textsecure/WebAPI.ts +++ b/ts/textsecure/WebAPI.ts @@ -318,18 +318,17 @@ async function _promiseAjax( providedUrl: string | null, options: PromiseAjaxOptionsType ): Promise { + const { proxyUrl, socketManager } = options; + const url = providedUrl || `${options.host}/${options.path}`; + const logType = socketManager ? '(WS)' : '(REST)'; + const redactedURL = options.redactUrl ? options.redactUrl(url) : url; const unauthLabel = options.unauthenticated ? ' (unauth)' : ''; - if (options.redactUrl) { - log.info(`${options.type} ${options.redactUrl(url)}${unauthLabel}`); - } else { - log.info(`${options.type} ${url}${unauthLabel}`); - } + log.info(`${options.type} ${logType} ${redactedURL}${unauthLabel}`); const timeout = typeof options.timeout === 'number' ? options.timeout : 10000; - const { proxyUrl, socketManager } = options; const agentType = options.unauthenticated ? 'unauth' : 'auth'; const cacheKey = `${proxyUrl}-${agentType}`; @@ -430,21 +429,13 @@ async function _promiseAjax( result = await response.textConverted(); } } catch (e) { - if (options.redactUrl) { - log.error(options.type, options.redactUrl(url), 0, 'Error'); - } else { - log.error(options.type, url, 0, 'Error'); - } + log.error(options.type, logType, redactedURL, 0, 'Error'); const stack = `${e.stack}\nInitial stack:\n${options.stack}`; throw makeHTTPError('promiseAjax catch', 0, {}, e.toString(), stack); } if (!isSuccess(response.status)) { - if (options.redactUrl) { - log.info(options.type, options.redactUrl(url), response.status, 'Error'); - } else { - log.error(options.type, url, response.status, 'Error'); - } + log.error(options.type, logType, redactedURL, response.status, 'Error'); throw makeHTTPError( 'promiseAjax: error response', @@ -461,16 +452,7 @@ async function _promiseAjax( ) { if (options.validateResponse) { if (!_validateResponse(result, options.validateResponse)) { - if (options.redactUrl) { - log.info( - options.type, - options.redactUrl(url), - response.status, - 'Error' - ); - } else { - log.error(options.type, url, response.status, 'Error'); - } + log.error(options.type, logType, redactedURL, response.status, 'Error'); throw makeHTTPError( 'promiseAjax: invalid response', response.status, @@ -482,11 +464,7 @@ async function _promiseAjax( } } - if (options.redactUrl) { - log.info(options.type, options.redactUrl(url), response.status, 'Success'); - } else { - log.info(options.type, url, response.status, 'Success'); - } + log.info(options.type, logType, redactedURL, response.status, 'Success'); if (options.responseType === 'byteswithdetails') { assert(result instanceof Uint8Array, 'Expected Uint8Array result');