thorin-plugin-upload-gcloud 2.0.9 → 2.0.11

package/lib/store.js

@@ -180,6 +180,7 @@ module.exports = function (thorin, opt, IStorage) {
         fopt.key = fileUrl;
       }
       if (!fopt.bucket) fopt.bucket = this[config].bucket;
+      if (fopt.key?.startsWith('/')) fopt.key = fopt.key.substr(1);
       return new Promise((resolve, reject) => {
         const bucketObj = this[sdk].bucket(fopt.bucket);
         let sFileObj = new File(bucketObj, fopt.key);
@@ -205,7 +206,10 @@ module.exports = function (thorin, opt, IStorage) {
         function onData(d) {
           if (isDone) return;
           isDone = true;
-          if (!contentType) return resolve(d);
+          if (!contentType) {
+            d._file = sFileObj;
+            return resolve(d);
+          }
           let isString = false;
           if (contentType.indexOf('text/') !== -1) {
             isString = true;
@@ -215,6 +219,8 @@ module.exports = function (thorin, opt, IStorage) {
             isString = true;
           }
           if (isString) d = d.toString();
+          d._contentType = contentType;
+          d._file = sFileObj;
           resolve(d);
         }
 
@@ -258,6 +264,9 @@ module.exports = function (thorin, opt, IStorage) {
           let expireAt = new Date(Date.now() + opt.expire * 1000);
           fOpt.expires = expireAt.toISOString();
         }
+        if (fileObj.name.charAt(0) === '/') {
+          fileObj.name = fileObj.name.substr(1);
+        }
         fileObj.getSignedUrl(fOpt, (err, url) => {
           if (err) {
             logger.debug(`Could not generate signed URL for: ${params.Key}-${params.Bucket}`);

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "thorin-plugin-upload-gcloud",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "thorin-plugin-upload-gcloud",
-      "version": "2.0.8",
+      "version": "2.0.10",
       "license": "MIT",
       "dependencies": {
-        "@google-cloud/storage": "^7.16.0",
+        "@google-cloud/storage": "7.17.3",
         "concat-stream": "2.0.0"
       }
     },
@@ -42,9 +42,9 @@
       }
     },
     "node_modules/@google-cloud/storage": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.16.0.tgz",
-      "integrity": "sha512-7/5LRgykyOfQENcm6hDKP8SX/u9XxE5YOiWOkgkwcoO+cG8xT/cyOvp9wwN3IxfdYgpHs8CE7Nq2PKX2lNaEXw==",
+      "version": "7.17.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.17.3.tgz",
+      "integrity": "sha512-gOnCAbFgAYKRozywLsxagdevTF7Gm+2Ncz5u5CQAuOv/2VCa0rdGJWvJFDOftPx1tc+q8TXiC2pEJfFKu+yeMQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@google-cloud/paginator": "^5.0.0",
@@ -941,9 +941,9 @@
       "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g=="
     },
     "@google-cloud/storage": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.16.0.tgz",
-      "integrity": "sha512-7/5LRgykyOfQENcm6hDKP8SX/u9XxE5YOiWOkgkwcoO+cG8xT/cyOvp9wwN3IxfdYgpHs8CE7Nq2PKX2lNaEXw==",
+      "version": "7.17.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.17.3.tgz",
+      "integrity": "sha512-gOnCAbFgAYKRozywLsxagdevTF7Gm+2Ncz5u5CQAuOv/2VCa0rdGJWvJFDOftPx1tc+q8TXiC2pEJfFKu+yeMQ==",
       "requires": {
         "@google-cloud/paginator": "^5.0.0",
         "@google-cloud/projectify": "^4.0.0",

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "thorin-plugin-upload-gcloud",
   "author": "UNLOQ Systems",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "dependencies": {
-    "@google-cloud/storage": "^7.16.0",
+    "@google-cloud/storage": "7.17.3",
     "concat-stream": "2.0.0"
   },
   "description": "Thorin.js Google Cloud Upload storage",
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/Thorinjs/Thorin-plugin-upload-gcloud"
   },
-  "homepage": "http://thorinjs.com",
+  "homepage": "https://thorinjs.com",
   "bugs": {
     "url": "https://github.com/Thorinjs/Thorin-plugin-upload-gcloud/issues"
   }