From 6d02e70025e855b0b3825f75971f4e45edb2d921 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 25 Jan 2018 10:13:07 +0000
Subject: [PATCH] Ensure existing files are migrated to first project

---
 package.json                                           | 10 +++++-----
 .../storage/localfilesystem/projects/Project.js        |  4 ++--
 red/runtime/storage/localfilesystem/projects/index.js  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 1159492b8..f7d2b29ef 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,10 @@
         "mqtt": "2.15.1",
         "multer": "1.3.0",
         "mustache": "2.3.0",
+        "node-red-node-email": "0.1.*",
+        "node-red-node-feedparser": "0.1.*",
+        "node-red-node-rbe": "0.1.*",
+        "node-red-node-twitter": "0.1.*",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.1",
@@ -70,11 +74,7 @@
         "uglify-js": "3.3.6",
         "when": "3.7.8",
         "ws": "1.1.5",
-        "xml2js": "0.4.19",
-        "node-red-node-feedparser": "0.1.*",
-        "node-red-node-email": "0.1.*",
-        "node-red-node-twitter": "0.1.*",
-        "node-red-node-rbe": "0.1.*"
+        "xml2js": "0.4.19"
     },
     "optionalDependencies": {
         "bcrypt": "~1.0.3"
diff --git a/red/runtime/storage/localfilesystem/projects/Project.js b/red/runtime/storage/localfilesystem/projects/Project.js
index 1d4b67b44..b8591f78d 100644
--- a/red/runtime/storage/localfilesystem/projects/Project.js
+++ b/red/runtime/storage/localfilesystem/projects/Project.js
@@ -770,7 +770,7 @@ function createDefaultProject(user, project) {
                 var flowFilePath;
                 var credsFilePath;
 
-                if (project.files.migrateFiles) {
+                if (project.migrateFiles) {
                     var baseFlowFileName = project.files.flow || fspath.basename(project.files.oldFlow);
                     var baseCredentialFileName = project.files.credentials || fspath.basename(project.files.oldCredentials);
                     files.push(baseFlowFileName);
@@ -790,7 +790,7 @@ function createDefaultProject(user, project) {
                         }
                         return util.writeFile(credsFilePath,credentialData);
                     }));
-                    delete project.files.migrateFiles;
+                    delete project.migrateFiles;
                     project.files.flow = baseFlowFileName;
                     project.files.credentials = baseCredentialFileName;
                 } else {
diff --git a/red/runtime/storage/localfilesystem/projects/index.js b/red/runtime/storage/localfilesystem/projects/index.js
index 0ed25d254..ecccee581 100644
--- a/red/runtime/storage/localfilesystem/projects/index.js
+++ b/red/runtime/storage/localfilesystem/projects/index.js
@@ -307,7 +307,7 @@ function reloadActiveProject(action) {
 }
 function createProject(user, metadata) {
     // var userSettings = getUserGitSettings(user);
-    if (metadata.files && metadata.files.migrateFiles) {
+    if (metadata.files && metadata.migrateFiles) {
         // We expect there to be no active project in this scenario
         if (activeProject) {
             throw new Error("Cannot migrate as there is an active project");