Implement read support for CDN3
This commit is contained in:
@@ -1203,6 +1203,9 @@ export function initialize({
|
||||
if (!isString(cdnUrlObject['2'])) {
|
||||
throw new Error('WebAPI.initialize: Missing CDN 2 configuration');
|
||||
}
|
||||
if (!isString(cdnUrlObject['3'])) {
|
||||
throw new Error('WebAPI.initialize: Missing CDN 3 configuration');
|
||||
}
|
||||
if (!isString(certificateAuthority)) {
|
||||
throw new Error('WebAPI.initialize: Invalid certificateAuthority');
|
||||
}
|
||||
@@ -2655,7 +2658,7 @@ export function initialize({
|
||||
const abortController = new AbortController();
|
||||
|
||||
const cdnUrl = isNumber(cdnNumber)
|
||||
? cdnUrlObject[cdnNumber] || cdnUrlObject['0']
|
||||
? cdnUrlObject[cdnNumber] ?? cdnUrlObject['0']
|
||||
: cdnUrlObject['0'];
|
||||
// This is going to the CDN, not the service, so we use _outerAjax
|
||||
const stream = await _outerAjax(`${cdnUrl}/attachments/${cdnKey}`, {
|
||||
|
@@ -33,6 +33,7 @@ export const rendererConfigSchema = z.object({
|
||||
buildExpiration: z.number(),
|
||||
cdnUrl0: configRequiredStringSchema,
|
||||
cdnUrl2: configRequiredStringSchema,
|
||||
cdnUrl3: configRequiredStringSchema,
|
||||
challengeUrl: configRequiredStringSchema,
|
||||
certificateAuthority: configRequiredStringSchema,
|
||||
contentProxyUrl: configRequiredStringSchema,
|
||||
|
@@ -31,6 +31,7 @@ window.WebAPI = window.textsecure.WebAPI.initialize({
|
||||
cdnUrlObject: {
|
||||
0: config.cdnUrl0,
|
||||
2: config.cdnUrl2,
|
||||
3: config.cdnUrl3,
|
||||
},
|
||||
certificateAuthority: config.certificateAuthority,
|
||||
contentProxyUrl: config.contentProxyUrl,
|
||||
|
Reference in New Issue
Block a user