@rockcarver/frodo-lib 2.0.0-43 → 2.0.0-44

package/cjs/ops/CirclesOfTrustOps.js

@@ -19,6 +19,7 @@ exports.updateCircleOfTrust = updateCircleOfTrust;
 var _CirclesOfTrustApi = require("../api/CirclesOfTrustApi.js");
 var _Console = require("../utils/Console.js");
 var _ExportImportUtils = require("../utils/ExportImportUtils.js");
+var _Saml2Ops = require("./Saml2Ops.js");
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var _default = state => {
@@ -29,8 +30,11 @@ var _default = state => {
       });
     },
     readCirclesOfTrust() {
+      var _arguments = arguments;
       return _asyncToGenerator(function* () {
+        var entityProviders = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : [];
         return readCirclesOfTrust({
+          entityProviders,
           state
         });
       })();
@@ -69,6 +73,16 @@ var _default = state => {
         });
       })();
     },
+    deleteCirclesOfTrust() {
+      var _arguments2 = arguments;
+      return _asyncToGenerator(function* () {
+        var entityProviders = _arguments2.length > 0 && _arguments2[0] !== undefined ? _arguments2[0] : [];
+        return deleteCirclesOfTrust({
+          entityProviders,
+          state
+        });
+      })();
+    },
     exportCircleOfTrust(cotId) {
       return _asyncToGenerator(function* () {
         return exportCircleOfTrust({
@@ -78,8 +92,11 @@ var _default = state => {
       })();
     },
     exportCirclesOfTrust() {
+      var _arguments3 = arguments;
       return _asyncToGenerator(function* () {
+        var entityProviders = _arguments3.length > 0 && _arguments3[0] !== undefined ? _arguments3[0] : [];
         return exportCirclesOfTrust({
+          entityProviders,
           state
         });
       })();
@@ -102,9 +119,12 @@ var _default = state => {
       })();
     },
     importCirclesOfTrust(importData) {
+      var _arguments4 = arguments;
       return _asyncToGenerator(function* () {
+        var entityProviders = _arguments4.length > 1 && _arguments4[1] !== undefined ? _arguments4[1] : [];
         return importCirclesOfTrust({
           importData,
+          entityProviders,
           state
         });
       })();
@@ -177,7 +197,7 @@ function _readCirclesOfTrust() {
     } = yield (0, _CirclesOfTrustApi.getCirclesOfTrust)({
       state
     });
-    if (entityProviders.length > 0) {
+    if (entityProviders.length) {
       (0, _Console.debugMessage)({
         message: "CirclesOfTrustOps.getCirclesOfTrust: filtering results to entity providers: ".concat(entityProviders),
         state
@@ -240,10 +260,25 @@ function _createCircleOfTrust2() {
       state
     } = _ref4;
     if (cotId) cotData._id = cotId;
-    return (0, _CirclesOfTrustApi.createCircleOfTrust)({
-      cotData,
-      state
-    });
+    try {
+      var response = yield (0, _CirclesOfTrustApi.createCircleOfTrust)({
+        cotData,
+        state
+      });
+      return response;
+    } catch (error) {
+      var _error$response, _error$response2;
+      if (((_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.data) === null || _error$response === void 0 ? void 0 : _error$response.code) === 500 && ((_error$response2 = error.response) === null || _error$response2 === void 0 || (_error$response2 = _error$response2.data) === null || _error$response2 === void 0 ? void 0 : _error$response2.message) === "Unable to update entity provider's circle of trust") {
+        var _response = yield (0, _CirclesOfTrustApi.updateCircleOfTrust)({
+          cotId,
+          cotData,
+          state
+        });
+        return _response;
+      } else {
+        throw error;
+      }
+    }
   });
   return _createCircleOfTrust2.apply(this, arguments);
 }
@@ -262,11 +297,26 @@ function _updateCircleOfTrust2() {
       cotData,
       state
     } = _ref5;
-    return (0, _CirclesOfTrustApi.updateCircleOfTrust)({
-      cotId,
-      cotData,
-      state
-    });
+    try {
+      var response = yield (0, _CirclesOfTrustApi.updateCircleOfTrust)({
+        cotId,
+        cotData,
+        state
+      });
+      return response;
+    } catch (error) {
+      var _error$response3, _error$response4, _error$response5;
+      if (((_error$response3 = error.response) === null || _error$response3 === void 0 || (_error$response3 = _error$response3.data) === null || _error$response3 === void 0 ? void 0 : _error$response3.code) === 500 && (((_error$response4 = error.response) === null || _error$response4 === void 0 || (_error$response4 = _error$response4.data) === null || _error$response4 === void 0 ? void 0 : _error$response4.message) === "Unable to update entity provider's circle of trust" || ((_error$response5 = error.response) === null || _error$response5 === void 0 || (_error$response5 = _error$response5.data) === null || _error$response5 === void 0 ? void 0 : _error$response5.message) === 'An error occurred while updating the COT memberships')) {
+        var _response2 = yield (0, _CirclesOfTrustApi.updateCircleOfTrust)({
+          cotId,
+          cotData,
+          state
+        });
+        return _response2;
+      } else {
+        throw error;
+      }
+    }
   });
   return _updateCircleOfTrust2.apply(this, arguments);
 }
@@ -315,18 +365,15 @@ function _deleteCirclesOfTrust() {
         entityProviders,
         state
       });
