mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Reorder getSendTarget logic for clarity

Browse source
This commit is contained in:
Fedor Indutny 2025-05-20 12:40:16 -07:00 • committed by GitHub
commit 49161b7e17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 78 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ts/textsecure/WebAPI.ts
View file

@ -36,6 +36,7 @@ import { createProxyAgent } from '../util/createProxyAgent';
import type { ProxyAgent } from '../util/createProxyAgent';
import type { FetchFunctionType } from '../util/uploads/tusProtocol';
import { VerificationTransport } from '../types/VerificationTransport';
import { ZERO_ACCESS_KEY } from '../types/SealedSender';
import { toLogFormat } from '../types/errors';
import { isPackIdValid, redactPackId } from '../types/Stickers';
import type {
@ -362,7 +363,20 @@ async function _promiseAjax<Type extends ResponseType, OutputShape>(
const logType = socketManager ? '(WS)' : '(REST)';
const redactedURL = options.redactUrl ? options.redactUrl(url) : url;
const unauthLabel = options.unauthenticated ? ' (unauth)' : '';
const { accessKey, basicAuth, groupSendToken, unauthenticated } = options;
let unauthLabel = '';
if (options.unauthenticated) {
if (groupSendToken != null) {
unauthLabel = ' (unauth+gse)';
} else if (accessKey === ZERO_ACCESS_KEY) {
unauthLabel = ' (unauth+zero-key)';
} else if (accessKey != null) {
unauthLabel = ' (unauth+key)';
} else {
unauthLabel = ' (unauth)';
}
}
const logId = `${options.type} ${logType} ${redactedURL}${unauthLabel}`;
log.info(logId);
@ -375,7 +389,6 @@ async function _promiseAjax<Type extends ResponseType, OutputShape>(
fetchOptions.headers['Content-Length'] = contentLength.toString();
}
const { accessKey, basicAuth, groupSendToken, unauthenticated } = options;
if (basicAuth) {
fetchOptions.headers.Authorization = `Basic ${basicAuth}`;
} else if (unauthenticated) {