merge #65

tweedegolf · May 23, 2024 · f3fd389 · f3fd389
1 parent af1a4ea
commit f3fd389
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/src/AdapterAzureBlob.ts b/src/AdapterAzureBlob.ts
@@ -181,11 +181,16 @@ export class AdapterAzureBlob extends AbstractAdapter {
       }
 
       try {
-        const options: BlobGenerateSasUrlOptions = {
-          permissions: BlobSASPermissions.parse("r"),
-          expiresOn: new Date(new Date().valueOf() + 86400),
+        const sasOptions: BlobGenerateSasUrlOptions = {
+          permissions: options.permissions || BlobSASPermissions.parse("r"),
+          expiresOn: options.expiresOn || new Date(new Date().valueOf() + 86400),
         };
-        const url = await file.generateSasUrl(options);
+        let url: string;
+        if (options.isPublicFile && !options.forceSignedUrl) {
+          url = file.url;
+        } else {
+          url = await file.generateSasUrl(sasOptions);
+        }
         return { value: url, error: null };
       } catch (e) {
         return { value: null, error: e.message };
@@ -257,7 +262,7 @@ export class AdapterAzureBlob extends AbstractAdapter {
         readStream = fs.createReadStream(f);
       } else if (typeof (params as FileBufferParams).buffer !== "undefined") {
         readStream = new Readable();
-        readStream._read = (): void => {}; // _read is required but you can noop it
+        readStream._read = (): void => { }; // _read is required but you can noop it
         readStream.push((params as FileBufferParams).buffer);
         readStream.push(null);
       } else if (typeof (params as FileStreamParams).stream !== "undefined") {

diff --git a/src/AdapterGoogleCloud.ts b/src/AdapterGoogleCloud.ts
@@ -60,7 +60,17 @@ export class AdapterGoogleCloud extends AbstractAdapter {
   protected async _getFileAsURL(bucketName: string, fileName: string, options: Options): Promise<ResultObject> {
     try {
       const file = this._client.bucket(bucketName).file(fileName);
-      return { value: file.publicUrl(), error: null };
+      if (options.isPublicFile && !options.forceSignedUrl) {
+        return { value: file.publicUrl(), error: null };
+      } else {
+        return {
+          value: await file.getSignedUrl({
+            action: 'read',
+            expires: options.expiresOn || 86400,
+          })[0],
+          error: null
+        }
+      }
     } catch (e) {
       return { value: null, error: e.message };
     }

diff --git a/src/AdapterLocal.ts b/src/AdapterLocal.ts
@@ -119,7 +119,7 @@ export class AdapterLocal extends AbstractAdapter {
         return { value: dest, error: null };
       } else if (typeof (params as FileBufferParams).buffer !== "undefined") {
         readStream = new Readable();
-        readStream._read = (): void => {}; // _read is required but you can noop it
+        readStream._read = (): void => { }; // _read is required but you can noop it
         readStream.push((params as FileBufferParams).buffer);
         readStream.push(null);
       } else if (typeof (params as FileStreamParams).stream !== "undefined") {
@@ -209,7 +209,14 @@ export class AdapterLocal extends AbstractAdapter {
   ): Promise<ResultObject> {
     try {
       const p = path.join(this._config.directory, bucketName, fileName);
-      await fs.promises.access(p);
+      try {
+        await fs.promises.access(p);
+      } catch (e) {
+        return { value: null, error: e }
+      }
+      if (options.withoutDirectory) {
+        return { value: path.join(bucketName, fileName), error: null };
+      }
       return { value: p, error: null };
     } catch (e) {
       return { value: null, error: e.message };