Handle empty credentials file

knolleary · knolleary · commit d6b326c13496 · 2016-07-26T22:23:49.000+01:00
Closes node-red#937
diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json
@@ -121,11 +121,11 @@
         "localfilesystem": {
             "user-dir": "User directory : __path__",
             "flows-file": "Flows file     : __path__",
-            "create": "Creating new flow file",
-            "empty": "Existing flow file is empty",
-            "invalid": "Existing flow file is not valid json",
-            "restore": "Restoring flow file backup : __path__",
-            "restore-fail": "Restoring flow file backup failed : __message__"
+            "create": "Creating new __type__ file",
+            "empty": "Existing __type__ file is empty",
+            "invalid": "Existing __type__ file is not valid json",
+            "restore": "Restoring __type__ file backup : __path__",
+            "restore-fail": "Restoring __type__ file backup failed : __message__"
         }
     }
 }
diff --git a/red/runtime/storage/localfilesystem.js b/red/runtime/storage/localfilesystem.js
@@ -122,6 +122,53 @@ function writeFile(path,content) {
     });
 }
 
+
+function readFile(path,backupPath,emptyResponse,type) {
+    return when.promise(function(resolve) {
+        fs.readFile(path,'utf8',function(err,data) {
+            if (!err) {
+                if (data.length === 0) {
+                    log.warn(log._("storage.localfilesystem.empty",{type:type}));
+                    try {
+                        var backupStat = fs.statSync(backupPath);
+                        if (backupStat.size === 0) {
+                            // Empty flows, empty backup - return empty flow
+                            return resolve(emptyResponse);
+                        }
+                        // Empty flows, restore backup
+                        log.warn(log._("storage.localfilesystem.restore",{path:backupPath,type:type}));
+                        fs.copy(backupPath,path,function(backupCopyErr) {
+                            if (backupCopyErr) {
+                                // Restore backup failed
+                                log.warn(log._("storage.localfilesystem.restore-fail",{message:backupCopyErr.toString(),type:type}));
+                                resolve([]);
+                            } else {
+                                // Loop back in to load the restored backup
+                                resolve(readFile(path,backupPath,emptyResponse,type));
+                            }
+                        });
+                        return;
+                    } catch(backupStatErr) {
+                        // Empty flow file, no back-up file
+                        return resolve(emptyResponse);
+                    }
+                }
+                try {
+                    return resolve(JSON.parse(data));
+                } catch(parseErr) {
+                    log.warn(log._("storage.localfilesystem.invalid",{type:type}));
+                    return resolve(emptyResponse);
+                }
+            } else {
+                if (type === 'flow') {
+                    log.info(log._("storage.localfilesystem.create",{type:type}));
+                }
+                resolve(emptyResponse);
+            }
+        });
+    });
+}
+
 var localfilesystem = {
     init: function(_settings) {
         settings = _settings;
@@ -191,52 +238,12 @@ var localfilesystem = {
     },
 
     getFlows: function() {
-        return when.promise(function(resolve) {
-            if (!initialFlowLoadComplete) {
-                initialFlowLoadComplete = true;
-                log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir}));
-                log.info(log._("storage.localfilesystem.flows-file",{path:flowsFullPath}));
-            }
-            fs.readFile(flowsFullPath,'utf8',function(err,data) {
-                if (!err) {
-                    if (data.length === 0) {
-                        log.warn(log._("storage.localfilesystem.empty"));
-                        try {
-                            var backupStat = fs.statSync(flowsFileBackup);
-                            if (backupStat.size === 0) {
-                                // Empty flows, empty backup - return empty flow
-                                return resolve([]);
-                            }
-                            // Empty flows, restore backup
-                            log.warn(log._("storage.localfilesystem.restore",{path:flowsFileBackup}));
-                            fs.copy(flowsFileBackup,flowsFullPath,function(backupCopyErr) {
-                                if (backupCopyErr) {
-                                    // Restore backup failed
-                                    log.warn(log._("storage.localfilesystem.restore-fail",{message:backupCopyErr.toString()}));
-                                    resolve([]);
-                                } else {
-                                    // Loop back in to load the restored backup
-                                    resolve(localfilesystem.getFlows());
-                                }
-                            });
-                            return;
-                        } catch(backupStatErr) {
-                            // Empty flow file, no back-up file
-                            return resolve([]);
-                        }
-                    }
-                    try {
-                        return resolve(JSON.parse(data));
-                    } catch(parseErr) {
-                        log.warn(log._("storage.localfilesystem.invalid"));
-                        return resolve([]);
-                    }
-                } else {
-                    log.info(log._("storage.localfilesystem.create"));
-                    resolve([]);
-                }
-            });
-        });
+        if (!initialFlowLoadComplete) {
+            initialFlowLoadComplete = true;
+            log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir}));
+            log.info(log._("storage.localfilesystem.flows-file",{path:flowsFullPath}));
+        }
+        return readFile(flowsFullPath,flowsFileBackup,[],'flow');
     },
 
     saveFlows: function(flows) {
@@ -260,21 +267,7 @@ var localfilesystem = {
     },
 
     getCredentials: function() {
-        return when.promise(function(resolve) {
-            fs.readFile(credentialsFile,'utf8',function(err,data) {
-                if (!err) {
-                    resolve(JSON.parse(data));
-                } else {
-                    fs.readFile(oldCredentialsFile,'utf8',function(err,data) {
-                        if (!err) {
-                            resolve(JSON.parse(data));
-                        } else {
-                            resolve({});
-                        }
-                    });
-                }
-            });
-        });
+        return readFile(credentialsFile,credentialsFileBackup,{},'credentials');
     },
 
     saveCredentials: function(credentials) {

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,11 @@`
`121`	`121`	`"localfilesystem": {`
`122`	`122`	`"user-dir": "User directory : __path__",`
`123`	`123`	`"flows-file": "Flows file : __path__",`
`124`		`- "create": "Creating new flow file",`
`125`		`- "empty": "Existing flow file is empty",`
`126`		`- "invalid": "Existing flow file is not valid json",`
`127`		`- "restore": "Restoring flow file backup : __path__",`
`128`		`- "restore-fail": "Restoring flow file backup failed : __message__"`
	`124`	`+ "create": "Creating new __type__ file",`
	`125`	`+ "empty": "Existing __type__ file is empty",`
	`126`	`+ "invalid": "Existing __type__ file is not valid json",`
	`127`	`+ "restore": "Restoring __type__ file backup : __path__",`
	`128`	`+ "restore-fail": "Restoring __type__ file backup failed : __message__"`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`