cozy-client 35.7.0 → 36.0.0

package/dist/CozyClient.js

@@ -2669,7 +2669,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "35.7.0";
+CozyClient.version = "36.0.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/helpers/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "rootCozyUrl", {
     return _urlHelper.rootCozyUrl;
   }
 });
+Object.defineProperty(exports, "InvalidRedirectLinkError", {
+  enumerable: true,
+  get: function get() {
+    return _urlHelper.InvalidRedirectLinkError;
+  }
+});
 Object.defineProperty(exports, "InvalidCozyUrlError", {
   enumerable: true,
   get: function get() {

package/dist/helpers/urlHelper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rootCozyUrl = exports.InvalidCozyUrlError = exports.InvalidProtocolError = exports.deconstructRedirectLink = exports.deconstructCozyWebLinkWithSlug = exports.generateWebLink = exports.ensureFirstSlash = void 0;
+exports.rootCozyUrl = exports.InvalidCozyUrlError = exports.InvalidProtocolError = exports.InvalidRedirectLinkError = exports.deconstructRedirectLink = exports.deconstructCozyWebLinkWithSlug = exports.generateWebLink = exports.ensureFirstSlash = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -131,16 +131,21 @@ var deconstructCozyWebLinkWithSlug = function deconstructCozyWebLinkWithSlug(web
     slug: slug
   };
 };
+
+exports.deconstructCozyWebLinkWithSlug = deconstructCozyWebLinkWithSlug;
+
+var isValidSlug = function isValidSlug(slug) {
+  return slug.match(/^[a-z0-9]+$/);
+};
 /**
- * Deconstruct the given redirect link in order to retrieve slug and hash
+ * Deconstruct the given redirect link in order to retrieve slug, pathname and hash
  *
- * @param {string} redirectLink - redirect link to deconstruct (i.e. 'slug/#/path')
+ * @param {string} redirectLink - redirect link to deconstruct (i.e. 'drive/public/#/folder/SOME_ID')
  * @returns {RedirectLinkData} Deconstructed link
+ * @throws {InvalidRedirectLinkError} Thrown when redirect link is invalid
  */
 
 
-exports.deconstructCozyWebLinkWithSlug = deconstructCozyWebLinkWithSlug;
-
 var deconstructRedirectLink = function deconstructRedirectLink(redirectLink) {
   var _redirectLink$split = redirectLink.split('#'),
       _redirectLink$split2 = (0, _slicedToArray2.default)(_redirectLink$split, 2),
@@ -150,48 +155,71 @@ var deconstructRedirectLink = function deconstructRedirectLink(redirectLink) {
   var _splits$split = splits.split(/\/(.*)/),
       _splits$split2 = (0, _slicedToArray2.default)(_splits$split, 2),
       slug = _splits$split2[0],
-      path = _splits$split2[1];
+      pathname = _splits$split2[1];
+
+  if (!isValidSlug(slug)) {
+    throw new InvalidRedirectLinkError(redirectLink);
+  }
 
   return {
     slug: slug,
-    path: path,
+    pathname: pathname,
     hash: hash
   };
 };
 
 exports.deconstructRedirectLink = deconstructRedirectLink;
 
-var InvalidProtocolError = /*#__PURE__*/function (_Error) {
-  (0, _inherits2.default)(InvalidProtocolError, _Error);
+var InvalidRedirectLinkError = /*#__PURE__*/function (_Error) {
+  (0, _inherits2.default)(InvalidRedirectLinkError, _Error);
 
-  var _super = _createSuper(InvalidProtocolError);
+  var _super = _createSuper(InvalidRedirectLinkError);
 
-  function InvalidProtocolError(url) {
+  function InvalidRedirectLinkError(redirectLink) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, InvalidProtocolError);
-    _this = _super.call(this, "Invalid URL protocol ".concat(url.protocol));
-    _this.url = url;
+    (0, _classCallCheck2.default)(this, InvalidRedirectLinkError);
+    _this = _super.call(this, "Invalid redirect link ".concat(redirectLink));
+    _this.redirectLink = redirectLink;
     return _this;
   }
 
+  return InvalidRedirectLinkError;
+}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
+
+exports.InvalidRedirectLinkError = InvalidRedirectLinkError;
+
+var InvalidProtocolError = /*#__PURE__*/function (_Error2) {
+  (0, _inherits2.default)(InvalidProtocolError, _Error2);
+
+  var _super2 = _createSuper(InvalidProtocolError);
+
+  function InvalidProtocolError(url) {
+    var _this2;
+
+    (0, _classCallCheck2.default)(this, InvalidProtocolError);
+    _this2 = _super2.call(this, "Invalid URL protocol ".concat(url.protocol));
+    _this2.url = url;
+    return _this2;
+  }
+
   return InvalidProtocolError;
 }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
 
 exports.InvalidProtocolError = InvalidProtocolError;
 
-var InvalidCozyUrlError = /*#__PURE__*/function (_Error2) {
-  (0, _inherits2.default)(InvalidCozyUrlError, _Error2);
+var InvalidCozyUrlError = /*#__PURE__*/function (_Error3) {
+  (0, _inherits2.default)(InvalidCozyUrlError, _Error3);
 
-  var _super2 = _createSuper(InvalidCozyUrlError);
+  var _super3 = _createSuper(InvalidCozyUrlError);
 
   function InvalidCozyUrlError(url) {
-    var _this2;
+    var _this3;
 
     (0, _classCallCheck2.default)(this, InvalidCozyUrlError);
-    _this2 = _super2.call(this, "URL ".concat(url.toString(), " does not seem to be a valid Cozy URL"));
-    _this2.url = url;
-    return _this2;
+    _this3 = _super3.call(this, "URL ".concat(url.toString(), " does not seem to be a valid Cozy URL"));
+    _this3.url = url;
+    return _this3;
   }
 
   return InvalidCozyUrlError;

package/dist/helpers/urlHelper.spec.js

@@ -5,6 +5,7 @@ import {
   deconstructRedirectLink,
   generateWebLink,
   rootCozyUrl,
+  InvalidRedirectLinkError,
   InvalidCozyUrlError,
   InvalidProtocolError
 } from './urlHelper'
@@ -124,7 +125,7 @@ describe('deconstructRedirectLink', () => {
       'contacts/#/',
       {
         slug: 'contacts',
-        path: '',
+        pathname: '',
         hash: '/'
       }
     ],
@@ -132,7 +133,7 @@ describe('deconstructRedirectLink', () => {
       'contacts/#/hash',
       {
         slug: 'contacts',
-        path: '',
+        pathname: '',
         hash: '/hash'
       }
     ],
@@ -140,29 +141,38 @@ describe('deconstructRedirectLink', () => {
       'contacts/#/long/hash',
       {
         slug: 'contacts',
-        path: '',
+        pathname: '',
         hash: '/long/hash'
       }
     ],
     [
-      'contacts/path/#/long/hash',
+      'contacts/pathname/#/long/hash',
       {
         slug: 'contacts',
-        path: 'path/',
+        pathname: 'pathname/',
         hash: '/long/hash'
       }
     ],
     [
-      'contacts/long/path/#/long/hash',
+      'contacts/long/pathname/#/long/hash',
       {
         slug: 'contacts',
-        path: 'long/path/',
+        pathname: 'long/pathname/',
         hash: '/long/hash'
       }
     ]
   ])('should deconstruct %p redirect link', (link, result) => {
     expect(deconstructRedirectLink(link)).toEqual(result)
   })
+
+  it.each([
+    ['camillenimbus-photos.mycozy.cloud'],
+    ['http://camillenimbus-photos.mycozy.cloud']
+  ])('should throw when redirect link is invalid', link => {
+    expect(() => deconstructRedirectLink(link)).toThrow(
+      InvalidRedirectLinkError
+    )
+  })
 })
 
 describe('rootCozyUrl', () => {

package/dist/index.js

@@ -32,6 +32,7 @@ var _exportNames = {
   generateWebLink: true,
   ensureFirstSlash: true,
   rootCozyUrl: true,
+  InvalidRedirectLinkError: true,
   InvalidCozyUrlError: true,
   InvalidProtocolError: true,
   cancelable: true,
@@ -202,6 +203,12 @@ Object.defineProperty(exports, "rootCozyUrl", {
     return _helpers2.rootCozyUrl;
   }
 });
+Object.defineProperty(exports, "InvalidRedirectLinkError", {
+  enumerable: true,
+  get: function get() {
+    return _helpers2.InvalidRedirectLinkError;
+  }
+});
 Object.defineProperty(exports, "InvalidCozyUrlError", {
   enumerable: true,
   get: function get() {

package/dist/types.js

@@ -501,7 +501,7 @@ var _dsl = require("./queries/dsl");
  *
  * @typedef {object} RedirectLinkData
  * @property {string} slug - The redirect link's slug (i.e. 'drive')
- * @property {string} path - The redirect link's path (i.e. 'public')
+ * @property {string} pathname - The redirect link's path (i.e. 'public')
  * @property {string} hash - The redirect link's path (i.e. '/folder/SOME_FOLDER_ID')
  */
 var _default = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "35.7.0",
+  "version": "36.0.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^35.6.0",
+    "cozy-stack-client": "^36.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -73,5 +73,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "c8a78aaac3777dfe4763274c3e92218e5a222864"
+  "gitHead": "66475ed97922a875fc12439aee820568ae9d023c"
 }

package/types/helpers/index.d.ts

@@ -1,2 +1,2 @@
 export { dehydrate } from "./dehydrateHelper";
-export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, generateWebLink, ensureFirstSlash, rootCozyUrl, InvalidCozyUrlError, InvalidProtocolError } from "./urlHelper";
+export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, generateWebLink, ensureFirstSlash, rootCozyUrl, InvalidRedirectLinkError, InvalidCozyUrlError, InvalidProtocolError } from "./urlHelper";

package/types/helpers/urlHelper.d.ts

@@ -9,6 +9,10 @@ export function generateWebLink({ cozyUrl, searchParams: searchParamsOption, pat
 }): string;
 export function deconstructCozyWebLinkWithSlug(webLink: string, subDomainType?: SubdomainType): CozyLinkData;
 export function deconstructRedirectLink(redirectLink: string): RedirectLinkData;
+export class InvalidRedirectLinkError extends Error {
+    constructor(redirectLink: any);
+    redirectLink: any;
+}
 export class InvalidProtocolError extends Error {
     constructor(url: any);
     url: any;

package/types/index.d.ts

@@ -19,6 +19,6 @@ export { manifest, models };
 export { QueryDefinition, Q, Mutations, MutationTypes, getDoctypeFromOperation } from "./queries/dsl";
 export { Association, HasMany, HasOne, HasOneInPlace, HasManyInPlace, HasManyTriggers } from "./associations";
 export { isReferencedBy, isReferencedById, getReferencedBy, getReferencedById } from "./associations/helpers";
-export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, dehydrate, generateWebLink, ensureFirstSlash, rootCozyUrl, InvalidCozyUrlError, InvalidProtocolError } from "./helpers";
+export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, dehydrate, generateWebLink, ensureFirstSlash, rootCozyUrl, InvalidRedirectLinkError, InvalidCozyUrlError, InvalidProtocolError } from "./helpers";
 export { cancelable, isQueryLoading, hasQueryBeenLoaded } from "./utils";
 export { queryConnect, queryConnectFlat, withClient } from "./hoc";

package/types/types.d.ts

@@ -746,7 +746,7 @@ export type RedirectLinkData = {
     /**
      * - The redirect link's path (i.e. 'public')
      */
-    path: string;
+    pathname: string;
     /**
      * - The redirect link's path (i.e. '/folder/SOME_FOLDER_ID')
      */