@dhi-solutions/domain-services - npm Package Compare versions

Comparing version 0.0.15 to 0.0.16

CHANGELOG.md

@@ -6,2 +6,10 @@ # Change Log
 
+## [0.0.16](https://github.com/DHI-Solutions/nomads/compare/@dhi-solutions/domain-services@0.0.15...@dhi-solutions/domain-services@0.0.16) (2020-03-11)
+
+**Note:** Version bump only for package @dhi-solutions/domain-services
+
+
+
+
+
 ## [0.0.15](https://github.com/DHI-Solutions/nomads/compare/@dhi-solutions/domain-services@0.0.14...@dhi-solutions/domain-services@0.0.15) (2020-03-11)
@@ -8,0 +16,0 @@

dist/authentication/getUser.js

@@ -10,11 +10,11 @@ "use strict";
 
-var _options = _interopRequireDefault(require("../options"));
+var _options = require("../options");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var localStorageUserKey = _options["default"].localStorageUserKey;
-
 var _default = function _default() {
-  var user = _store["default"].get(localStorageUserKey);
+  var localStorageKey = (0, _options.getOption)('localStorageKey');
 
+  var user = _store["default"].get(localStorageKey + '/USER');
+
   return user;
@@ -21,0 +21,0 @@ };

dist/authentication/isLoggedIn.js

@@ -12,11 +12,11 @@ "use strict";
 
-var _options = _interopRequireDefault(require("../options"));
+var _options = require("../options");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var localStorageUserKey = _options["default"].localStorageUserKey;
-
 var _default = function _default() {
-  var user = _store["default"].get(localStorageUserKey);
+  var localStorageKey = (0, _options.getOption)('localStorageKey');
 
+  var user = _store["default"].get(localStorageKey + '/USER');
+
   var token = user.accessToken;
@@ -23,0 +23,0 @@ var isTokenValid = !(0, _isNil["default"])(token);

dist/authentication/login.js

@@ -12,3 +12,3 @@ "use strict";
 
-var _options = _interopRequireDefault(require("../options"));
+var _options = require("../options");
 
@@ -31,7 +31,5 @@ var _mapUser = _interopRequireDefault(require("./lib/mapUser"));
 
-var localStorageUserKey = _options["default"].localStorageUserKey;
-
 var _default = function () {
   var _ref2 = _asyncToGenerator(regeneratorRuntime.mark(function _callee(_ref) {
-    var id, password, _ref$config, config, endpoint, validationEndpoint, tokenEndpoint, body, validationResponse, userData, tokenResponse, tokenData, accessToken, token, mappedUser, user;
+    var id, password, _ref$config, config, endpoint, validationEndpoint, tokenEndpoint, body, validationResponse, userData, tokenResponse, tokenData, accessToken, token, mappedUser, user, localStorageKey;
 
@@ -89,13 +87,14 @@ return regeneratorRuntime.wrap(function _callee$(_context) {
             user = _objectSpread({}, mappedUser, {}, tokenData);
+            localStorageKey = (0, _options.getOption)('localStorageKey');
 
-            _store["default"].set(localStorageUserKey, user);
+            _store["default"].set(localStorageKey + '/USER', user);
 
             return _context.abrupt("return", Promise.resolve(user));
 
-          case 28:
-            _context.prev = 28;
+          case 29:
+            _context.prev = 29;
             _context.t0 = _context["catch"](1);
             return _context.abrupt("return", Promise.reject(_context.t0.response));
 
-          case 31:
+          case 32:
           case "end":
@@ -105,3 +104,3 @@ return _context.stop();
       }
-    }, _callee, null, [[1, 28]]);
+    }, _callee, null, [[1, 29]]);
   }));
@@ -108,0 +107,0 @@

dist/authentication/logout.js

@@ -12,3 +12,3 @@ "use strict";
 
-var _options = _interopRequireDefault(require("../options"));
+var _options = require("../options");
 
@@ -21,5 +21,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var localStorageUserKey = _options["default"].localStorageUserKey;
-
 var _default = _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
+  var localStorageKey;
   return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -34,12 +33,14 @@ while (1) {
         case 3:
-          _store["default"].remove(localStorageUserKey);
+          localStorageKey = (0, _options.getOption)('localStorageKey');
 
+          _store["default"].remove(localStorageKey + '/USER');
+
           return _context.abrupt("return", Promise.resolve());
 
-        case 7:
-          _context.prev = 7;
+        case 8:
+          _context.prev = 8;
           _context.t0 = _context["catch"](0);
           return _context.abrupt("return", Promise.reject(_context.t0.response));
 
-        case 10:
+        case 11:
         case "end":
@@ -49,5 +50,5 @@ return _context.stop();
     }
-  }, _callee, null, [[0, 7]]);
+  }, _callee, null, [[0, 8]]);
 }));
 
 exports["default"] = _default;

dist/index.d.ts

@@ -1,7 +0,9 @@
-import initialize from './initialize';
+import { AxiosInstance } from 'axios';
 import authentication from './authentication';
