fix(download): always refresh document before download

Author: Yelinz

addon/helpers/download.js

@@ -0,0 +1,7 @@
+import { DateTime } from "luxon";
+
+export function isDownloadUrlExpired(url) {
+  const expiryRegex = /expires=([0-9]+)/;
+  const match = url.match(expiryRegex);
+  return DateTime.fromSeconds(Number(match[1])) < DateTime.now();
+}

addon/models/file.js

@@ -1,8 +1,7 @@
 import Model, { attr, belongsTo, hasMany } from "@ember-data/model";
 import { task } from "ember-concurrency";
-import { saveAs } from "file-saver";
-import { DateTime } from "luxon";
 
+import { isDownloadUrlExpired } from "ember-alexandria/helpers/download";
 import { ErrorHandler } from "ember-alexandria/helpers/error-handler";
 
 export default class FileModel extends Model {
@@ -28,28 +27,16 @@ export default class FileModel extends Model {
   @hasMany("file", { inverse: "original", async: true }) renderings;
 
   get isDownloadUrlExpired() {
-    const expiryRegex = /expires=([0-9]+)/;
-    const match = this.downloadUrl.match(expiryRegex);
-    return DateTime.fromSeconds(Number(match[1])) < DateTime.now();
+    return isDownloadUrlExpired(this.downloadUrl);
   }
 
   download = task({ drop: true }, async () => {
     try {
       if (this.isDownloadUrlExpired) {
         await this.reload();
       }
-      const extension = this.name.includes(".")
-        ? `.${this.name.split(".").slice(-1)[0]}`
-        : "";
-      const documentTitle = this.document.get("title");
-      const fileName = documentTitle.endsWith(extension)
-        ? documentTitle
-        : documentTitle + extension;
-
-      // keep in mind that for the filename to be considered, the request needs
-      // to be same-origin (i.e. object storage needs to be deployed with a proxy)
-      // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a?retiredLocale=de#attributes
-      saveAs(this.downloadUrl, fileName);
+
+      open(this.downloadUrl);
     } catch (error) {
       new ErrorHandler(this, error).notify("alexandria.errors.save-file");
     }

addon/services/alexandria-documents.js

@@ -151,18 +151,16 @@ export default class AlexandriaDocumentsService extends Service {
     try {
       if (documents.length === 1) {
         const doc = documents[0];
+        await doc.reload(); // always reload the document to get the latest file (webdav)
+        await doc.latestFile.promise;
         const file = doc.latestFile.value;
-        await file.download.perform();
-        return;
+        return await file.download.perform();
       }
 
       // If we want to save a zip of files we need to do some more stuff
       // Compile an array of original file PKs
       const originalFilePKs = encodeURIComponent(
-        documents
-          .map((doc) => doc.files.find((file) => file.variant === "original"))
-          .map((f) => f.id)
-          .join(","),
+        documents.map((doc) => doc.latestFile.value.id).join(","),
       );
 
       let url = this.config?.zipDownloadHost || ""; // in case we need to send the zipDownload to another URL

tests/unit/services/alexandria-documents-test.js

@@ -1,8 +1,6 @@
 import { setupTest } from "dummy/tests/helpers";
 import { setupMirage } from "ember-cli-mirage/test-support";
-import * as fileSaver from "file-saver";
 import { module, test } from "qunit";
-import { stub } from "sinon";
 
 module("Unit | Service | alexandria-documents", function (hooks) {
   setupTest(hooks);
@@ -71,7 +69,6 @@ module("Unit | Service | alexandria-documents", function (hooks) {
   test("it downloads documents", async function (assert) {
     const service = this.owner.lookup("service:alexandria-documents");
     const store = this.owner.lookup("service:store");
-    const fileSaverStub = stub(fileSaver, "saveAs");
 
     const document = this.server.create("document");
     const file = this.server.create("file", {
@@ -85,7 +82,12 @@ module("Unit | Service | alexandria-documents", function (hooks) {
     documentModel.latestFile = { value: fileModel };
     await service.download.perform([documentModel]);
 
-    assert.strictEqual(fileSaverStub.args[0][0], file.downloadUrl);
-    assert.strictEqual(fileSaverStub.args[0][1], document.title.en);
+    const requests = this.server.pretender.handledRequests;
+
+    assert.strictEqual(requests.length, 4);
+    assert.ok(requests[0].url.includes("documents"));
+    assert.ok(requests[1].url.includes("files"));
+    assert.ok(requests[2].url.includes("documents"));
+    assert.ok(requests[3].url.includes("files"));
   });
 });