fix: allow public files read

Akord-com · Dec 21, 2023 · a4c8587 · a4c8587
1 parent 3b6c5c6
commit a4c8587
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/api/akord-api.ts b/src/api/akord-api.ts
@@ -111,6 +111,7 @@ export default class AkordApi extends Api {
     const { response } = await new ApiClient()
       .env(this.config)
       .resourceId(id)
+      .public(options.public)
       .progressHook(options.progressHook)
       .cancelHook(options.cancelHook)
       .downloadFile();

diff --git a/src/core/file.ts b/src/core/file.ts
@@ -89,7 +89,7 @@ class FileService extends Service {
   }
 
   public async download(fileUri: string, options: FileChunkedGetOptions = { responseType: 'arraybuffer' }): Promise<ReadableStream<Uint8Array> | ArrayBuffer> {
-    const file = await this.api.downloadFile(fileUri, { responseType: 'stream' });
+    const file = await this.api.downloadFile(fileUri, { responseType: 'stream', public: this.isPublic });
     let stream: ReadableStream<Uint8Array>;
     if (this.isPublic) {
       stream = file.fileData as ReadableStream<Uint8Array>;
@@ -221,7 +221,8 @@ class FileService extends Service {
     if (!options.cacheOnly) {
       const uri = chunkedResource.resourceLocation.split(":")[0];
       while (true) {
-        await new Promise(resolve => setTimeout(resolve, UPLOADER_POLLING_RATE_IN_MILLISECONDS));        const state = await this.api.getUploadState(uri);
+        await new Promise(resolve => setTimeout(resolve, UPLOADER_POLLING_RATE_IN_MILLISECONDS));
+        const state = await this.api.getUploadState(uri);
         if (state && state.resourceUri) {
           resource.resourceUri = state.resourceUri;
           break;
@@ -382,6 +383,7 @@ export type FileUploadOptions = Hooks & FileOptions & {
 export type FileDownloadOptions = Hooks & {
   path?: string,
   skipSave?: boolean,
+  public?: boolean,
 }
 
 export type FileGetOptions = FileDownloadOptions & {

diff --git a/src/core/stack.ts b/src/core/stack.ts
@@ -188,7 +188,7 @@ class StackService extends NodeService<Stack> {
         if (!service.isPublic) {
           await version.decrypt();
           const tags = await this.api.getTransactionTags(id);
-          const encryptedKey = tags.find(tag => tag.name.toLowerCase() === encryptionTags.ENCRYPTED_KEY.toLowerCase() 
+          const encryptedKey = tags.find(tag => tag.name.toLowerCase() === encryptionTags.ENCRYPTED_KEY.toLowerCase()
             || tag.name.toLowerCase() === encryptionTagsLegacy.ENCRYPTED_KEY.toLowerCase())?.value
           const iv = tags.find(tag => tag.name === encryptionTags.IV
             || tag.name.toLowerCase() === encryptionTagsLegacy.IV.toLowerCase())?.value