cozy-client 60.37.0 → 60.38.0

package/dist/CozyClient.js

@@ -1833,9 +1833,10 @@ var CozyClient = /*#__PURE__*/function () {
           while (1) {
             switch (_context15.prev = _context15.next) {
               case 0:
-                isSingleDoc = !Array.isArray(response.data);
+                isSingleDoc = !Array.isArray(response.data); // A query matching no document resolves with a null `data` or an empty
+                // `data` array, depending on whether it is a single or multiple docs query
 
-                if (!(!isSingleDoc && response.data.length === 0)) {
+                if (!(isSingleDoc && !response.data || !isSingleDoc && response.data.length === 0)) {
                   _context15.next = 3;
                   break;
                 }
@@ -3126,7 +3127,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.37.0";
+CozyClient.version = "60.38.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/CozyClient.spec.js

@@ -1296,6 +1296,19 @@ describe('CozyClient', () => {
       expect(requestHandler.mock.calls[0][0]).toBe(query)
     })
 
+    it('should resolve to a null document when a getById with includes misses', async () => {
+      requestHandler.mockResolvedValueOnce({ data: null })
+
+      const resp = await client.query(
+        Q('io.cozy.todos')
+          .getById('missing')
+          .include(['attachments'])
+      )
+
+      expect(requestHandler).toHaveBeenCalledTimes(1)
+      expect(resp.data).toBeNull()
+    })
+
     it('should handle queries with includes', async () => {
       requestHandler.mockReturnValueOnce(
         Promise.resolve({

package/dist/associations/helpers.js

@@ -66,6 +66,7 @@ var attachRelationships = function attachRelationships(response, relationshipsBy
     });
   } else {
     var doc = response.data;
+    if (!doc) return response;
     return _objectSpread(_objectSpread({}, response), {}, {
       data: attachRelationship(doc, relationshipsByDocId[doc._id])
     });

package/dist/associations/helpers.spec.js

@@ -68,6 +68,11 @@ describe('Associations helpers', () => {
       })
     })
 
+    it('should leave a missing document untouched', () => {
+      const response = { data: null }
+      expect(attachRelationships(response, {})).toBe(response)
+    })
+
     it('should add missing relationships', () => {
       const doc = {
         _id: 1,

package/dist/helpers/index.js

@@ -27,6 +27,12 @@ Object.defineProperty(exports, "ensureFirstSlash", {
     return _urlHelper.ensureFirstSlash;
   }
 });
+Object.defineProperty(exports, "isHttpUrl", {
+  enumerable: true,
+  get: function get() {
+    return _urlHelper.isHttpUrl;
+  }
+});
 Object.defineProperty(exports, "fetchRegistrationDetails", {
   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.fetchRegistrationDetails = exports.rootCozyUrl = exports.InvalidCozyUrlError = exports.BlockedCozyError = exports.InvalidProtocolError = exports.InvalidRedirectLinkError = exports.deconstructRedirectLink = exports.deconstructCozyWebLinkWithSlug = exports.generateWebLink = exports.ensureFirstSlash = void 0;
+exports.fetchRegistrationDetails = exports.isHttpUrl = exports.rootCozyUrl = exports.InvalidCozyUrlError = exports.BlockedCozyError = exports.InvalidProtocolError = exports.InvalidRedirectLinkError = exports.deconstructRedirectLink = exports.deconstructCozyWebLinkWithSlug = exports.generateWebLink = exports.ensureFirstSlash = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -509,6 +509,23 @@ var isResponseAboutBlockedCozy = /*#__PURE__*/function () {
     return _ref5.apply(this, arguments);
   };
 }();
+/**
+ * Check if the given value is an absolute URL using the http or https protocol
+ *
+ * @param {any} value - Value to check
+ * @returns {boolean} true if the value is an absolute http(s) URL
+ */
+
+
+var isHttpUrl = function isHttpUrl(value) {
+  if (typeof value !== 'string') return false;
+
+  try {
+    return ['http:', 'https:'].includes(new URL(value).protocol);
+  } catch (e) {
+    return false;
+  }
+};
 /**
  * Check if the given url uses the expected protocols (http or https). Throws otherwise
  *
@@ -516,6 +533,8 @@ var isResponseAboutBlockedCozy = /*#__PURE__*/function () {
  */
 
 
+exports.isHttpUrl = isHttpUrl;
+
 var throwIfInvalidProtocol = function throwIfInvalidProtocol(url) {
   if (!['http:', 'https:'].includes(url.protocol)) {
     throw new InvalidProtocolError(url);

package/dist/helpers/urlHelper.spec.js

@@ -5,6 +5,7 @@ import {
   deconstructRedirectLink,
   generateWebLink,
   fetchRegistrationDetails,
+  isHttpUrl,
   rootCozyUrl,
   InvalidRedirectLinkError,
   InvalidCozyUrlError,
@@ -133,6 +134,28 @@ describe('deconstructWebLink', () => {
   )
 })
 
+describe('isHttpUrl', () => {
+  it.each([
+    'http://alice.cozy.localhost:8080',
+    'https://calendar.example.com/'
+  ])('accepts %p', value => {
+    expect(isHttpUrl(value)).toBe(true)
+  })
+
+  it.each([
+    undefined,
+    null,
+    true,
+    '',
+    'calendar.example.com',
+    'not a url',
+    'javascript:alert(1)',
+    'ftp://example.com'
+  ])('rejects %p', value => {
+    expect(isHttpUrl(value)).toBe(false)
+  })
+})
+
 describe('deconstructRedirectLink', () => {
   it.each([
     [

package/dist/models/applications.js

@@ -13,6 +13,8 @@ var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _helpers = require("../helpers");
+
 var STORE_SLUG = 'store';
 /**
  * Returns the store URL of an app/konnector
@@ -79,7 +81,6 @@ var isInstalled = function isInstalled() {
   });
 };
 /**
- *
  * @param {object} app io.cozy.apps document
  * @returns {string} url to the app
  */
@@ -88,6 +89,11 @@ var isInstalled = function isInstalled() {
 exports.isInstalled = isInstalled;
 
 var getUrl = function getUrl(app) {
+  if (app.standalone === true && app.client_url_flag) {
+    var clientUrl = (0, _cozyFlags.default)(app.client_url_flag);
+    if ((0, _helpers.isHttpUrl)(clientUrl)) return clientUrl;
+  }
+
   return app.links && app.links.related;
 };
 /**

package/dist/models/applications.spec.js

@@ -124,6 +124,55 @@ describe('applications model', () => {
     })
   })
 
+  describe('getUrl', () => {
+    const related = 'http://calendar.cozy.tools:8080/'
+
+    beforeEach(() => {
+      flag.mockReset()
+    })
+
+    it('returns links.related when the app has no client_url_flag', () => {
+      expect(applications.getUrl({ links: { related } })).toBe(related)
+    })
+
+    it('returns the flag value of a standalone app when it is a valid URL', () => {
+      flag.mockReturnValue('https://calendar.example.com/')
+      const app = {
+        standalone: true,
+        client_url_flag: 'calendar.embedded-app-url',
+        links: { related }
+      }
+      expect(applications.getUrl(app)).toBe('https://calendar.example.com/')
+      expect(flag).toHaveBeenCalledWith('calendar.embedded-app-url')
+    })
+
+    it.each([null, true, 'not a url', 'javascript:alert(1)'])(
+      'returns links.related when the flag value is %p',
+      value => {
+        flag.mockReturnValue(value)
+        const app = {
+          standalone: true,
+          client_url_flag: 'calendar.embedded-app-url',
+          links: { related }
+        }
+        expect(applications.getUrl(app)).toBe(related)
+      }
+    )
+
+    it.each([undefined, false])(
+      'returns links.related when standalone is %p',
+      standalone => {
+        flag.mockReturnValue('https://mail.example.com/')
+        const app = {
+          standalone,
+          client_url_flag: 'mail.embedded-app-url',
+          links: { related }
+        }
+        expect(applications.getUrl(app)).toBe(related)
+      }
+    )
+  })
+
   describe('get store installation url', () => {
     const contactsApp = { slug: 'contacts' }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.37.0",
+  "version": "60.38.0",
   "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": "55c11be9fd2fc31e6aa047945c28e1395981a289"
+  "gitHead": "7531ce634e310b15dbbe32958a71600a57e8ecad"
 }

package/types/helpers/index.d.ts

@@ -1,3 +1,3 @@
 export { dehydrate } from "./dehydrateHelper";
-export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, generateWebLink, ensureFirstSlash, fetchRegistrationDetails, rootCozyUrl, InvalidRedirectLinkError, InvalidCozyUrlError, InvalidProtocolError, BlockedCozyError } from "./urlHelper";
+export { deconstructCozyWebLinkWithSlug, deconstructRedirectLink, generateWebLink, ensureFirstSlash, isHttpUrl, fetchRegistrationDetails, rootCozyUrl, InvalidRedirectLinkError, InvalidCozyUrlError, InvalidProtocolError, BlockedCozyError } from "./urlHelper";
 export { editSettings, getQuery, getSettings, normalizeSettings, saveAfterFetchSettings } from "./settings";

package/types/helpers/urlHelper.d.ts

@@ -26,6 +26,7 @@ export class InvalidCozyUrlError extends Error {
     url: any;
 }
 export function rootCozyUrl(url: URL): Promise<URL>;
+export function isHttpUrl(value: any): boolean;
 export function fetchRegistrationDetails(url: URL): Promise<RegistrationDetails>;
 export type RegistrationDetails = {
     /**