From 6ba94648e07824df055f224ba771e33640e7216d Mon Sep 17 00:00:00 2001 From: Peter Svensson Date: Tue, 16 Jul 2019 12:30:14 +0200 Subject: [PATCH] adding guard for other components already initalized firebase-admin --- package.json | 2 +- storage/storage-read.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a64d6ac..051f0e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-firebase-admin", - "version": "1.1.9", + "version": "1.1.10", "description": "A node-red module that wraps the server-side admin SDK of firebase, firestore, et.c.", "main": "index.js", "scripts": { diff --git a/storage/storage-read.js b/storage/storage-read.js index b3b35e1..67a5b31 100644 --- a/storage/storage-read.js +++ b/storage/storage-read.js @@ -1,5 +1,5 @@ - +let storage module.exports = function(RED) { function FirebaseAdmin(config) { @@ -11,6 +11,7 @@ module.exports = function(RED) { let c = RED.nodes.getNode(config.cred) this.admin = c.admin this.storage = c.storage + storage = this.storage this.bucket = config.bucket || c.bucket this.path = config.path console.log('storage-read set this.storage') @@ -21,7 +22,7 @@ module.exports = function(RED) { if(msg && msg.payload){ let path = msg.payload.path || msg.path || this.path let bucket = msg.payload.bucket || msg.bucket || this.bucket - console.log('------------------------------ storage-read reading from bucket "'+bucket+'" path "'+path+'"') + console.log('------------------------------ storage-read reading from bucket "'+bucket+'" path "'+path+'" this.storage = '+this.storage+' storage = '+storage) if(msg.payload.files && msg.payload.files.length > 0){ console.log('--reading from files') let count = msg.payload.files.length @@ -48,8 +49,8 @@ module.exports = function(RED) { } else if(msg){ console.log('* reading single file from path '+path) try{ - this.storage - .bucket(bucket) + let s = this.storage || storage + s.bucket(bucket) .file(path).download().then((file)=>{ console.log('storage-read got file') //console.dir(file)