added, client db url similarity validation to fix issue where source …

…and target clients would bee matched even when the url is different
SkeloGH · Jan 2, 2020 · 261a484 · 261a484
1 parent 3969f5a
commit 261a484
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bin/__tests__/commands/add/client.test.js b/bin/__tests__/commands/add/client.test.js
@@ -29,6 +29,7 @@ describe('weaver add client command tests', () => {
       'isSameFamily',
       'isSameType',
       'isSameName',
+      'isSameURL',
       'validateParams',
       'validateConfig',
     ];

diff --git a/bin/commands/add/client.js b/bin/commands/add/client.js
@@ -12,6 +12,7 @@ const commandDesc = 'Interactive creation of a new client';
 const isSameFamily = (c, _c) => c.family === _c.family;
 const isSameType = (c, _c) => c.type === _c.type;
 const isSameName = (c, _c) => c.db.name === _c.name;
+const isSameURL = (c, _c) => c.db.url === _c.url;
 
 const clientExists = (client) => {
   const config = { ...getConfig() };
@@ -21,8 +22,9 @@ const clientExists = (client) => {
     const matchFam = isSameFamily(c, client);
     const matchName = isSameName(c, client);
     const matchType = isSameType(c, client);
-    const isSibling = matchFam && matchName && matchType;
-    const sourceIsTarget = matchFam && matchName && !matchType;
+    const matchUrl = isSameURL(c, client);
+    const isSibling = matchFam && matchName && matchType && matchUrl;
+    const sourceIsTarget = matchFam && matchName && !matchType && matchUrl;
     if (isSibling) res.message = 'Error: client exists';
     if (sourceIsTarget) res.message = 'Error: source and target clients are the same';
     return isSibling || sourceIsTarget;
@@ -150,6 +152,7 @@ module.exports = {
   isSameFamily,
   isSameType,
   isSameName,
+  isSameURL,
   validateParams,
   validateConfig,
 };