@cirrobio/sdk 0.2.6 → 0.2.8

package/dist/file/file.service.d.ts

@@ -1,7 +1,7 @@
 import { AWSCredentials, FileApi } from "@cirrobio/api-client";
 import { ProjectFileAccessContext } from "./project-access-context";
 import { DownloadableFile } from "./file-object.model";
-import { GetSignedUrlOptions, GetFileUrlParams } from "./actions/sign-url.fn";
+import { GetFileUrlParams, GetSignedUrlOptions } from "./actions/sign-url.fn";
 /**
  * Service for viewing files in Cirro
  *  currently this only operates on files within a project

package/dist/file/file.service.js

@@ -50,22 +50,28 @@ class FileService {
      * Get credentials for accessing a project file
      */
     async getProjectAccessCredentials(fileAccessContext) {
+        const accessType = fileAccessContext.fileAccessRequest.accessType;
         // Special case for project download, since we can cache the credentials
-        if (fileAccessContext.fileAccessRequest.accessType === api_client_1.AccessType.ProjectDownload) {
+        if (accessType === api_client_1.AccessType.ProjectDownload || accessType === api_client_1.AccessType.SharedDatasetDownload) {
             return this.getProjectReadCredentials(fileAccessContext);
         }
         return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, fileAccessRequest: fileAccessContext.fileAccessRequest });
     }
     async getProjectReadCredentials(fileAccessContext) {
         const projectId = fileAccessContext.project.id;
+        // Append datasetId to cache key for shared dataset downloads since we need to generate a new token for each dataset
+        let cacheKey = projectId;
+        if (fileAccessContext.fileAccessRequest.accessType === api_client_1.AccessType.SharedDatasetDownload) {
+            cacheKey = `${projectId}-${fileAccessContext.fileAccessRequest.datasetId}`;
+        }
         return credentials_mutex_so_1.credentialsMutex.dispatch(async () => {
-            const cachedCredentials = credentials_mutex_so_1.credentialsCache.get(projectId);
+            const cachedCredentials = credentials_mutex_so_1.credentialsCache.get(cacheKey);
             const expirationTime = cachedCredentials ? cachedCredentials === null || cachedCredentials === void 0 ? void 0 : cachedCredentials.expiration : null;
             const fetchNewCredentials = !expirationTime || expirationTime < new Date();
             if (fetchNewCredentials) {
                 const fileAccessRequest = fileAccessContext.fileAccessRequest;
                 const credentials = await this.fileApi.generateProjectFileAccessToken({ projectId, fileAccessRequest });
-                credentials_mutex_so_1.credentialsCache.set(projectId, credentials);
+                credentials_mutex_so_1.credentialsCache.set(cacheKey, credentials);
                 return credentials;
             }
             return cachedCredentials;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cirrobio/sdk",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "SDK for Cirro",
   "author": "CirroBio",
   "repository": {

package/src/file/file.service.ts

@@ -2,7 +2,7 @@ import { AccessType, AWSCredentials, FileApi } from "@cirrobio/api-client";
 import { ProjectFileAccessContext } from "./project-access-context";
 import { DownloadableFile } from "./file-object.model";
 import { credentialsCache, credentialsMutex } from "./util/credentials-mutex.so";
-import { GetSignedUrlOptions, GetFileUrlParams, getSignedUrl } from "./actions/sign-url.fn";
+import { GetFileUrlParams, getSignedUrl, GetSignedUrlOptions } from "./actions/sign-url.fn";
 import { getProjectS3Bucket } from "./shared";
 
 /**
@@ -54,8 +54,9 @@ export class FileService {
    * Get credentials for accessing a project file
    */
   async getProjectAccessCredentials(fileAccessContext: ProjectFileAccessContext): Promise<AWSCredentials> {
+    const accessType = fileAccessContext.fileAccessRequest.accessType;
     // Special case for project download, since we can cache the credentials
-    if (fileAccessContext.fileAccessRequest.accessType === AccessType.ProjectDownload) {
+    if (accessType === AccessType.ProjectDownload || accessType === AccessType.SharedDatasetDownload) {
       return this.getProjectReadCredentials(fileAccessContext);
     }
     return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, fileAccessRequest: fileAccessContext.fileAccessRequest });
@@ -63,14 +64,20 @@ export class FileService {
 
   private async getProjectReadCredentials(fileAccessContext: ProjectFileAccessContext): Promise<AWSCredentials> {
     const projectId = fileAccessContext.project.id;
+    // Append datasetId to cache key for shared dataset downloads since we need to generate a new token for each dataset
+    let cacheKey = projectId;
+    if (fileAccessContext.fileAccessRequest.accessType === AccessType.SharedDatasetDownload) {
+      cacheKey = `${projectId}-${fileAccessContext.fileAccessRequest.datasetId}`;
+    }
+
     return credentialsMutex.dispatch(async () => {
-      const cachedCredentials = credentialsCache.get(projectId);
+      const cachedCredentials = credentialsCache.get(cacheKey);
       const expirationTime = cachedCredentials ? cachedCredentials?.expiration : null;
       const fetchNewCredentials = !expirationTime || expirationTime < new Date();
       if (fetchNewCredentials) {
         const fileAccessRequest = fileAccessContext.fileAccessRequest;
         const credentials = await this.fileApi.generateProjectFileAccessToken({ projectId, fileAccessRequest });
-        credentialsCache.set(projectId, credentials);
+        credentialsCache.set(cacheKey, credentials);
         return credentials;
       }
       return cachedCredentials;