chore(services): Remove fetchr and associated services

api-server/common/utils/services-creator.js

@@ -1,44 +0,0 @@
-import { Observable, Disposable } from 'rx';
-import Fetchr from 'fetchr';
-
-function callbackObserver(observer) {
-  return (err, res) => {
-    if (err) {
-      return observer.onError(err);
-    }
-
-    observer.onNext(res);
-    return observer.onCompleted();
-  };
-}
-
-export default function servicesCreator(options) {
-  const services = new Fetchr(options);
-  function readService$({ service: resource, params, config }) {
-    return Observable.create(observer => {
-      services.read(
-        resource,
-        params,
-        config,
-        callbackObserver(observer)
-      );
-      return Disposable.create(() => observer.dispose());
-    });
-  }
-  function createService$({ service: resource, params, body, config }) {
-    return Observable.create(observer => {
-      services.create(
-        resource,
-        params,
-        body,
-        config,
-        callbackObserver(observer)
-      );
-      return Disposable.create(() => observer.dispose());
-    });
-  }
-  return {
-    readService$,
-    createService$
-  };
-}

api-server/package-lock.json

@@ -3022,11 +3022,6 @@
         }
       }
     },
-    "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
-    },
     "domelementtype": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
@@ -3948,26 +3943,6 @@
       "integrity": "sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA=",
       "dev": true
     },
-    "fetchr": {
-      "version": "0.5.37",
-      "resolved": "https://registry.npmjs.org/fetchr/-/fetchr-0.5.37.tgz",
-      "integrity": "sha1-SE3un0chWifV8ZuWFlviTgJI3mI=",
-      "requires": {
-        "debug": "^2.6.3",
-        "es6-promise": "^4.0.2",
-        "fumble": "^0.1.0",
-        "lodash": "^4.0.1",
-        "object-assign": "^4.0.1",
-        "xhr": "^2.4.0"
-      },
-      "dependencies": {
-        "es6-promise": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-          "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
-        }
-      }
-    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -4342,6 +4317,7 @@
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
       "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
       "requires": {
         "is-callable": "^1.1.3"
       }
@@ -5012,22 +4988,6 @@
         }
       }
     },
-    "fumble": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/fumble/-/fumble-0.1.3.tgz",
-      "integrity": "sha1-AMepcEG4X6vNwsO6tzCzyQw7QIQ=",
-      "requires": {
-        "camelcase": "^3.0.0",
-        "http-status": "^0.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -5162,15 +5122,6 @@
         }
       }
     },
-    "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
-      "requires": {
-        "min-document": "^2.19.0",
-        "process": "~0.5.1"
-      }
-    },
     "global-dirs": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
@@ -5477,11 +5428,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "http-status": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/http-status/-/http-status-0.2.5.tgz",
-      "integrity": "sha1-l2+RB36nv8FSd8vPjIDE1cUbSbA="
-    },
     "httpntlm": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
@@ -5759,7 +5705,8 @@
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
     },
     "is-ci": {
       "version": "1.2.0",
@@ -5855,11 +5802,6 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
-    "is-function": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
-      "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU="
-    },
     "is-glob": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
@@ -7560,14 +7502,6 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "requires": {
-        "dom-walk": "^0.1.0"
-      }
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -8569,15 +8503,6 @@
         }
       }
     },
-    "parse-headers": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz",
-      "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=",
-      "requires": {
-        "for-each": "^0.3.2",
-        "trim": "0.0.1"
-      }
-    },
     "parse-ms": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz",
@@ -9028,11 +8953,6 @@
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
-    "process": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
-    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -11491,7 +11411,8 @@
     "trim": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
+      "dev": true
     },
     "trim-newlines": {
       "version": "1.0.0",
@@ -12035,17 +11956,6 @@
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
       "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
     },
-    "xhr": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz",
-      "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==",
-      "requires": {
-        "global": "~4.3.0",
-        "is-function": "^1.0.1",
-        "parse-headers": "^2.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "xml2js": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",

api-server/package.json

@@ -47,7 +47,6 @@
     "express-session": "^1.12.1",
     "express-state": "^1.2.0",
     "express-validator": "^5.0.3",
-    "fetchr": "^0.5.37",
     "googleapis": "^16.1.0",
     "helmet": "^3.1.0",
     "helmet-csp": "^2.1.0",

api-server/server/boot/a-services.js

@@ -1,13 +0,0 @@
-import Fetchr from 'fetchr';
-import getUserServices from '../services/user';
-
-export default function bootServices(app) {
-
-  const user = getUserServices(app);
-
-  Fetchr.registerFetcher(user);
-
-  const middleware = Fetchr.middleware();
-  app.use('/external/services', middleware);
-  app.use('/internal/services', middleware);
-}