@panneau/data 1.0.0-alpha.15 → 1.0.0-alpha.170

package/es/index.js

@@ -3,8 +3,8 @@ import React, { useState, useCallback, useEffect, useRef, useMemo, useContext }
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import PropTypes from 'prop-types';
 import { useUrlGenerator } from '@panneau/core/contexts';
+import PropTypes from 'prop-types';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _assertThisInitialized from '@babel/runtime/helpers/assertThisInitialized';
 import _inherits from '@babel/runtime/helpers/inherits';
@@ -94,15 +94,17 @@ var useItems = function useItems(_ref) {
       initialPages = _ref$pages === void 0 ? null : _ref$pages,
       _ref$getPageFromRespo = _ref.getPageFromResponse,
       getPageFromResponse = _ref$getPageFromRespo === void 0 ? function (_ref2) {
-    var _ref2$meta = _ref2.meta,
-        currentPage = _ref2$meta.current_page,
-        lastPage = _ref2$meta.last_page,
-        total = _ref2$meta.total,
+    var _ref2$pagination = _ref2.pagination,
+        currentPage = _ref2$pagination.page,
+        lastPage = _ref2$pagination.last_page,
+        total = _ref2$pagination.total,
+        perPage = _ref2$pagination.per_page,
         items = _ref2.data;
     return {
       page: parseInt(currentPage, 10),
       lastPage: parseInt(lastPage, 10),
       total: parseInt(total, 10),
+      count: parseInt(perPage, 10),
       items: items
     };
   } : _ref$getPageFromRespo,
@@ -326,13 +328,16 @@ var Base = /*#__PURE__*/function () {
       routes: {},
       generateUrl: null
     }, opts), {}, {
-      baseUrl: opts.baseUrl
+      baseUrl: opts.baseUrl,
+      onUnauthorized: opts.onUnauthorized || null
     });
   }
 
   _createClass(Base, [{
     key: "requestGet",
     value: function requestGet(path) {
+      var _this = this;
+
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var queryString = query !== null ? stringify(query, {
         arrayFormat: 'bracket'
@@ -340,41 +345,59 @@ var Base = /*#__PURE__*/function () {
       return getJSON("".concat(this.getFullUrl(path)).concat(queryString !== null && queryString.length > 0 ? "?".concat(queryString) : ''), {
         credentials: 'include',
         headers: getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this.onError(error);
       });
     }
   }, {
     key: "requestPost",
     value: function requestPost(path, data) {
+      var _this2 = this;
+
       return postJSON(this.getFullUrl(path), data, {
         credentials: 'include',
         headers: getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this2.onError(error);
       });
     }
   }, {
     key: "requestPut",
     value: function requestPut(path, data) {
+      var _this3 = this;
+
       return postJSON(this.getFullUrl(path), _objectSpread({
         _method: 'PUT'
       }, data), {
         credentials: 'include',
         headers: getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this3.onError(error);
       });
     }
   }, {
     key: "requestPatch",
     value: function requestPatch(path, data) {
+      var _this4 = this;
+
       return postJSON(this.getFullUrl(path), _objectSpread({
         _method: 'PATCH'
       }, data), {
         credentials: 'include',
         headers: getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this4.onError(error);
       });
     }
   }, {
     key: "requestDelete",
     value: function requestDelete(path) {
+      var _this5 = this;
+
       return this.requestPost(path, {
         _method: 'DELETE'
+      })["catch"](function (error) {
+        return _this5.onError(error);
       });
     }
   }, {
@@ -398,6 +421,23 @@ var Base = /*#__PURE__*/function () {
           baseUrl = _this$options$baseUrl === void 0 ? null : _this$options$baseUrl;
       return baseUrl !== null ? "".concat(baseUrl.replace(/\/$/, ''), "/").concat(path.replace(/^\//, '')) : path;
     }
+  }, {
+    key: "onError",
+    value: function onError(err) {
+      var onUnauthorized = this.options.onUnauthorized;
+
+      var _ref = err || {},
+          _ref$status = _ref.status,
+          status = _ref$status === void 0 ? null : _ref$status;
+
+      var statusCode = parseInt(status, 10); // If status is refused and callback exists
+
+      if ((statusCode === 401 || statusCode === 419) && onUnauthorized !== null) {
+        return onUnauthorized();
+      }
+
+      throw err;
+    }
   }]);
 
   return Base;
@@ -446,10 +486,13 @@ var AuthApi = /*#__PURE__*/function () {
   }, {
     key: "logout",
     value: function logout() {
-      var withCredentials = this.options.withCredentials;
-      return this.api.fetchPost(this.api.route('auth.logout'), null, {
-        withSession: !withCredentials,
-        withCredentials: withCredentials
+      var url = this.api.getFullUrl(this.api.route('auth.logout'));
+      return fetch(url, {
+        method: 'POST',
+        headers: _objectSpread({}, getCSRFHeaders()),
+        credentials: 'include'
+      })["catch"](function (err) {
+        console.log('logout err', err); // eslint-disable-line
       });
     }
   }, {
@@ -727,22 +770,26 @@ var useApi = function useApi() {
 var propTypes$1 = {
   api: PropTypes.instanceOf(Api),
   baseUrl: PropTypes.string,
+  onUnauthorized: PropTypes.func,
   children: PropTypes.node.isRequired
 };
 var defaultProps$1 = {
   api: null,
+  onUnauthorized: null,
   baseUrl: undefined
 };
 var ApiProvider = function ApiProvider(_ref) {
   var initialApi = _ref.api,
       baseUrl = _ref.baseUrl,
+      onUnauthorized = _ref.onUnauthorized,
       children = _ref.children;
   var generateUrl = useUrlGenerator();
   var previousApi = useApi();
   var api = useMemo(function () {
     return initialApi || previousApi || new Api({
       baseUrl: baseUrl,
-      generateUrl: generateUrl
+      generateUrl: generateUrl,
+      onUnauthorized: onUnauthorized
     });
   }, [previousApi, initialApi, baseUrl]);
   return /*#__PURE__*/React.createElement(ApiContext.Provider, {
@@ -856,8 +903,9 @@ var useMediaTags = function useMediaTags() {
   var _useItems = useItems(_objectSpread({
     getItems: getItems
   }, opts)),
-      items = _useItems.items,
-      request = _objectWithoutProperties(_useItems, ["items", "pageItems"]);
+      items = _useItems.items;
+      _useItems.pageItems;
+      var request = _objectWithoutProperties(_useItems, ["items", "pageItems"]);
 
   return _objectSpread({
     tags: items
@@ -884,7 +932,7 @@ var useMediaUpdate = function useMediaUpdate() {
   };
 };
 
-var useResourceUpdate$1 = function useResourceUpdate(resource) {
+var useResourceDestroy = function useResourceDestroy(resource) {
   var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 
   var _useState = useState(false),
@@ -1021,4 +1069,4 @@ var DataProvider = function DataProvider(_ref) {
 DataProvider.propTypes = propTypes;
 DataProvider.defaultProps = defaultProps;
 
-export { Api, ApiProvider, Base as BaseApi, DataProvider, useApi, useData, useItems, useMedia, useMediaCreate, useMediaTags, useMediaUpdate, useMedias, useMediasRecent as useMediasRecentSearches, useResourceUpdate$1 as useResourceDestroy, useResourceItem, useResourceItems, useResourceCreate as useResourceStore, useResourceUpdate };
+export { Api, ApiProvider, Base as BaseApi, DataProvider, useApi, useData, useItems, useMedia, useMediaCreate, useMediaTags, useMediaUpdate, useMedias, useMediasRecent as useMediasRecentSearches, useResourceDestroy, useResourceItem, useResourceItems, useResourceCreate as useResourceStore, useResourceUpdate };

package/lib/index.js

@@ -7,14 +7,14 @@ var React = require('react');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var PropTypes = require('prop-types');
 var contexts = require('@panneau/core/contexts');
+var PropTypes = require('prop-types');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var _createSuper = require('@babel/runtime/helpers/createSuper');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var fetch = require('@folklore/fetch');
+var fetch$1 = require('@folklore/fetch');
 var reactRouter = require('react-router');
 var queryString = require('query-string');
 
@@ -112,15 +112,17 @@ var useItems = function useItems(_ref) {
       initialPages = _ref$pages === void 0 ? null : _ref$pages,
       _ref$getPageFromRespo = _ref.getPageFromResponse,
       getPageFromResponse = _ref$getPageFromRespo === void 0 ? function (_ref2) {
-    var _ref2$meta = _ref2.meta,
-        currentPage = _ref2$meta.current_page,
-        lastPage = _ref2$meta.last_page,
-        total = _ref2$meta.total,
+    var _ref2$pagination = _ref2.pagination,
+        currentPage = _ref2$pagination.page,
+        lastPage = _ref2$pagination.last_page,
+        total = _ref2$pagination.total,
+        perPage = _ref2$pagination.per_page,
         items = _ref2.data;
     return {
       page: parseInt(currentPage, 10),
       lastPage: parseInt(lastPage, 10),
       total: parseInt(total, 10),
+      count: parseInt(perPage, 10),
       items: items
     };
   } : _ref$getPageFromRespo,
@@ -344,55 +346,76 @@ var Base = /*#__PURE__*/function () {
       routes: {},
       generateUrl: null
     }, opts), {}, {
-      baseUrl: opts.baseUrl
+      baseUrl: opts.baseUrl,
+      onUnauthorized: opts.onUnauthorized || null
     });
   }
 
   _createClass__default['default'](Base, [{
     key: "requestGet",
     value: function requestGet(path) {
+      var _this = this;
+
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var queryString$1 = query !== null ? queryString.stringify(query, {
         arrayFormat: 'bracket'
       }) : null;
-      return fetch.getJSON("".concat(this.getFullUrl(path)).concat(queryString$1 !== null && queryString$1.length > 0 ? "?".concat(queryString$1) : ''), {
+      return fetch$1.getJSON("".concat(this.getFullUrl(path)).concat(queryString$1 !== null && queryString$1.length > 0 ? "?".concat(queryString$1) : ''), {
         credentials: 'include',
-        headers: fetch.getCSRFHeaders()
+        headers: fetch$1.getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this.onError(error);
       });
     }
   }, {
     key: "requestPost",
     value: function requestPost(path, data) {
-      return fetch.postJSON(this.getFullUrl(path), data, {
+      var _this2 = this;
+
+      return fetch$1.postJSON(this.getFullUrl(path), data, {
         credentials: 'include',
-        headers: fetch.getCSRFHeaders()
+        headers: fetch$1.getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this2.onError(error);
       });
     }
   }, {
     key: "requestPut",
     value: function requestPut(path, data) {
-      return fetch.postJSON(this.getFullUrl(path), _objectSpread__default['default']({
+      var _this3 = this;
+
+      return fetch$1.postJSON(this.getFullUrl(path), _objectSpread__default['default']({
         _method: 'PUT'
       }, data), {
         credentials: 'include',
-        headers: fetch.getCSRFHeaders()
+        headers: fetch$1.getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this3.onError(error);
       });
     }
   }, {
     key: "requestPatch",
     value: function requestPatch(path, data) {
-      return fetch.postJSON(this.getFullUrl(path), _objectSpread__default['default']({
+      var _this4 = this;
+
+      return fetch$1.postJSON(this.getFullUrl(path), _objectSpread__default['default']({
         _method: 'PATCH'
       }, data), {
         credentials: 'include',
-        headers: fetch.getCSRFHeaders()
+        headers: fetch$1.getCSRFHeaders()
+      })["catch"](function (error) {
+        return _this4.onError(error);
       });
     }
   }, {
     key: "requestDelete",
     value: function requestDelete(path) {
+      var _this5 = this;
+
       return this.requestPost(path, {
         _method: 'DELETE'
+      })["catch"](function (error) {
+        return _this5.onError(error);
       });
     }
   }, {
@@ -416,6 +439,23 @@ var Base = /*#__PURE__*/function () {
           baseUrl = _this$options$baseUrl === void 0 ? null : _this$options$baseUrl;
       return baseUrl !== null ? "".concat(baseUrl.replace(/\/$/, ''), "/").concat(path.replace(/^\//, '')) : path;
     }
+  }, {
+    key: "onError",
+    value: function onError(err) {
+      var onUnauthorized = this.options.onUnauthorized;
+
+      var _ref = err || {},
+          _ref$status = _ref.status,
+          status = _ref$status === void 0 ? null : _ref$status;
+
+      var statusCode = parseInt(status, 10); // If status is refused and callback exists
+
+      if ((statusCode === 401 || statusCode === 419) && onUnauthorized !== null) {
+        return onUnauthorized();
+      }
+
+      throw err;
+    }
   }]);
 
   return Base;
@@ -464,10 +504,13 @@ var AuthApi = /*#__PURE__*/function () {
   }, {
     key: "logout",
     value: function logout() {
-      var withCredentials = this.options.withCredentials;
-      return this.api.fetchPost(this.api.route('auth.logout'), null, {
-        withSession: !withCredentials,
-        withCredentials: withCredentials
+      var url = this.api.getFullUrl(this.api.route('auth.logout'));
+      return fetch(url, {
+        method: 'POST',
+        headers: _objectSpread__default['default']({}, fetch$1.getCSRFHeaders()),
+        credentials: 'include'
+      })["catch"](function (err) {
+        console.log('logout err', err); // eslint-disable-line
       });
     }
   }, {
@@ -745,22 +788,26 @@ var useApi = function useApi() {
 var propTypes$1 = {
   api: PropTypes__default['default'].instanceOf(Api),
   baseUrl: PropTypes__default['default'].string,
+  onUnauthorized: PropTypes__default['default'].func,
   children: PropTypes__default['default'].node.isRequired
 };
 var defaultProps$1 = {
   api: null,
+  onUnauthorized: null,
   baseUrl: undefined
 };
 var ApiProvider = function ApiProvider(_ref) {
   var initialApi = _ref.api,
       baseUrl = _ref.baseUrl,
+      onUnauthorized = _ref.onUnauthorized,
       children = _ref.children;
   var generateUrl = contexts.useUrlGenerator();
   var previousApi = useApi();
   var api = React.useMemo(function () {
     return initialApi || previousApi || new Api({
       baseUrl: baseUrl,
-      generateUrl: generateUrl
+      generateUrl: generateUrl,
+      onUnauthorized: onUnauthorized
     });
   }, [previousApi, initialApi, baseUrl]);
   return /*#__PURE__*/React__default['default'].createElement(ApiContext.Provider, {
@@ -874,8 +921,9 @@ var useMediaTags = function useMediaTags() {
   var _useItems = useItems(_objectSpread__default['default']({
     getItems: getItems
   }, opts)),
-      items = _useItems.items,
-      request = _objectWithoutProperties__default['default'](_useItems, ["items", "pageItems"]);
+      items = _useItems.items;
+      _useItems.pageItems;
+      var request = _objectWithoutProperties__default['default'](_useItems, ["items", "pageItems"]);
 
   return _objectSpread__default['default']({
     tags: items
@@ -902,7 +950,7 @@ var useMediaUpdate = function useMediaUpdate() {
   };
 };
 
-var useResourceUpdate$1 = function useResourceUpdate(resource) {
+var useResourceDestroy = function useResourceDestroy(resource) {
   var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 
   var _useState = React.useState(false),
@@ -1052,7 +1100,7 @@ exports.useMediaTags = useMediaTags;
 exports.useMediaUpdate = useMediaUpdate;
 exports.useMedias = useMedias;
 exports.useMediasRecentSearches = useMediasRecent;
-exports.useResourceDestroy = useResourceUpdate$1;
+exports.useResourceDestroy = useResourceDestroy;
 exports.useResourceItem = useResourceItem;
 exports.useResourceItems = useResourceItems;
 exports.useResourceStore = useResourceCreate;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "1.0.0-alpha.15",
+    "version": "1.0.0-alpha.170",
     "description": "",
     "keywords": [
         "javascript"
@@ -54,7 +54,7 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@folklore/fetch": "^0.1.10",
-        "@panneau/core": "^1.0.0-alpha.14",
+        "@panneau/core": "^1.0.0-alpha.170",
         "prop-types": "^15.7.2",
         "query-string": "^7.0.0",
         "react-router": "^5.2.0"
@@ -62,5 +62,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "63c2685d7c5763c3296355b13fb56c81bb8d8aca"
+    "gitHead": "bba760fc2b560b9a0467b6e22d9bd8ca8618abb2"
 }