Updated credentials storage so there is a .._cred.... file per flow.

Allows swapping flows more easily without having to re-enter credentials.
Thus also added *_cred* to .gitignore
This commit is contained in:
Dave C-J
2014-05-02 14:35:51 +01:00
parent 84093bcb6e
commit a9e07f8b78
3 changed files with 56 additions and 46 deletions

View File

@@ -1,5 +1,5 @@
/**
* Copyright 2013 IBM Corp.
* Copyright 2013, 2014 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ var settings;
var flowsFile;
var flowsFullPath;
var credentialsFile;
var oldCredentialsFile;
var userDir;
var libDir;
var libFlowsDir;
@@ -56,7 +56,6 @@ function listFiles(dir) {
function getFileMeta(root,path) {
var fn = fspath.join(root,path);
var fd = fs.openSync(fn,"r");
var size = fs.fstatSync(fd).size;
var meta = {};
@@ -84,6 +83,7 @@ function getFileMeta(root,path) {
fs.closeSync(fd);
return meta;
}
function getFileBody(root,path) {
var body = "";
var fn = fspath.join(root,path);
@@ -130,9 +130,9 @@ function writeFile(root,path,meta,body,res) {
}
mkdirp(fspath.dirname(fn), function (err) {
fs.writeFile(fn,headers+body,function(err) {
//TODO: handle error
res.writeHead(204, {'Content-Type': 'text/plain'});
res.end();
//TODO: handle error
res.writeHead(204, {'Content-Type': 'text/plain'});
res.end();
});
});
}
@@ -141,7 +141,7 @@ var localfilesystem = {
init: function(_settings) {
settings = _settings;
userDir = settings.userDir || process.env.NODE_RED_HOME;
if (settings.flowFile) {
flowsFile = settings.flowFile;
flowsFullPath = flowsFile;
@@ -149,13 +149,16 @@ var localfilesystem = {
flowsFile = 'flows_'+require('os').hostname()+'.json';
flowsFullPath = fspath.join(userDir,flowsFile);
}
credentialsFile = fspath.join(userDir,"credentials.json");
var fsext = fspath.extname(flowsFile);
credentialsFile = fspath.join(userDir,fspath.basename(flowsFile,fsext)+"_cred"+fsext);
oldCredentialsFile = fspath.join(userDir,"credentials.json");
libDir = fspath.join(userDir,"lib");
libFlowsDir = fspath.join(libDir,"flows");
return promiseDir(libFlowsDir);
},
getFlows: function() {
var defer = when.defer();
fs.exists(flowsFullPath, function(exists) {
@@ -171,10 +174,11 @@ var localfilesystem = {
});
return defer.promise;
},
saveFlows: function(flows) {
return nodeFn.call(fs.writeFile, flowsFullPath, JSON.stringify(flows));
},
getCredentials: function() {
var defer = when.defer();
fs.exists(credentialsFile, function(exists) {
@@ -183,23 +187,30 @@ var localfilesystem = {
return JSON.parse(data)
}));
} else {
defer.resolve({});
fs.exists(oldCredentialsFile, function(exists) {
if (exists) {
defer.resolve(nodeFn.call(fs.readFile, oldCredentialsFile, 'utf8').then(function(data) {
return JSON.parse(data)
}));
} else {
defer.resolve({});
}
});
}
});
return defer.promise;
},
saveCredentials: function(credentials) {
return nodeFn.call(fs.writeFile, credentialsFile, JSON.stringify(credentials))
},
getAllFlows: function() {
return listFiles(libFlowsDir);
},
getFlow: function(fn) {
var defer = when.defer();
var file = fspath.join(libFlowsDir,fn+".json");
fs.exists(file, function(exists) {
if (exists) {
@@ -208,24 +219,22 @@ var localfilesystem = {
defer.reject();
}
});
return defer.promise;
},
saveFlow: function(fn,data) {
var file = fspath.join(libFlowsDir,fn+".json");
return promiseDir(fspath.dirname(file)).then(function () {
return nodeFn.call(fs.writeFile, file, data);
});
},
getLibraryEntry: function(type,path) {
var root = fspath.join(libDir,type);
var rootPath = fspath.join(libDir,type,path);
return promiseDir(root).then(function () {
return nodeFn.call(fs.lstat, rootPath).then(function(stats) {
if (stats.isFile()) return getFileBody(root,path);
if (path.substr(-1) == '/') {
path = path.substr(0,path.length-1);
}
@@ -245,21 +254,19 @@ var localfilesystem = {
files.push(meta);
}
}
});
return dirs.concat(files);
});
});
});
},
saveLibraryEntry: function(type,path,meta,body) {
var fn = fspath.join(libDir, type, path);
var headers = "";
for (var i in meta) {
headers += "// "+i+": "+meta[i]+"\n";
}
return promiseDir(fspath.dirname(fn)).then(function () {
nodeFn.call(fs.writeFile, fn, headers+body);
});