mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Move credential load/save storage functions under get/setFlows
This commit is contained in:
Nick O'Leary
parent
e06cadd761
commit
f9b972349d
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2014, 2015 IBM Corp.
|
||||
* Copyright 2014, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -19,34 +19,40 @@ var when = require("when");
|
||||
var log = require("../log");
|
||||
|
||||
var credentialCache = {};
|
||||
var storage = null;
|
||||
var credentialsDef = {};
|
||||
var dirty = false;
|
||||
|
||||
module.exports = {
|
||||
init: function (_storage) {
|
||||
storage = _storage;
|
||||
var api = module.exports = {
|
||||
init: function() {
|
||||
dirty = false;
|
||||
credentialCache = {};
|
||||
credentialsDef = {};
|
||||
},
|
||||
|
||||
/**
|
||||
* Loads the credentials from storage.
|
||||
* Sets the credentials from storage.
|
||||
*/
|
||||
load: function () {
|
||||
return storage.getCredentials().then(function (creds) {
|
||||
credentialCache = creds;
|
||||
}).otherwise(function (err) {
|
||||
log.warn(log._("nodes.credentials.error",{message: err}));
|
||||
});
|
||||
load: function (credentials) {
|
||||
credentialCache = credentials;
|
||||
dirty = false;
|
||||
return when.resolve();
|
||||
// return storage.getCredentials().then(function (creds) {
|
||||
// credentialCache = creds;
|
||||
// }).otherwise(function (err) {
|
||||
// log.warn(log._("nodes.credentials.error",{message: err}));
|
||||
// });
|
||||
},
|
||||
|
||||
/**
|
||||
* Adds a set of credentials for the given node id.
|
||||
* @param id the node id for the credentials
|
||||
* @param creds an object of credential key/value pairs
|
||||
* @return a promise for the saving of credentials to storage
|
||||
* @return a promise for backwards compatibility TODO: can this be removed?
|
||||
*/
|
||||
add: function (id, creds) {
|
||||
credentialCache[id] = creds;
|
||||
return storage.saveCredentials(credentialCache);
|
||||
dirty = true;
|
||||
return when.resolve();
|
||||
},
|
||||
|
||||
/**
|
||||
@ -65,7 +71,7 @@ module.exports = {
|
||||
*/
|
||||
delete: function (id) {
|
||||
delete credentialCache[id];
|
||||
storage.saveCredentials(credentialCache);
|
||||
dirty = true;
|
||||
},
|
||||
|
||||
/**
|
||||
@ -77,6 +83,9 @@ module.exports = {
|
||||
var existingIds = {};
|
||||
config.forEach(function(n) {
|
||||
existingIds[n.id] = true;
|
||||
if (n.credentials) {
|
||||
api.extract(n);
|
||||
}
|
||||
});
|
||||
var deletedCredentials = false;
|
||||
for (var c in credentialCache) {
|
||||
@ -88,10 +97,9 @@ module.exports = {
|
||||
}
|
||||
}
|
||||
if (deletedCredentials) {
|
||||
return storage.saveCredentials(credentialCache);
|
||||
} else {
|
||||
return when.resolve();
|
||||
dirty = true;
|
||||
}
|
||||
return when.resolve();
|
||||
},
|
||||
|
||||
/**
|
||||
@ -146,17 +154,10 @@ module.exports = {
|
||||
}
|
||||
}
|
||||
credentialCache[nodeID] = savedCredentials;
|
||||
dirty = true;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Saves the credentials to storage
|
||||
* @return a promise for the saving of credentials to storage
|
||||
*/
|
||||
save: function () {
|
||||
return storage.saveCredentials(credentialCache);
|
||||
},
|
||||
|
||||
/**
|
||||
* Gets the credential definition for the given node type
|
||||
* @param type the node type
|
||||
@ -164,5 +165,14 @@ module.exports = {
|
||||
*/
|
||||
getDefinition: function (type) {
|
||||
return credentialsDef[type];
|
||||
},
|
||||
|
||||
dirty: function() {
|
||||
return dirty;
|
||||
},
|
||||
|
||||
export: function() {
|
||||
dirty = false;
|
||||
return when.resolve(credentialCache);
|
||||
}
|
||||
}
|
||||
|
||||
@ -67,9 +67,9 @@ function init(runtime) {
|
||||
}
|
||||
}
|
||||
function load() {
|
||||
return storage.getFlows().then(function(flows) {
|
||||
return credentials.load().then(function() {
|
||||
return setConfig(flows,"load");
|
||||
return storage.getFlows().then(function(config) {
|
||||
return credentials.load(config.credentials).then(function() {
|
||||
return setConfig(config.flows,"load");
|
||||
});
|
||||
}).otherwise(function(err) {
|
||||
log.warn(log._("nodes.flows.error",{message:err.toString()}));
|
||||
@ -81,8 +81,6 @@ function setConfig(_config,type,muteLog) {
|
||||
var config = clone(_config);
|
||||
type = type||"full";
|
||||
|
||||
var credentialsChanged = false;
|
||||
var credentialSavePromise = null;
|
||||
var configSavePromise = null;
|
||||
|
||||
var diff;
|
||||
@ -90,23 +88,20 @@ function setConfig(_config,type,muteLog) {
|
||||
if (type !== 'full' && type !== 'load') {
|
||||
diff = flowUtil.diffConfigs(activeFlowConfig,newFlowConfig);
|
||||
}
|
||||
config.forEach(function(node) {
|
||||
if (node.credentials) {
|
||||
credentials.extract(node);
|
||||
credentialsChanged = true;
|
||||
}
|
||||
});
|
||||
if (credentialsChanged) {
|
||||
credentialSavePromise = credentials.save();
|
||||
} else {
|
||||
credentialSavePromise = when.resolve();
|
||||
}
|
||||
|
||||
if (type === 'load') {
|
||||
configSavePromise = credentialSavePromise;
|
||||
type = 'full';
|
||||
configSavePromise = when.resolve();
|
||||
} else {
|
||||
configSavePromise = credentialSavePromise.then(function() {
|
||||
return storage.saveFlows(config);
|
||||
credentials.clean(config);
|
||||
var credsDirty = credentials.dirty();
|
||||
configSavePromise = credentials.export().then(function(creds) {
|
||||
var saveConfig = {
|
||||
flows: config,
|
||||
credentialsDirty:credsDirty,
|
||||
credentials: creds
|
||||
}
|
||||
storage.saveFlows(saveConfig);
|
||||
});
|
||||
}
|
||||
|
||||
@ -114,7 +109,6 @@ function setConfig(_config,type,muteLog) {
|
||||
.then(function() {
|
||||
activeConfig = config;
|
||||
activeFlowConfig = newFlowConfig;
|
||||
return credentials.clean(activeConfig).then(function() {
|
||||
if (started) {
|
||||
return stop(type,diff,muteLog).then(function() {
|
||||
context.clean(activeFlowConfig);
|
||||
@ -123,7 +117,6 @@ function setConfig(_config,type,muteLog) {
|
||||
})
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function getNode(id) {
|
||||
|
||||
@ -77,7 +77,7 @@ function createNode(node,def) {
|
||||
|
||||
function init(runtime) {
|
||||
settings = runtime.settings;
|
||||
credentials.init(runtime.storage);
|
||||
credentials.init();
|
||||
flows.init(runtime);
|
||||
registry.init(runtime);
|
||||
context.init(runtime.settings);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2013, 2015 IBM Corp.
|
||||
* Copyright 2013, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -55,17 +55,35 @@ var storageModuleInterface = {
|
||||
return storageModule.init(runtime.settings);
|
||||
},
|
||||
getFlows: function() {
|
||||
return storageModule.getFlows();
|
||||
return storageModule.getFlows().then(function(flows) {
|
||||
return storageModule.getCredentials().then(function(creds) {
|
||||
return {
|
||||
flows: flows,
|
||||
credentials: creds
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
saveFlows: function(flows) {
|
||||
saveFlows: function(config) {
|
||||
var flows = config.flows;
|
||||
var credentials = config.credentials;
|
||||
var credentialSavePromise;
|
||||
if (config.credentialsDirty) {
|
||||
credentialSavePromise = storageModule.saveCredentials(credentials);
|
||||
} else {
|
||||
credentialSavePromise = when.resolve();
|
||||
}
|
||||
|
||||
return credentialSavePromise.then(function() {
|
||||
return storageModule.saveFlows(flows);
|
||||
});
|
||||
},
|
||||
getCredentials: function() {
|
||||
return storageModule.getCredentials();
|
||||
},
|
||||
saveCredentials: function(credentials) {
|
||||
return storageModule.saveCredentials(credentials);
|
||||
},
|
||||
// getCredentials: function() {
|
||||
// return storageModule.getCredentials();
|
||||
// },
|
||||
// saveCredentials: function(credentials) {
|
||||
// return storageModule.saveCredentials(credentials);
|
||||
// },
|
||||
getSettings: function() {
|
||||
if (settingsAvailable) {
|
||||
return storageModule.getSettings();
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2014, 2015 IBM Corp.
|
||||
* Copyright 2014, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -19,34 +19,21 @@ var sinon = require("sinon");
|
||||
var when = require("when");
|
||||
var util = require("util");
|
||||
|
||||
var express = require("express");
|
||||
var request = require("supertest");
|
||||
|
||||
var index = require("../../../../red/runtime/nodes/index");
|
||||
var credentials = require("../../../../red/runtime/nodes/credentials");
|
||||
var log = require("../../../../red/runtime/log");
|
||||
var auth = require("../../../../red/api/auth");
|
||||
|
||||
|
||||
describe('Credentials', function() {
|
||||
describe('red/runtime/nodes/credentials', function() {
|
||||
|
||||
afterEach(function() {
|
||||
index.clearRegistry();
|
||||
});
|
||||
|
||||
it('loads from storage',function(done) {
|
||||
it('loads provided credentials',function(done) {
|
||||
credentials.init();
|
||||
|
||||
var storage = {
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
resolve({"a":{"b":1,"c":2}});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
credentials.init(storage);
|
||||
|
||||
credentials.load().then(function() {
|
||||
credentials.load({"a":{"b":1,"c":2}}).then(function() {
|
||||
|
||||
credentials.get("a").should.have.property('b',1);
|
||||
credentials.get("a").should.have.property('c',2);
|
||||
@ -54,182 +41,99 @@ describe('Credentials', function() {
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('saves to storage', function(done) {
|
||||
var storage = {
|
||||
saveCredentials: function(creds) {
|
||||
return when.resolve("saveCalled");
|
||||
}
|
||||
};
|
||||
credentials.init(storage);
|
||||
credentials.save().then(function(res) {
|
||||
res.should.equal("saveCalled");
|
||||
it('adds a new credential',function(done) {
|
||||
credentials.init();
|
||||
credentials.load({"a":{"b":1,"c":2}}).then(function() {
|
||||
credentials.dirty().should.be.false;
|
||||
should.not.exist(credentials.get("b"));
|
||||
credentials.add("b",{"foo":"bar"}).then(function() {
|
||||
credentials.get("b").should.have.property("foo","bar");
|
||||
credentials.dirty().should.be.true;
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('saves to storage when new cred added', function(done) {
|
||||
var storage = {
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
resolve({"a":{"b":1,"c":2}});
|
||||
});
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
}
|
||||
};
|
||||
sinon.spy(storage,"saveCredentials");
|
||||
credentials.init(storage);
|
||||
credentials.load().then(function() {
|
||||
should.not.exist(credentials.get("b"))
|
||||
credentials.add('b',{"d":3});
|
||||
storage.saveCredentials.callCount.should.be.exactly(1);
|
||||
credentials.get("b").should.have.property('d',3);
|
||||
storage.saveCredentials.restore();
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('deletes from storage', function(done) {
|
||||
var storage = {
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
resolve({"a":{"b":1,"c":2}});
|
||||
});
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
}
|
||||
};
|
||||
sinon.spy(storage,"saveCredentials");
|
||||
credentials.init(storage);
|
||||
credentials.load().then(function() {
|
||||
should.exist(credentials.get("a"))
|
||||
credentials.delete('a');
|
||||
storage.saveCredentials.callCount.should.be.exactly(1);
|
||||
it('deletes an existing credential',function(done) {
|
||||
credentials.init();
|
||||
credentials.load({"a":{"b":1,"c":2}}).then(function() {
|
||||
credentials.dirty().should.be.false;
|
||||
credentials.delete("a");
|
||||
should.not.exist(credentials.get("a"));
|
||||
storage.saveCredentials.restore();
|
||||
credentials.dirty().should.be.true;
|
||||
done();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
it('clean up from storage', function(done) {
|
||||
var storage = {
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
resolve({"a":{"b":1,"c":2}});
|
||||
it('exports the credentials, clearing dirty flag', function(done) {
|
||||
credentials.init();
|
||||
var creds = {"a":{"b":1,"c":2}};
|
||||
credentials.load(creds).then(function() {
|
||||
credentials.add("b",{"foo":"bar"}).then(function() {
|
||||
credentials.dirty().should.be.true;
|
||||
credentials.export().then(function(exported) {
|
||||
exported.should.eql(creds);
|
||||
credentials.dirty().should.be.false;
|
||||
done();
|
||||
})
|
||||
});
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
}
|
||||
};
|
||||
sinon.spy(storage,"saveCredentials");
|
||||
credentials.init(storage);
|
||||
credentials.load().then(function() {
|
||||
});
|
||||
})
|
||||
|
||||
describe("#clean",function() {
|
||||
it("removes credentials of unknown nodes",function(done) {
|
||||
credentials.init();
|
||||
var creds = {"a":{"b":1,"c":2},"b":{"d":3}};
|
||||
credentials.load(creds).then(function() {
|
||||
credentials.dirty().should.be.false;
|
||||
should.exist(credentials.get("a"));
|
||||
credentials.clean([]);
|
||||
storage.saveCredentials.callCount.should.be.exactly(1);
|
||||
should.exist(credentials.get("b"));
|
||||
credentials.clean([{id:"b"}]).then(function() {
|
||||
credentials.dirty().should.be.true;
|
||||
should.not.exist(credentials.get("a"));
|
||||
storage.saveCredentials.restore();
|
||||
should.exist(credentials.get("b"));
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('handle error loading from storage', function(done) {
|
||||
var storage = {
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
reject("test forcing failure");
|
||||
});
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
}
|
||||
};
|
||||
var logmsg = 'nothing logged yet';
|
||||
sinon.stub(log, 'warn', function(msg) {
|
||||
logmsg = msg;
|
||||
it("extracts credentials of known nodes",function(done) {
|
||||
credentials.init();
|
||||
credentials.register("testNode",{"b":"text","c":"password"})
|
||||
var creds = {"a":{"b":1,"c":2}};
|
||||
var newConfig = [{id:"a",type:"testNode",credentials:{"b":"newBValue","c":"newCValue"}}];
|
||||
credentials.load(creds).then(function() {
|
||||
credentials.dirty().should.be.false;
|
||||
credentials.clean(newConfig).then(function() {
|
||||
credentials.dirty().should.be.true;
|
||||
credentials.get("a").should.have.property('b',"newBValue");
|
||||
credentials.get("a").should.have.property('c',"newCValue");
|
||||
should.not.exist(newConfig[0].credentials);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
credentials.init(storage);
|
||||
credentials.load().then(function() {
|
||||
log.warn.calledOnce.should.be.true;
|
||||
|
||||
});
|
||||
|
||||
it('warns if a node has no credential definition', function(done) {
|
||||
credentials.init();
|
||||
credentials.load({}).then(function() {
|
||||
var node = {id:"node",type:"test",credentials:{
|
||||
user1:"newUser",
|
||||
password1:"newPassword"
|
||||
}};
|
||||
sinon.spy(log,"warn");
|
||||
credentials.extract(node);
|
||||
log.warn.called.should.be.true;
|
||||
should.not.exist(node.credentials);
|
||||
log.warn.restore();
|
||||
done();
|
||||
}).otherwise(function(err){
|
||||
log.warn.restore();
|
||||
done(err);
|
||||
});
|
||||
});
|
||||
})
|
||||
|
||||
it('credential type is not registered when extract', function(done) {
|
||||
var testFlows = [{"type":"test","id":"tab1","label":"Sheet 1"}];
|
||||
var storage = {
|
||||
getFlows: function() {
|
||||
var defer = when.defer();
|
||||
defer.resolve(testFlows);
|
||||
return defer.promise;
|
||||
},
|
||||
getCredentials: function() {
|
||||
return when.promise(function(resolve,reject) {
|
||||
resolve({"tab1":{"b":1,"c":2}});
|
||||
});
|
||||
},
|
||||
saveFlows: function(conf) {
|
||||
var defer = when.defer();
|
||||
defer.resolve();
|
||||
should.deepEqual(testFlows, conf);
|
||||
return defer.promise;
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
},
|
||||
getSettings: function() {
|
||||
return when({});
|
||||
},
|
||||
saveSettings: function(s) {
|
||||
return when();
|
||||
}
|
||||
};
|
||||
function TestNode(n) {
|
||||
index.createNode(this, n);
|
||||
|
||||
this.id = 'tab1';
|
||||
this.type = 'test';
|
||||
this.name = 'barney';
|
||||
var node = this;
|
||||
|
||||
this.on("log", function() {
|
||||
// do nothing
|
||||
});
|
||||
}
|
||||
var logmsg = 'nothing logged yet';
|
||||
sinon.stub(log, 'warn', function(msg) {
|
||||
logmsg = msg;
|
||||
});
|
||||
var settings = {
|
||||
available: function() { return false;}
|
||||
}
|
||||
index.init({settings:settings, storage:storage});
|
||||
index.registerType('test', TestNode);
|
||||
index.loadFlows().then(function() {
|
||||
var testnode = new TestNode({id:'tab1',type:'test',name:'barney'});
|
||||
credentials.extract(testnode);
|
||||
log.warn.calledOnce.should.be.true;
|
||||
log.warn.restore();
|
||||
done();
|
||||
}).otherwise(function(err){
|
||||
log.warn.restore();
|
||||
done(err);
|
||||
});
|
||||
});
|
||||
|
||||
it('extract and store credential updates in the provided node', function(done) {
|
||||
credentials.init({saveCredentials:function(){}},express());
|
||||
credentials.register("test",{
|
||||
it('extract credential updates in the provided node', function(done) {
|
||||
credentials.init();
|
||||
var defintion = {
|
||||
user1:{type:"text"},
|
||||
password1:{type:"password"},
|
||||
user2:{type:"text"},
|
||||
@ -237,8 +141,12 @@ describe('Credentials', function() {
|
||||
user3:{type:"text"},
|
||||
password3:{type:"password"}
|
||||
|
||||
});
|
||||
credentials.add("node",{user1:"abc",password1:"123",user2:"def",password2:"456",user3:"ghi",password3:"789"});
|
||||
};
|
||||
credentials.register("test",defintion);
|
||||
var def = credentials.getDefinition("test");
|
||||
defintion.should.eql(def);
|
||||
|
||||
credentials.load({"node":{user1:"abc",password1:"123",user2:"def",password2:"456",user3:"ghi",password3:"789"}}).then(function() {
|
||||
var node = {id:"node",type:"test",credentials:{
|
||||
// user1 unchanged
|
||||
password1:"__PWRD__",
|
||||
@ -247,10 +155,12 @@ describe('Credentials', function() {
|
||||
user3:"newUser",
|
||||
password3:"newPassword"
|
||||
}};
|
||||
credentials.dirty().should.be.false;
|
||||
credentials.extract(node);
|
||||
|
||||
node.should.not.have.a.property("credentials");
|
||||
|
||||
credentials.dirty().should.be.true;
|
||||
var newCreds = credentials.get("node");
|
||||
newCreds.should.have.a.property("user1","abc");
|
||||
newCreds.should.have.a.property("password1","123");
|
||||
@ -261,4 +171,16 @@ describe('Credentials', function() {
|
||||
|
||||
done();
|
||||
});
|
||||
});
|
||||
it('extract ignores node without credentials', function(done) {
|
||||
credentials.init();
|
||||
credentials.load({"node":{user1:"abc",password1:"123"}}).then(function() {
|
||||
var node = {id:"node",type:"test"};
|
||||
|
||||
credentials.dirty().should.be.false;
|
||||
credentials.extract(node);
|
||||
credentials.dirty().should.be.false;
|
||||
done();
|
||||
});
|
||||
});
|
||||
})
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2014, 2015 IBM Corp.
|
||||
* Copyright 2014, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -30,8 +30,6 @@ describe('flows/index', function() {
|
||||
|
||||
var storage;
|
||||
var eventsOn;
|
||||
var credentialsExtract;
|
||||
var credentialsSave;
|
||||
var credentialsClean;
|
||||
var credentialsLoad;
|
||||
|
||||
@ -50,13 +48,10 @@ describe('flows/index', function() {
|
||||
|
||||
beforeEach(function() {
|
||||
eventsOn = sinon.spy(events,"on");
|
||||
credentialsExtract = sinon.stub(credentials,"extract",function(conf) {
|
||||
delete conf.credentials;
|
||||
});
|
||||
credentialsSave = sinon.stub(credentials,"save",function() {
|
||||
return when.resolve();
|
||||
});
|
||||
credentialsClean = sinon.stub(credentials,"clean",function(conf) {
|
||||
conf.forEach(function(n) {
|
||||
delete n.credentials;
|
||||
});
|
||||
return when.resolve();
|
||||
});
|
||||
credentialsLoad = sinon.stub(credentials,"load",function() {
|
||||
@ -97,8 +92,6 @@ describe('flows/index', function() {
|
||||
|
||||
afterEach(function(done) {
|
||||
eventsOn.restore();
|
||||
credentialsExtract.restore();
|
||||
credentialsSave.restore();
|
||||
credentialsClean.restore();
|
||||
credentialsLoad.restore();
|
||||
flowCreate.restore();
|
||||
@ -121,7 +114,6 @@ describe('flows/index', function() {
|
||||
];
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.setFlows(originalConfig).then(function() {
|
||||
credentialsExtract.called.should.be.false;
|
||||
credentialsClean.called.should.be.true;
|
||||
storage.hasOwnProperty('conf').should.be.true;
|
||||
flows.getFlows().should.eql(originalConfig);
|
||||
@ -136,8 +128,7 @@ describe('flows/index', function() {
|
||||
];
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.setFlows(originalConfig,"load").then(function() {
|
||||
credentialsExtract.called.should.be.false;
|
||||
credentialsClean.called.should.be.true;
|
||||
credentialsClean.called.should.be.false;
|
||||
// 'load' type does not trigger a save
|
||||
storage.hasOwnProperty('conf').should.be.false;
|
||||
flows.getFlows().should.eql(originalConfig);
|
||||
@ -148,18 +139,17 @@ describe('flows/index', function() {
|
||||
|
||||
it('extracts credentials from the full flow', function(done) {
|
||||
var originalConfig = [
|
||||
{id:"t1-1",x:10,y:10,z:"t1",type:"test",wires:[],credentials:{}},
|
||||
{id:"t1-1",x:10,y:10,z:"t1",type:"test",wires:[],credentials:{"a":1}},
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.setFlows(originalConfig).then(function() {
|
||||
credentialsExtract.called.should.be.true;
|
||||
credentialsClean.called.should.be.true;
|
||||
storage.hasOwnProperty('conf').should.be.true;
|
||||
var cleanedFlows = flows.getFlows();
|
||||
storage.conf.should.eql(cleanedFlows);
|
||||
storage.conf.flows.should.eql(cleanedFlows);
|
||||
cleanedFlows.should.not.eql(originalConfig);
|
||||
cleanedFlows[0].credentials = {};
|
||||
cleanedFlows[0].credentials = {"a":1};
|
||||
cleanedFlows.should.eql(originalConfig);
|
||||
done();
|
||||
});
|
||||
@ -175,7 +165,7 @@ describe('flows/index', function() {
|
||||
newConfig.push({id:"t2",type:"tab"});
|
||||
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -204,7 +194,7 @@ describe('flows/index', function() {
|
||||
newConfig.push({id:"t2",type:"tab"});
|
||||
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -232,13 +222,11 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.load().then(function() {
|
||||
credentialsExtract.called.should.be.false;
|
||||
credentialsLoad.called.should.be.true;
|
||||
credentialsClean.called.should.be.true;
|
||||
// 'load' type does not trigger a save
|
||||
storage.hasOwnProperty('conf').should.be.false;
|
||||
flows.getFlows().should.eql(originalConfig);
|
||||
@ -254,7 +242,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -274,7 +262,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
flows.init({settings:{},storage:storage});
|
||||
@ -293,7 +281,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.load().then(function() {
|
||||
@ -316,7 +304,7 @@ describe('flows/index', function() {
|
||||
|
||||
});
|
||||
|
||||
describe('#get',function() {
|
||||
describe.skip('#get',function() {
|
||||
|
||||
});
|
||||
|
||||
@ -327,7 +315,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.load().then(function() {
|
||||
@ -351,7 +339,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -376,7 +364,7 @@ describe('flows/index', function() {
|
||||
{id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -404,7 +392,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -430,7 +418,7 @@ describe('flows/index', function() {
|
||||
{id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
|
||||
events.once('nodes-started',function() {
|
||||
@ -505,7 +493,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
flows.init({settings:{},storage:storage});
|
||||
flows.load().then(function() {
|
||||
@ -529,7 +517,7 @@ describe('flows/index', function() {
|
||||
{id:"t1",type:"tab"}
|
||||
];
|
||||
storage.getFlows = function() {
|
||||
return when.resolve(originalConfig);
|
||||
return when.resolve({flows:originalConfig});
|
||||
}
|
||||
storage.setFlows = function() {
|
||||
return when.resolve();
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2014 IBM Corp.
|
||||
* Copyright 2014, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -41,17 +41,11 @@ describe("red/nodes/index", function() {
|
||||
var testFlows = [{"type":"test","id":"tab1","label":"Sheet 1"}];
|
||||
var storage = {
|
||||
getFlows: function() {
|
||||
return when(testFlows);
|
||||
},
|
||||
getCredentials: function() {
|
||||
return when({"tab1":{"b":1,"c":2}});
|
||||
return when({flows:testFlows,credentials:{"tab1":{"b":1,"c":2}}});
|
||||
},
|
||||
saveFlows: function(conf) {
|
||||
should.deepEqual(testFlows, conf);
|
||||
should.deepEqual(testFlows, conf.flows);
|
||||
return when();
|
||||
},
|
||||
saveCredentials: function(creds) {
|
||||
return when(true);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* Copyright 2014, 2015 IBM Corp.
|
||||
* Copyright 2014, 2016 IBM Corp.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -75,12 +75,14 @@ describe("red/storage/index", function() {
|
||||
},
|
||||
getFlows : function() {
|
||||
calledFlagGetFlows = true;
|
||||
return when.resolve([]);
|
||||
},
|
||||
saveFlows : function (flows) {
|
||||
flows.should.be.true;
|
||||
},
|
||||
getCredentials : function() {
|
||||
calledFlagGetCredentials = true;
|
||||
return when.resolve({});
|
||||
},
|
||||
saveCredentials : function(credentials) {
|
||||
credentials.should.be.true;
|
||||
@ -127,9 +129,7 @@ describe("red/storage/index", function() {
|
||||
|
||||
storage.init(moduleToLoad);
|
||||
storage.getFlows();
|
||||
storage.saveFlows(true);
|
||||
storage.getCredentials();
|
||||
storage.saveCredentials(true);
|
||||
storage.saveFlows({flows:[],credentials:{}});
|
||||
storage.getSettings();
|
||||
storage.saveSettings(true);
|
||||
storage.getSessions();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user