@cirrobio/sdk 0.2.7 → 0.2.10

package/dist/file/file.service.js

@@ -52,16 +52,16 @@ class FileService {
     async getProjectAccessCredentials(fileAccessContext) {
         const accessType = fileAccessContext.fileAccessRequest.accessType;
         // Special case for project download, since we can cache the credentials
-        if (accessType === api_client_1.AccessType.ProjectDownload || accessType === api_client_1.AccessType.SharedDatasetDownload) {
+        if (accessType === api_client_1.ProjectAccessType.ProjectDownload || accessType === api_client_1.ProjectAccessType.SharedDatasetDownload) {
             return this.getProjectReadCredentials(fileAccessContext);
         }
-        return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, fileAccessRequest: fileAccessContext.fileAccessRequest });
+        return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, projectFileAccessRequest: 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) {
+        if (fileAccessContext.fileAccessRequest.accessType === api_client_1.ProjectAccessType.SharedDatasetDownload) {
             cacheKey = `${projectId}-${fileAccessContext.fileAccessRequest.datasetId}`;
         }
         return credentials_mutex_so_1.credentialsMutex.dispatch(async () => {
@@ -69,8 +69,8 @@ class FileService {
             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 });
+                const projectFileAccessRequest = fileAccessContext.fileAccessRequest;
+                const credentials = await this.fileApi.generateProjectFileAccessToken({ projectId, projectFileAccessRequest });
                 credentials_mutex_so_1.credentialsCache.set(cacheKey, credentials);
                 return credentials;
             }

package/dist/file/project-access-context.d.ts

@@ -1,4 +1,4 @@
-import { DatasetDetail, FileAccessRequest, Project } from "@cirrobio/api-client";
+import { DatasetDetail, ProjectFileAccessRequest, Project } from "@cirrobio/api-client";
 type ProjectIdentifiable = Pick<Project, 'id'>;
 /**
  * Helper class to encapsulate the file access for a project.
@@ -6,8 +6,8 @@ type ProjectIdentifiable = Pick<Project, 'id'>;
 export declare class ProjectFileAccessContext {
     readonly project: ProjectIdentifiable;
     readonly dataset: DatasetDetail;
-    readonly fileAccessRequest: FileAccessRequest;
-    constructor(project: ProjectIdentifiable, dataset: DatasetDetail, fileAccessRequest: FileAccessRequest);
+    readonly fileAccessRequest: ProjectFileAccessRequest;
+    constructor(project: ProjectIdentifiable, dataset: DatasetDetail, fileAccessRequest: ProjectFileAccessRequest);
     static projectDownload(project: ProjectIdentifiable): ProjectFileAccessContext;
     static datasetDownload(project: ProjectIdentifiable, dataset: DatasetDetail): ProjectFileAccessContext;
 }

package/dist/file/project-access-context.js

@@ -12,11 +12,11 @@ class ProjectFileAccessContext {
         this.fileAccessRequest = fileAccessRequest;
     }
     static projectDownload(project) {
-        const request = { accessType: api_client_1.AccessType.ProjectDownload };
+        const request = { accessType: api_client_1.ProjectAccessType.ProjectDownload };
         return new ProjectFileAccessContext(project, null, request);
     }
     static datasetDownload(project, dataset) {
-        const accessType = dataset.share ? api_client_1.AccessType.SharedDatasetDownload : api_client_1.AccessType.ProjectDownload;
+        const accessType = dataset.share ? api_client_1.ProjectAccessType.SharedDatasetDownload : api_client_1.ProjectAccessType.ProjectDownload;
         const request = { accessType, datasetId: dataset.id };
         return new ProjectFileAccessContext(project, dataset, request);
     }

package/package.json

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

package/src/file/file.service.ts

@@ -1,4 +1,4 @@
-import { AccessType, AWSCredentials, FileApi } from "@cirrobio/api-client";
+import { ProjectAccessType, 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";
@@ -56,17 +56,17 @@ export class FileService {
   async getProjectAccessCredentials(fileAccessContext: ProjectFileAccessContext): Promise<AWSCredentials> {
     const accessType = fileAccessContext.fileAccessRequest.accessType;
     // Special case for project download, since we can cache the credentials
-    if (accessType === AccessType.ProjectDownload || accessType === AccessType.SharedDatasetDownload) {
+    if (accessType === ProjectAccessType.ProjectDownload || accessType === ProjectAccessType.SharedDatasetDownload) {
       return this.getProjectReadCredentials(fileAccessContext);
     }
-    return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, fileAccessRequest: fileAccessContext.fileAccessRequest });
+    return this.fileApi.generateProjectFileAccessToken({ projectId: fileAccessContext.project.id, projectFileAccessRequest: fileAccessContext.fileAccessRequest });
   }
 
   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) {
+    if (fileAccessContext.fileAccessRequest.accessType === ProjectAccessType.SharedDatasetDownload) {
       cacheKey = `${projectId}-${fileAccessContext.fileAccessRequest.datasetId}`;
     }
 
@@ -75,8 +75,8 @@ export class FileService {
       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 });
+        const projectFileAccessRequest = fileAccessContext.fileAccessRequest;
+        const credentials = await this.fileApi.generateProjectFileAccessToken({ projectId, projectFileAccessRequest });
         credentialsCache.set(cacheKey, credentials);
         return credentials;
       }

package/src/file/project-access-context.ts

@@ -1,4 +1,4 @@
-import { AccessType, DatasetDetail, FileAccessRequest, Project } from "@cirrobio/api-client";
+import { ProjectAccessType, DatasetDetail, ProjectFileAccessRequest, Project } from "@cirrobio/api-client";
 
 type ProjectIdentifiable = Pick<Project, 'id'>;
 
@@ -9,18 +9,18 @@ export class ProjectFileAccessContext {
   constructor(
     readonly project: ProjectIdentifiable,
     readonly dataset: DatasetDetail,
-    readonly fileAccessRequest: FileAccessRequest
+    readonly fileAccessRequest: ProjectFileAccessRequest
   ) {
   }
 
   static projectDownload(project: ProjectIdentifiable): ProjectFileAccessContext {
-    const request: FileAccessRequest = { accessType: AccessType.ProjectDownload };
+    const request: ProjectFileAccessRequest = { accessType: ProjectAccessType.ProjectDownload };
     return new ProjectFileAccessContext(project, null, request);
   }
 
   static datasetDownload(project: ProjectIdentifiable, dataset: DatasetDetail): ProjectFileAccessContext {
-    const accessType = dataset.share ? AccessType.SharedDatasetDownload : AccessType.ProjectDownload;
-    const request: FileAccessRequest = { accessType, datasetId: dataset.id };
+    const accessType = dataset.share ? ProjectAccessType.SharedDatasetDownload : ProjectAccessType.ProjectDownload;
+    const request: ProjectFileAccessRequest = { accessType, datasetId: dataset.id };
     return new ProjectFileAccessContext(project, dataset, request);
   }
 }