thorin-plugin-upload-gcloud 2.0.1 → 2.0.4

package/lib/store.js

@@ -1,11 +1,10 @@
 'use strict';
-const Storage = require('@google-cloud/storage');
+const { Storage, File } = require('@google-cloud/storage');
 const url = require('url'),
   fs = require('fs'),
   path = require('path'),
   concat = require('concat-stream');
 
-
 const GCLOUD_STORAGE_URL = 'https://storage.googleapis.com/',
   GCLOUD_STORAGE_HOST = 'storage.googleapis.com';
 
@@ -48,7 +47,7 @@ module.exports = function (thorin, opt, IStorage) {
         } else {
           let credPath = this[config].credentials.charAt(0) === '/' ? path.normalize(this[config].credentials) : path.normalize(thorin.root + '/' + this[config].credentials);
           try {
-            let creds = fs.readFileSync(credPath, {encoding: 'utf8'});
+            let creds = fs.readFileSync(credPath, { encoding: 'utf8' });
             creds = JSON.parse(creds);
             this[config].credentials = creds;
           } catch (e) {
@@ -65,7 +64,9 @@ module.exports = function (thorin, opt, IStorage) {
         return;
       }
       this[sdk] = new Storage({
-        credentials: this[config].credentials
+        credentials: this[config].credentials,
+        projectId: this[config].credentials.project_id,
+        email: this[config].credentials.email
       });
     }
 
@@ -83,7 +84,7 @@ module.exports = function (thorin, opt, IStorage) {
     save(fileObj) {
       return new Promise((resolve, reject) => {
         const bucketObj = this[sdk].bucket(this[config].bucket);
-        let sFileObj = new Storage.File(bucketObj, fileObj.getKey(), {
+        let sFileObj = new File(bucketObj, fileObj.getKey(), {
           //resumable: false
         });
         let fOpt = thorin.util.extend({
@@ -172,7 +173,7 @@ module.exports = function (thorin, opt, IStorage) {
       if (!fopt.bucket) fopt.bucket = this[config].bucket;
       return new Promise((resolve, reject) => {
         const bucketObj = this[sdk].bucket(fopt.bucket);
-        let sFileObj = new Storage.File(bucketObj, fopt.key);
+        let sFileObj = new File(bucketObj, fopt.key);
         let readStr = sFileObj.createReadStream(opt);
         if (opt.raw === true) {
           return resolve(readStr);
@@ -239,7 +240,7 @@ module.exports = function (thorin, opt, IStorage) {
           opt.expire = 60;
         }
         const bucketObj = this[sdk].bucket(opt.bucket);
-        const fileObj = new Storage.File(bucketObj, opt.key);
+        const fileObj = new File(bucketObj, opt.key);
         const fOpt = {
           action: opt.action || 'read'
         };
@@ -277,7 +278,8 @@ module.exports = function (thorin, opt, IStorage) {
         if (!opt.bucket) opt.bucket = this[config].bucket;
         if (!opt.key) return resolve(null);
         const bucketObj = this[sdk].bucket(opt.bucket);
-        const fileObj = new Storage.File(bucketObj, opt.key);
+        if (opt.key.charAt(0) === '/') opt.key = opt.key.substr(1);
+        const fileObj = new File(bucketObj, opt.key);
         fileObj.delete((err) => {
           if (err) {
             if (err.code === 404) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thorin-plugin-upload-gcloud",
   "author": "UNLOQ Systems",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "dependencies": {
     "@google-cloud/storage": "6.0.1",
     "concat-stream": "2.0.0"