From 4acc2f74d53692f86654beab71d12299eda58da7 Mon Sep 17 00:00:00 2001
From: Erik Benton <benton@ohsu.edu>
Date: Mon, 23 Dec 2024 11:04:33 -0800
Subject: [PATCH 1/2] fix: use binary file size

---
 components/download/FolderSelector.vue | 5 +++--
 components/files/FolderViewer.vue      | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/download/FolderSelector.vue b/components/download/FolderSelector.vue
index e7f8ea6..aa17ffc 100644
--- a/components/download/FolderSelector.vue
+++ b/components/download/FolderSelector.vue
@@ -91,7 +91,7 @@ const totalBytes = computed(() =>
 
             <span v-if="folder.size" class="text-xs font-thin"
               >{{ folder.numberOfFiles }} files,
-              {{ prettyBytes(folder.size) }}</span
+              {{ prettyBytes(folder.size, { binary: true }) }}</span
             >
           </div>
         </div>
@@ -100,6 +100,7 @@ const totalBytes = computed(() =>
   </n-checkbox-group>
 
   <p v-if="hasFolderSizes">
-    Total size of selected folders: {{ prettyBytes(totalBytes) }}
+    Total size of selected folders:
+    {{ prettyBytes(totalBytes, { binary: true }) }}
   </p>
 </template>
diff --git a/components/files/FolderViewer.vue b/components/files/FolderViewer.vue
index 507c65c..c2969d7 100644
--- a/components/files/FolderViewer.vue
+++ b/components/files/FolderViewer.vue
@@ -87,7 +87,11 @@ function convertDirectory(
         },
         [
           directory.size
-            ? h("span", { class: "text-sm" }, prettyBytes(directory.size) || "")
+            ? h(
+                "span",
+                { class: "text-sm" },
+                prettyBytes(directory.size, { binary: true }) || "",
+              )
             : null,
           directory.size ? h(NDivider, { vertical: true }) : null,
           h(
@@ -242,7 +246,7 @@ const openMetadataDrawer = (currentPath: Array<string>) => {
               <n-divider v-if="drawerDetails.numberOfFiles" vertical />
 
               <p v-if="drawerDetails.size">
-                {{ prettyBytes(drawerDetails.size) }}
+                {{ prettyBytes(drawerDetails.size, { binary: true }) }}
               </p>
             </div>
           </n-flex>

From ea7441e73188d6414e261f282386fe6547a6539e Mon Sep 17 00:00:00 2001
From: Erik Benton <benton@ohsu.edu>
Date: Thu, 9 Jan 2025 07:00:43 -0800
Subject: [PATCH 2/2] feat: show token expiration date

---
 .../access/request/[requestid].vue            | 22 +++++++++++++++----
 prisma/schema.prisma                          |  1 +
 .../request/[requestid]/index.get.ts          | 14 +++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/pages/datasets/[datasetid]/access/request/[requestid].vue b/pages/datasets/[datasetid]/access/request/[requestid].vue
index 5fe2c82..4416a7f 100644
--- a/pages/datasets/[datasetid]/access/request/[requestid].vue
+++ b/pages/datasets/[datasetid]/access/request/[requestid].vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import hljs from "highlight.js/lib/core";
 import powershell from "highlight.js/lib/languages/powershell";
+import { unix } from "dayjs";
 
 definePageMeta({
   middleware: ["auth"],
@@ -25,7 +26,10 @@ const notUserDownload = user?.id !== request.user_details_id;
 const dataReady = request.status === "READY";
 const isExpired = request.status === "EXPIRED";
 
-const userKey = user?.email.replace(/[^a-zA-Z0-9]/g, "");
+const expiresAt = request.expires_at
+  ? unix(request.expires_at).format("MMM D, YYYY HH:mm Z")
+  : null;
+
 const requestSasUri = request.download_uri;
 const azcopyCommand = `azcopy copy "${requestSasUri}" "C:\\local\\path" --recursive=true`;
 
@@ -90,9 +94,19 @@ if (error.value) {
 
           <div v-else-if="dataReady">
             <p>
-              Your dataset is ready for download. Due to the number and size of
-              of the files included in typical datasets, we recommend using one
-              of the following clients:
+              Access to your dataset will expire on:
+              <strong class="text-lg font-black">{{ expiresAt }} UTC</strong>.
+            </p>
+
+            <p>
+              Please make sure to complete downloading your dataset before this
+              time. You will need to request a new dataset if you do not
+              complete the download before then.
+            </p>
+
+            <p>
+              Due to the number and size of of the files included in typical
+              datasets, we recommend using one of the following clients:
             </p>
 
             <n-tabs type="line" animated>
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index c235c79..f94f0f7 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -772,6 +772,7 @@ model download_request {
   secure_hash           String?                   @db.Char(64)
   created_at            BigInt
   updated_on            BigInt
+  expires_at            BigInt
   download_files        download_files[]
   published_dataset     published_dataset         @relation(fields: [dataset_id], references: [id], onDelete: NoAction, onUpdate: NoAction)
   download_agreement    download_agreement        @relation(fields: [download_agreement_id], references: [id], onDelete: NoAction, onUpdate: NoAction)
diff --git a/server/api/downloads/request/[requestid]/index.get.ts b/server/api/downloads/request/[requestid]/index.get.ts
index 6df8808..ffbd178 100644
--- a/server/api/downloads/request/[requestid]/index.get.ts
+++ b/server/api/downloads/request/[requestid]/index.get.ts
@@ -11,6 +11,7 @@ export default defineEventHandler(async (event) => {
       download_agreement_id: true,
       download_key: true,
       download_uri: true,
+      expires_at: true,
       status: true,
       user_details_id: true,
     },
@@ -21,7 +22,18 @@ export default defineEventHandler(async (event) => {
   });
 
   if (request) {
-    return request;
+    return {
+      id: request.id,
+      dataset_id: request.dataset_id,
+      download_agreement_id: request.download_agreement_id,
+      download_key: request.download_key,
+      download_uri: request.download_uri,
+      expires_at: request.expires_at
+        ? Number(BigInt(request.expires_at))
+        : null,
+      status: request.status,
+      user_details_id: request.user_details_id,
+    };
   } else {
     return createError({
       statusCode: 404,