-export { initialize, authentication };
-export declare const API: import("axios").AxiosInstance;
+import * as Types from './types';
+export { authentication };
+export declare let API: AxiosInstance;
+export declare const initialize: ({ config, localStorageKey, }: Types.IInitialize) => void;
 export declare const getDataAsJSON: (response: any) => Promise<any>;
 export declare const setDataAsString: (response: any) => Promise<any>;
 export default API;

dist/index.js

@@ -6,8 +6,2 @@ "use strict";
 });
-Object.defineProperty(exports, "initialize", {
-  enumerable: true,
-  get: function get() {
-    return _initialize["default"];
-  }
-});
 Object.defineProperty(exports, "authentication", {
@@ -19,3 +13,3 @@ enumerable: true,
 });
-exports["default"] = exports.setDataAsString = exports.getDataAsJSON = exports.API = void 0;
+exports["default"] = exports.setDataAsString = exports.getDataAsJSON = exports.initialize = exports.API = void 0;
 
@@ -26,8 +20,12 @@ var _axios = _interopRequireDefault(require("axios"));
 
-var _initialize = _interopRequireDefault(require("./initialize"));
-
 var _authentication = _interopRequireDefault(require("./authentication"));
 
+var _options = require("./options");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+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); }); }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -39,15 +37,20 @@
 
-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); } }
+var API;
+exports.API = API;
 
-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 initialize = function initialize(_ref) {
+  var _ref$config = _ref.config,
+      config = _ref$config === void 0 ? {} : _ref$config,
+      localStorageKey = _ref.localStorageKey;
+  (0, _options.setOption)('localStorageKey', localStorageKey);
+  exports.API = API = _axios["default"].create(_objectSpread({
+    responseType: 'json'
+  }, config));
+};
 
-var API = _axios["default"].create({
-  responseType: 'json'
-});
+exports.initialize = initialize;
 
-exports.API = API;
-
 var getDataAsJSON = function () {
-  var _ref = _asyncToGenerator(regeneratorRuntime.mark(function _callee(response) {
-    var _ref2, dataAsString, isDataArray, getParsedItem, dataAsJSON;
+  var _ref2 = _asyncToGenerator(regeneratorRuntime.mark(function _callee(response) {
+    var _ref3, dataAsString, isDataArray, getParsedItem, dataAsJSON;
 
@@ -58,3 +61,3 @@ return regeneratorRuntime.wrap(function _callee$(_context) {
           case 0:
-            _ref2 = response || {}, dataAsString = _ref2.data;
+            _ref3 = response || {}, dataAsString = _ref3.data;
             isDataArray = (0, _isArray["default"])(dataAsString);
@@ -83,3 +86,3 @@
   return function getDataAsJSON(_x) {
-    return _ref.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
@@ -91,4 +94,4 @@ }();
 var setDataAsString = function () {
-  var _ref3 = _asyncToGenerator(regeneratorRuntime.mark(function _callee2(response) {
-    var _ref4, dataAsJSON, isDataArray, getStringifiedItem, dataAsString;
+  var _ref4 = _asyncToGenerator(regeneratorRuntime.mark(function _callee2(response) {
+    var _ref5, dataAsJSON, isDataArray, getStringifiedItem, dataAsString;
 
@@ -99,3 +102,3 @@ return regeneratorRuntime.wrap(function _callee2$(_context2) {
           case 0:
-            _ref4 = response || {}, dataAsJSON = _ref4.data;
+            _ref5 = response || {}, dataAsJSON = _ref5.data;
             isDataArray = (0, _isArray["default"])(dataAsJSON);
@@ -124,3 +127,3 @@
   return function setDataAsString(_x2) {
-    return _ref3.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
@@ -127,0 +130,0 @@ }();

dist/options.d.ts

@@ -1,5 +0,2 @@
-export interface IOptions {
-    localStorageUserKey: string;
-}
-declare const _default: IOptions;
-export default _default;
+export declare const getOption: (option: string, defaultValue?: any) => any;
+export declare const setOption: (option: string, value?: any) => {};

dist/options.js

@@ -6,6 +6,24 @@ "use strict";
 });
-exports["default"] = void 0;
-var _default = {
-  localStorageUserKey: 'DHI_USER_DATA'
+exports.setOption = exports.getOption = void 0;
+
+var _get = _interopRequireDefault(require("lodash/get"));
+
+var _set = _interopRequireDefault(require("lodash/set"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var options = {};
+
+var getOption = function getOption(option) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  return (0, _get["default"])(options, option, defaultValue);
 };
-exports["default"] = _default;
+
+exports.getOption = getOption;
+
+var setOption = function setOption(option) {
+  var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  return (0, _set["default"])(options, option, value);
+};
+
+exports.setOption = setOption;

package.json

 {
   "name": "@dhi-solutions/domain-services",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "side-effects": false,
@@ -29,3 +29,3 @@ "main": "dist/index.js",
   },
-  "gitHead": "53149e24be3fdbcb414bdb1c304fa17e290cc427"
+  "gitHead": "6b610575e28abffd61fe2170add8b2b902661510"
 }

No alert changes

Improved metrics

Total package byte prevSize

28002

increased by1.27%

Worsened metrics

Lines of code

486

decreased by-1.62%

No dependency changes