From af60043217642f6c221238085f57898bece64719 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Mon, 24 Dec 2018 10:17:54 -0200
Subject: [PATCH] Improved code quality (#13020)

---
 packages/rocketchat-importer/server/classes/ImporterBase.js    | 2 +-
 .../server/methods/downloadPublicImportFile.js                 | 1 -
 .../rocketchat-importer/server/methods/uploadImportFile.js     | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/packages/rocketchat-importer/server/classes/ImporterBase.js
index ffd06b45fe69..1db3c0920521 100644
--- a/packages/rocketchat-importer/server/classes/ImporterBase.js
+++ b/packages/rocketchat-importer/server/classes/ImporterBase.js
@@ -99,7 +99,7 @@ export class Base {
 		this.progress = new Progress(this.info.key, this.info.name);
 		this.collection = RawImports;
 
-		const userId = Meteor.user()._id;
+		const userId = Meteor.userId();
 		const importRecord = Imports.findPendingImport(this.info.key);
 
 		if (importRecord) {
diff --git a/packages/rocketchat-importer/server/methods/downloadPublicImportFile.js b/packages/rocketchat-importer/server/methods/downloadPublicImportFile.js
index b64c304609da..acfd35095f14 100644
--- a/packages/rocketchat-importer/server/methods/downloadPublicImportFile.js
+++ b/packages/rocketchat-importer/server/methods/downloadPublicImportFile.js
@@ -7,7 +7,6 @@ import http from 'http';
 Meteor.methods({
 	downloadPublicImportFile(fileUrl, importerKey) {
 		const userId = Meteor.userId();
-		console.log(fileUrl);
 
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'downloadPublicImportFile' });
diff --git a/packages/rocketchat-importer/server/methods/uploadImportFile.js b/packages/rocketchat-importer/server/methods/uploadImportFile.js
index 45d6d52a5266..ded0e5c3ab83 100644
--- a/packages/rocketchat-importer/server/methods/uploadImportFile.js
+++ b/packages/rocketchat-importer/server/methods/uploadImportFile.js
@@ -30,9 +30,6 @@ Meteor.methods({
 		const readStream = RocketChatFile.bufferToStream(file);
 		const writeStream = RocketChatImportFileInstance.createWriteStream(newFileName, contentType);
 
-		writeStream.on('end', Meteor.bindEnvironment(() => {
-		}));
-
 		readStream.pipe(writeStream);
 	},
 });