cozy-client 60.23.0 → 60.23.2

package/dist/CozyClient.js

@@ -3126,7 +3126,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 = "60.23.0";
+CozyClient.version = "60.23.2";
 
 _microee.default.mixin(CozyClient);
 

package/dist/Provider.js

@@ -52,7 +52,7 @@ var CozyProvider = /*#__PURE__*/function (_Component) {
       throw new Error('CozyProvider was not passed a client instance.');
     }
 
-    if (props.store) {
+    if (props.store && props.client.store !== props.store) {
       props.client.setStore(props.store);
     }
 

package/dist/models/note.js

@@ -15,6 +15,13 @@ var _helpers = require("../helpers");
 
 var _logger = _interopRequireDefault(require("../logger"));
 
+/**
+ * @typedef {Object} FetchURLOptions
+ * @property {string} [pathname] - Pathname to use in the URL
+ * @property {string} [driveId] - Shared drive ID used to fetch the URL
+ * @property {string} [returnUrl] - Return URL to add in query string
+ */
+
 /**
  *
  * @param {string} notesAppUrl URL to the Notes App (https://notes.foo.mycozy.cloud)
@@ -45,9 +52,7 @@ var generateUrlForNote = function generateUrlForNote(notesAppUrl, file) {
  *
  * @param {object} client CozyClient instance
  * @param {object} file io.cozy.file object
- * @param {object} options Options
- * @param {string} [options.pathname] Pathname to use in the URL
- * @param {string} [options.driveId] Shared drive ID used to fetched the URL
+ * @param {FetchURLOptions} [options] Options
  * @returns {Promise<string>} url
  */
 
@@ -56,7 +61,10 @@ exports.generateUrlForNote = generateUrlForNote;
 
 var fetchURL = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, file) {
-    var options,
+    var _ref2,
+        pathname,
+        driveId,
+        returnUrl,
         _yield$client$getStac,
         _yield$client$getStac2,
         note_id,
@@ -65,19 +73,17 @@ var fetchURL = /*#__PURE__*/function () {
         instance,
         sharecode,
         public_name,
-        _options$pathname,
         searchParams,
-        _options$pathname2,
         _args = arguments;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            options = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
+            _ref2 = _args.length > 2 && _args[2] !== undefined ? _args[2] : {}, pathname = _ref2.pathname, driveId = _ref2.driveId, returnUrl = _ref2.returnUrl;
             _context.next = 3;
             return client.getStackClient().collection('io.cozy.notes', {
-              driveId: options.driveId
+              driveId: driveId
             }).fetchURL({
               _id: file.id
             });
@@ -93,31 +99,39 @@ var fetchURL = /*#__PURE__*/function () {
             public_name = _yield$client$getStac2.public_name;
 
             if (!sharecode) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
 
             searchParams = [['id', note_id]];
             searchParams.push(['sharecode', sharecode]);
-            if (public_name) searchParams.push(['username', public_name]);
+
+            if (public_name) {
+              searchParams.push(['username', public_name]);
+            }
+
+            if (returnUrl) {
+              searchParams.push(['returnUrl', returnUrl]);
+            }
+
             return _context.abrupt("return", (0, _helpers.generateWebLink)({
               cozyUrl: "".concat(protocol, "://").concat(instance),
               searchParams: searchParams,
-              pathname: (_options$pathname = options.pathname) !== null && _options$pathname !== void 0 ? _options$pathname : '/public/',
+              pathname: pathname !== null && pathname !== void 0 ? pathname : '/public/',
               slug: 'notes',
               subDomainType: subdomain
             }));
 
-          case 18:
+          case 19:
             return _context.abrupt("return", (0, _helpers.generateWebLink)({
               cozyUrl: "".concat(protocol, "://").concat(instance),
-              pathname: (_options$pathname2 = options.pathname) !== null && _options$pathname2 !== void 0 ? _options$pathname2 : '',
+              pathname: pathname !== null && pathname !== void 0 ? pathname : '',
               slug: 'notes',
               subDomainType: subdomain,
               hash: "/n/".concat(note_id)
             }));
 
-          case 19:
+          case 20:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.23.0",
+  "version": "60.23.2",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "cbb22ff63955ee894c60ebdfaf745d0c51ea13df"
+  "gitHead": "973a40f4d79a8456961df6838c8391904a2b9720"
 }

package/types/models/note.d.ts

@@ -1,6 +1,17 @@
 export function generatePrivateUrl(notesAppUrl: string, file: object, options?: {}): string;
 export function generateUrlForNote(notesAppUrl: any, file: any): string;
-export function fetchURL(client: object, file: object, options?: {
-    pathname: string;
-    driveId: string;
-}): Promise<string>;
+export function fetchURL(client: object, file: object, { pathname, driveId, returnUrl }?: FetchURLOptions): Promise<string>;
+export type FetchURLOptions = {
+    /**
+     * - Pathname to use in the URL
+     */
+    pathname?: string;
+    /**
+     * - Shared drive ID used to fetch the URL
+     */
+    driveId?: string;
+    /**
+     * - Return URL to add in query string
+     */
+    returnUrl?: string;
+};