-      cots = cots.filter(cot => {
-        for (var trustedProvider of cot.trustedProviders) {
-          var entityId = trustedProvider.split('|')[0];
-          if (!entityProviders.includes(entityId)) return false;
-        }
-        return true;
-      });
       for (var cot of cots) {
-        deleted.push(yield deleteCircleOfTrust({
-          cotId: cot._id,
-          state
-        }));
+        try {
+          deleted.push(yield deleteCircleOfTrust({
+            cotId: cot._id,
+            state
+          }));
+        } catch (error) {
+          errors.push(error);
+        }
       }
     } catch (error) {
       errors.push(error);
@@ -375,12 +422,12 @@ function _exportCircleOfTrust() {
     }
     if (errors.length) {
       var errorMessages = errors.map(error => {
-        var _error$response;
-        if (((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 404) {
+        var _error$response6;
+        if (((_error$response6 = error.response) === null || _error$response6 === void 0 ? void 0 : _error$response6.status) === 404) {
           return "Circle of trust ".concat(cotId, " does not exist in realm ").concat(state.getRealm());
         } else {
-          var _error$response2;
-          return ((_error$response2 = error.response) === null || _error$response2 === void 0 || (_error$response2 = _error$response2.data) === null || _error$response2 === void 0 ? void 0 : _error$response2.message) || error.message;
+          var _error$response7;
+          return ((_error$response7 = error.response) === null || _error$response7 === void 0 || (_error$response7 = _error$response7.data) === null || _error$response7 === void 0 ? void 0 : _error$response7.message) || error.message;
         }
       }).join('\n');
       throw new Error("Export error:\n".concat(errorMessages));
@@ -455,35 +502,73 @@ function _importCircleOfTrust() {
     var response = null;
     var errors = [];
     var imported = [];
-    for (var id of Object.keys(importData.saml.cot)) {
+    var _loop = function* _loop() {
       if (id === cotId) {
         try {
+          var validEntityIds = yield (0, _Saml2Ops.readSaml2EntityIds)({
+            state
+          });
+          var validProviders = validEntityIds.map(id => "".concat(id, "|saml2"));
           var _cotData2 = importData.saml.cot[id];
           delete _cotData2._rev;
+          // only allow adding valid providers
+          _cotData2.trustedProviders = validProviders.filter(value => _cotData2.trustedProviders.includes(value));
           try {
             response = yield createCircleOfTrust({
-              cotId: id,
+              cotId,
               cotData: _cotData2,
               state
             });
           } catch (createError) {
             var _createError$response;
-            if (((_createError$response = createError.response) === null || _createError$response === void 0 ? void 0 : _createError$response.status) === 409) response = yield updateCircleOfTrust({
-              cotId: id,
-              cotData: _cotData2,
-              state
-            });else throw createError;
+            if (((_createError$response = createError.response) === null || _createError$response === void 0 ? void 0 : _createError$response.status) === 409) {
+              (0, _Console.debugMessage)({
+                message: "Circle of trust: ".concat(cotId, " already exists, updating..."),
+                state
+              });
+              var existingCot = yield readCircleOfTrust({
+                cotId,
+                state
+              });
+              (0, _Console.debugMessage)({
+                message: "CirclesOfTrustOps.importCirclesOfTrust: Existing trusted providers for ".concat(cotId, ":\n").concat(existingCot.trustedProviders.map(it => it.split('|')[0]).join('\n'), "."),
+                state
+              });
+              var providers = [...new Set([...existingCot.trustedProviders, ..._cotData2.trustedProviders])];
+              (0, _Console.debugMessage)({
+                message: "CirclesOfTrustOps.importCirclesOfTrust: Merged trusted providers for ".concat(cotId, ":\n").concat(providers.map(it => it.split('|')[0]).join('\n'), "."),
+                state
+              });
+              if (providers.length > existingCot.trustedProviders.length) {
+                existingCot.trustedProviders = providers;
+                response = yield updateCircleOfTrust({
+                  cotId,
+                  cotData: existingCot,
+                  state
+                });
+              } else {
+                (0, _Console.debugMessage)({
+                  message: "CirclesOfTrustOps.importCirclesOfTrust: No new trusted providers for ".concat(cotId, "."),
+                  state
+                });
+              }
+            } else {
+              throw createError;
+            }
           }
           imported.push(id);
         } catch (error) {
           errors.push(error);
         }
       }
+    };
+    for (var id of Object.keys(importData.saml.cot)) {
+      yield* _loop();
     }
     if (errors.length) {
       var errorMessages = errors.map(error => {
-        var _error$response3;
-        return ((_error$response3 = error.response) === null || _error$response3 === void 0 || (_error$response3 = _error$response3.data) === null || _error$response3 === void 0 ? void 0 : _error$response3.message) || error.message;
+        var _error$response8;
+        return JSON.stringify((_error$response8 = error.response) === null || _error$response8 === void 0 ? void 0 : _error$response8.data) || error.message;
       }).join('\n');
       throw new Error("Import error:\n".concat(errorMessages));
     }
@@ -510,33 +595,72 @@ function _importFirstCircleOfTrust() {
     var response = null;
     var errors = [];
     var imported = [];
-    for (var id of Object.keys(importData.saml.cot)) {
+    var _loop2 = function* _loop2() {
       try {
-        var _cotData3 = importData.saml.cot[id];
+        var validEntityIds = yield (0, _Saml2Ops.readSaml2EntityIds)({
+          state
+        });
+        var validProviders = validEntityIds.map(id => "".concat(id, "|saml2"));
+        var _cotData3 = importData.saml.cot[_cotId];
         delete _cotData3._rev;
+        // only allow adding valid providers
+        _cotData3.trustedProviders = validProviders.filter(value => _cotData3.trustedProviders.includes(value));
         try {
           response = yield createCircleOfTrust({
+            cotId: _cotId,
             cotData: _cotData3,
             state
           });
         } catch (createError) {
           var _createError$response2;
-          if (((_createError$response2 = createError.response) === null || _createError$response2 === void 0 ? void 0 : _createError$response2.status) === 409) response = yield updateCircleOfTrust({
-            cotId: id,
-            cotData: _cotData3,
-            state
-          });else throw createError;
+          if (((_createError$response2 = createError.response) === null || _createError$response2 === void 0 ? void 0 : _createError$response2.status) === 409) {
+            (0, _Console.debugMessage)({
+              message: "Circle of trust: ".concat(_cotId, " already exists, updating..."),
+              state
+            });
+            var existingCot = yield readCircleOfTrust({
+              cotId: _cotId,
+              state
+            });
+            (0, _Console.debugMessage)({
+              message: "CirclesOfTrustOps.importCirclesOfTrust: Existing trusted providers for ".concat(_cotId, ":\n").concat(existingCot.trustedProviders.map(it => it.split('|')[0]).join('\n'), "."),
+              state
+            });
+            var providers = [...new Set([...existingCot.trustedProviders, ..._cotData3.trustedProviders])];
+            (0, _Console.debugMessage)({
+              message: "CirclesOfTrustOps.importCirclesOfTrust: Merged trusted providers for ".concat(_cotId, ":\n").concat(providers.map(it => it.split('|')[0]).join('\n'), "."),
+              state
+            });
+            if (providers.length > existingCot.trustedProviders.length) {
+              existingCot.trustedProviders = providers;
+              response = yield updateCircleOfTrust({
+                cotId: _cotId,
+                cotData: existingCot,
+                state
+              });
+            } else {
+              (0, _Console.debugMessage)({
+                message: "CirclesOfTrustOps.importCirclesOfTrust: No new trusted providers for ".concat(_cotId, "."),
+                state
+              });
+            }
+          } else {
+            throw createError;
+          }
         }
-        imported.push(id);
+        imported.push(_cotId);
       } catch (error) {
         errors.push(error);
       }
-      break;
+      return 1; // break
+    };
+    for (var _cotId of Object.keys(importData.saml.cot)) {
+      if (yield* _loop2()) break;
     }
     if (errors.length) {
       var errorMessages = errors.map(error => {
-        var _error$response4;
-        return ((_error$response4 = error.response) === null || _error$response4 === void 0 || (_error$response4 = _error$response4.data) === null || _error$response4 === void 0 ? void 0 : _error$response4.message) || error.message;
+        var _error$response9;
+        return ((_error$response9 = error.response) === null || _error$response9 === void 0 || (_error$response9 = _error$response9.data) === null || _error$response9 === void 0 ? void 0 : _error$response9.message) || error.message;
       }).join('\n');
       throw new Error("Import error:\n".concat(errorMessages));
     }
@@ -557,57 +681,121 @@ function _importCirclesOfTrust() {
       importData,
       state
     } = _ref12;
-    var response = [];
+    var responses = [];
     var errors = [];
     var imported = [];
     entityProviders = entityProviders.map(id => "".concat(id, "|saml2"));
-    for (var _cotId of Object.keys(importData.saml.cot)) {
+    var validEntityIds = yield (0, _Saml2Ops.readSaml2EntityIds)({
+      state
+    });
+    var validProviders = validEntityIds.map(id => "".concat(id, "|saml2"));
+    var _loop3 = function* _loop3() {
       try {
-        var _cotData4 = importData.saml.cot[_cotId];
+        var _cotData4 = importData.saml.cot[_cotId2];
         delete _cotData4._rev;
-        var hasEntityId = false;
-        for (var trustedProvider of _cotData4.trustedProviders) {
-          if (!hasEntityId && entityProviders.includes(trustedProvider)) {
-            hasEntityId = true;
+        // apply filter and merge logic
+        if (entityProviders.length) {
+          // only allow filtering for valid providers
+          entityProviders = validProviders.filter(value => entityProviders.includes(value));
+          // determine if cot import candidate matches entity providers filter
+          var hasEntityId = false;
+          for (var trustedProvider of _cotData4.trustedProviders) {
+            if (!hasEntityId && entityProviders.includes(trustedProvider)) {
+              hasEntityId = true;
+            }
+          }
+          if (hasEntityId) {
+            try {
+              var response = yield createCircleOfTrust({
+                cotId: _cotId2,
+                cotData: _cotData4,
+                state
+              });
+              imported.push(_cotId2);
+              responses.push(response);
+            } catch (createError) {
+              var _createError$response3;
+              if (((_createError$response3 = createError.response) === null || _createError$response3 === void 0 ? void 0 : _createError$response3.status) === 409) {
+                (0, _Console.debugMessage)({
+                  message: "Circle of trust: ".concat(_cotId2, " already exists, updating..."),
+                  state
+                });
+                var existingCot = yield readCircleOfTrust({
+                  cotId: _cotId2,
+                  state
+                });
+                (0, _Console.debugMessage)({
+                  message: "CirclesOfTrustOps.importCirclesOfTrust: Existing trusted providers for ".concat(_cotId2, ":\n").concat(existingCot.trustedProviders.map(it => it.split('|')[0]).join('\n'), "."),
+                  state
+                });
+                var providers = [...new Set([...existingCot.trustedProviders, ...entityProviders])];
+                (0, _Console.debugMessage)({
+                  message: "CirclesOfTrustOps.importCirclesOfTrust: Updated trusted providers for ".concat(_cotId2, ":\n").concat(providers.map(it => it.split('|')[0]).join('\n'), "."),
+                  state
+                });
+                if (providers.length > existingCot.trustedProviders.length) {
+                  existingCot.trustedProviders = providers;
+                  var _response3 = yield updateCircleOfTrust({
+                    cotId: _cotId2,
+                    cotData: existingCot,
+                    state
+                  });
+                  imported.push(_cotId2);
+                  responses.push(_response3);
+                } else {
+                  (0, _Console.debugMessage)({
+                    message: "CirclesOfTrustOps.importCirclesOfTrust: No new trusted providers for ".concat(_cotId2, "."),
+                    state
+                  });
+                }
+              } else {
+                throw createError;
+              }
+            }
           }
         }
-        if (entityProviders.length === 0 || hasEntityId) {
+        // import unfiltered but merge if existing cot
+        else {
+          // only allow adding valid providers
+          _cotData4.trustedProviders = validProviders.filter(value => _cotData4.trustedProviders.includes(value));
           try {
-            response.push(yield createCircleOfTrust({
-              cotId: _cotId,
+            var _response4 = yield createCircleOfTrust({
+              cotId: _cotId2,
               cotData: _cotData4,
               state
-            }));
+            });
+            responses.push(_response4);
           } catch (createError) {
-            var _createError$response3;
-            if (((_createError$response3 = createError.response) === null || _createError$response3 === void 0 ? void 0 : _createError$response3.status) === 409) {
+            var _createError$response4;
+            if (((_createError$response4 = createError.response) === null || _createError$response4 === void 0 ? void 0 : _createError$response4.status) === 409) {
               (0, _Console.debugMessage)({
-                message: "Circle of trust: ".concat(_cotId, " already exists, updating..."),
+                message: "Circle of trust: ".concat(_cotId2, " already exists, updating..."),
                 state
               });
-              var existingCot = yield readCircleOfTrust({
-                cotId: _cotId,
+              var _existingCot = yield readCircleOfTrust({
+                cotId: _cotId2,
                 state
               });
               (0, _Console.debugMessage)({
-                message: "CirclesOfTrustOps.importCirclesOfTrust: Existing trusted providers for ".concat(_cotId, ":\n").concat(existingCot.trustedProviders.map(it => it.split('|')[0]).join('\n'), "."),
+                message: "CirclesOfTrustOps.importCirclesOfTrust: Existing trusted providers for ".concat(_cotId2, ":\n").concat(_existingCot.trustedProviders.map(it => it.split('|')[0]).join('\n'), "."),
                 state
               });
-              var providers = [...new Set([...existingCot.trustedProviders, ...entityProviders])];
+              var _providers = [...new Set([..._existingCot.trustedProviders, ..._cotData4.trustedProviders])];
               (0, _Console.debugMessage)({
-                message: "CirclesOfTrustOps.importCirclesOfTrust: Updated trusted providers for ".concat(_cotId, ":\n").concat(providers.map(it => it.split('|')[0]).join('\n'), "."),
+                message: "CirclesOfTrustOps.importCirclesOfTrust: Merged trusted providers for ".concat(_cotId2, ":\n").concat(_providers.map(it => it.split('|')[0]).join('\n'), "."),
                 state
               });
-              if (providers.length > existingCot.trustedProviders.length) {
-                existingCot.trustedProviders = providers;
-                response.push(yield updateCircleOfTrust({
-                  cotId: _cotId,
-                  cotData: existingCot,
+              if (_providers.length > _existingCot.trustedProviders.length) {
+                _existingCot.trustedProviders = _providers;
+                var _response5 = yield updateCircleOfTrust({
+                  cotId: _cotId2,
+                  cotData: _existingCot,
                   state
-                }));
+                });
+                responses.push(_response5);
               } else {
                 (0, _Console.debugMessage)({
-                  message: "CirclesOfTrustOps.importCirclesOfTrust: No new trusted providers for ".concat(_cotId, "."),
+                  message: "CirclesOfTrustOps.importCirclesOfTrust: No new trusted providers for ".concat(_cotId2, "."),
                   state
                 });
               }
@@ -616,27 +804,30 @@ function _importCirclesOfTrust() {
             }
           }
         }
-        imported.push(_cotId);
       } catch (error) {
-        var _error$response5, _error$response6;
+        var _error$response11, _error$response12;
         (0, _Console.debugMessage)({
-          message: "Error ".concat((_error$response5 = error.response) === null || _error$response5 === void 0 ? void 0 : _error$response5.status, " creating/updating circle of trust: ").concat((_error$response6 = error.response) === null || _error$response6 === void 0 || (_error$response6 = _error$response6.data) === null || _error$response6 === void 0 ? void 0 : _error$response6.message),
+          message: "Error ".concat((_error$response11 = error.response) === null || _error$response11 === void 0 ? void 0 : _error$response11.status, " creating/updating circle of trust: ").concat((_error$response12 = error.response) === null || _error$response12 === void 0 || (_error$response12 = _error$response12.data) === null || _error$response12 === void 0 ? void 0 : _error$response12.message),
           state
         });
         errors.push(error);
       }
+      imported.push(_cotId2);
+    };
+    for (var _cotId2 of Object.keys(importData.saml.cot)) {
+      yield* _loop3();
     }
     if (errors.length) {
       var errorMessages = errors.map(error => {
-        var _error$response7;
-        return ((_error$response7 = error.response) === null || _error$response7 === void 0 || (_error$response7 = _error$response7.data) === null || _error$response7 === void 0 ? void 0 : _error$response7.message) || error.message;
+        var _error$response10;
+        return ((_error$response10 = error.response) === null || _error$response10 === void 0 || (_error$response10 = _error$response10.data) === null || _error$response10 === void 0 ? void 0 : _error$response10.message) || error.message;
       }).join('\n');
       throw new Error("".concat(errorMessages));
     }
     if (0 === imported.length) {
       throw new Error("Import error:\nNo circles of trust found in import data!");
     }
-    return response;
+    return responses;
   });
   return _importCirclesOfTrust.apply(this, arguments);
 }