Don't use baseUrl for requesting blob access tokens for files

Co-authored-by: paw <[email protected]>
tutao · Dec 20, 2024 · b326849 · b326849
1 parent 46c805b
commit b326849
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/common/api/worker/facades/lazy/MailExportFacade.ts b/src/common/api/worker/facades/lazy/MailExportFacade.ts
@@ -57,13 +57,12 @@ export class MailExportFacade {
 		return this.mailExportTokenFacade.loadWithToken((token) => this.bulkMailLoader.loadAttachments(mails, { baseUrl, ...this.options(token) }))
 	}
 
-	async loadAttachmentData(mail: Mail, attachments: readonly TutanotaFile[], baseUrl: string): Promise<DataFile[]> {
+	async loadAttachmentData(mail: Mail, attachments: readonly TutanotaFile[]): Promise<DataFile[]> {
 		const attachmentsWithKeys = await this.cryptoFacade.enforceSessionKeyUpdateIfNeeded(mail, attachments)
 
 		const downloads = await this.mailExportTokenFacade.loadWithToken((token) => {
 			const referencingInstances = attachmentsWithKeys.map(createReferencingInstance)
 			return this.blobFacade.downloadAndDecryptBlobsOfMultipleInstances(ArchiveDataType.Attachments, referencingInstances, {
-				baseUrl,
 				...this.options(token),
 			})
 		})

diff --git a/src/mail-app/native/main/MailExportController.ts b/src/mail-app/native/main/MailExportController.ts
@@ -39,7 +39,7 @@ export class MailExportController {
 	private _state: Stream<MailExportState> = stream({ type: "idle" })
 	private _lastExport: Date | null = null
 	private servers?: BlobServerUrl[]
-	private serverCount: number = 0
+	private serverIndex: number = 0
 
 	get lastExport(): Date | null {
 		return this._lastExport
@@ -181,7 +181,7 @@ export class MailExportController {
 					const mailAttachmentInfo = mail.attachments
 						.map((attachmentId) => attachmentInfo.find((attachment) => isSameId(attachment._id, attachmentId)))
 						.filter(isNotNull)
-					const attachments = await this.mailExportFacade.loadAttachmentData(mail, mailAttachmentInfo, this.getServerUrl())
+					const attachments = await this.mailExportFacade.loadAttachmentData(mail, mailAttachmentInfo)
 					const { makeMailBundle } = await import("../../mail/export/Bundler.js")
 					const mailBundle = makeMailBundle(this.sanitizer, mail, mailDetails, attachments)
 
@@ -228,11 +228,11 @@ export class MailExportController {
 
 	private getServerUrl(): string {
 		if (this.servers) {
-			this.serverCount += 1
-			if (this.serverCount >= this.servers.length) {
-				this.serverCount = 0
+			this.serverIndex += 1
+			if (this.serverIndex >= this.servers.length) {
+				this.serverIndex = 0
 			}
-			return this.servers[this.serverCount].url
+			return this.servers[this.serverIndex].url
 		}
 		throw new Error("No servers")
 	}