cozy-client 46.10.0 → 46.11.0

package/dist/CozyClient.js

@@ -2782,7 +2782,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 = "46.10.0";
+CozyClient.version = "46.11.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/contact.js

@@ -22,7 +22,7 @@ exports.CONTACTS_DOCTYPE = CONTACTS_DOCTYPE;
 
 var getPrimaryOrFirst = function getPrimaryOrFirst(property) {
   return function (obj) {
-    return !obj[property] || obj[property].length === 0 ? '' : obj[property].find(function (property) {
+    return !obj || !obj[property] || obj[property].length === 0 || !obj[property][0] ? '' : obj[property].find(function (property) {
       return property.primary;
     }) || obj[property][0];
   };

package/dist/models/contact.spec.js

@@ -15,6 +15,12 @@ import {
 } from './contact'
 
 describe('getPrimaryOrFirst', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryOrFirst('email')({ email: undefined })).toEqual('')
+    expect(getPrimaryOrFirst('email')({ email: [null] })).toEqual('')
+    expect(getPrimaryOrFirst('email')({ email: [undefined] })).toEqual('')
+  })
+
   it("should return the first contact's email address if no primary", () => {
     const contact = {
       email: [
@@ -136,6 +142,12 @@ describe('getInitials', () => {
 })
 
 describe('getPrimaryCozy', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryCozy({ cozy: undefined })).toEqual(undefined)
+    expect(getPrimaryCozy({ cozy: [null] })).toEqual('')
+    expect(getPrimaryCozy({ cozy: [undefined] })).toEqual('')
+  })
+
   it('should return the main cozy', () => {
     const contact = {
       cozy: [
@@ -178,6 +190,12 @@ describe('getPrimaryCozy', () => {
 })
 
 describe('getPrimaryPhone', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryPhone({ phone: undefined })).toEqual('')
+    expect(getPrimaryPhone({ phone: [null] })).toEqual('')
+    expect(getPrimaryPhone({ phone: [undefined] })).toEqual('')
+  })
+
   it('should return the main phone number', () => {
     const contact = {
       phone: [
@@ -192,6 +210,12 @@ describe('getPrimaryPhone', () => {
 })
 
 describe('getPrimaryAddress', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryAddress({ address: undefined })).toEqual('')
+    expect(getPrimaryAddress({ address: [null] })).toEqual('')
+    expect(getPrimaryAddress({ address: [undefined] })).toEqual('')
+  })
+
   it('should return the main address', () => {
     const contact = {
       name: {
@@ -438,6 +462,12 @@ describe('makeDisplayName', () => {
 })
 
 describe('getPrimaryEmail', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryEmail({ email: undefined })).toEqual(undefined)
+    expect(getPrimaryEmail({ email: [null] })).toEqual('')
+    expect(getPrimaryEmail({ email: [undefined] })).toEqual('')
+  })
+
   it('should return the main email', () => {
     const contact = {
       email: [
@@ -609,6 +639,12 @@ describe('makeDefaultSortIndexValue', () => {
 })
 
 describe('getPrimaryCozyDomain', () => {
+  it('should not crash if array is undefined, or contents null/undefined', () => {
+    expect(getPrimaryCozyDomain({ cozy: undefined })).toEqual(undefined)
+    expect(getPrimaryCozyDomain({ cozy: [null] })).toEqual('')
+    expect(getPrimaryCozyDomain({ cozy: [undefined] })).toEqual('')
+  })
+
   it('should returns empty string if no cozy url', () => {
     const contact = {
       cozy: [{ url: '' }]

package/dist/models/document/emojiCountry.js

@@ -1,21 +1,36 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEmojiByCountry = void 0;
-var emojiCountry = {
-  fr: '🇫🇷'
-};
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _logger = _interopRequireDefault(require("../../logger"));
+
+// The offset between uppercase ASCII and regional indicator symbols
+var UNICODE_OFFSET = 127397;
 /**
- * @param {string} country - fr, en, etc
- * @param {Function} t - Translation function
+ * @param {string} countryCode - ISO 3166-1 alpha-2 (eg. fr, us, etc)
  * @returns {string} - Emoji of country
  */
 
-var getEmojiByCountry = function getEmojiByCountry(country, t) {
-  if (country === 'stranger') return t('country.stranger');
-  return emojiCountry[country];
+var getEmojiByCountry = function getEmojiByCountry(countryCode) {
+  if (!countryCode) return null;
+
+  if (!/^[a-z]{2}$/i.test(countryCode)) {
+    _logger.default.error("Country argument must be an ISO 3166-1 alpha-2 string, but got '".concat(JSON.stringify(countryCode), "' instead."));
+
+    return null;
+  }
+
+  var codePoints = (0, _toConsumableArray2.default)(countryCode.toUpperCase()).map(function (letter) {
+    return letter.codePointAt(0) + UNICODE_OFFSET;
+  });
+  return String.fromCodePoint.apply(String, (0, _toConsumableArray2.default)(codePoints));
 };
 
 exports.getEmojiByCountry = getEmojiByCountry;

package/dist/models/document/emojiCountry.spec.js

@@ -1,26 +1,34 @@
 import { getEmojiByCountry } from './emojiCountry'
+import logger from '../../logger'
 
 describe('getEmojiByCountry', () => {
-  const mockT = jest.fn(key => key)
-  it('should return fr flag', () => {
-    const res = getEmojiByCountry('fr', mockT)
+  beforeEach(() => {
+    jest.spyOn(logger, 'error').mockImplementation(() => jest.fn())
+  })
+  afterEach(() => {
+    logger.error.mockRestore()
+  })
+
+  it('should return French flag', () => {
+    const res = getEmojiByCountry('fr')
 
     expect(res).toBe('🇫🇷')
   })
-  it('should return "stranger" string (key: country.stranger)', () => {
-    const mockT = jest.fn(key => key)
-    const res = getEmojiByCountry('stranger', mockT)
+  it('should return Belgian flag', () => {
+    const res = getEmojiByCountry('be')
 
-    expect(res).toBe('country.stranger')
+    expect(res).toBe('🇧🇪')
   })
-  it('should return "undefined" if the country is not "fr"', () => {
-    const res = getEmojiByCountry('en', mockT)
+  it('should return "null" if the country is not ISO 3166-1 alpha-2 string', () => {
+    const res = getEmojiByCountry('fra')
 
-    expect(res).toBe(undefined)
+    expect(logger.error).toHaveBeenCalledTimes(1)
+    expect(res).toBe(null)
   })
-  it('should return "undefined" if the country is undefined', () => {
-    const res = getEmojiByCountry(undefined, mockT)
+  it('should return "null" if the country is undefined', () => {
+    const res = getEmojiByCountry(undefined)
 
-    expect(res).toBe(undefined)
+    expect(logger.error).not.toHaveBeenCalled()
+    expect(res).toBe(null)
   })
 })

package/dist/models/document/locales/index.js

@@ -49,8 +49,10 @@ var getBoundT = function getBoundT(lang) {
       smart_count: (opts === null || opts === void 0 ? void 0 : opts.smart_count) || 1
     });
 
-    var emojiCountry = (0, _emojiCountry.getEmojiByCountry)(opts === null || opts === void 0 ? void 0 : opts.country, t);
-    return emojiCountry ? "".concat(t(label, newOpts), " ").concat(emojiCountry) : t(label, newOpts);
+    var country = opts === null || opts === void 0 ? void 0 : opts.country;
+    var emojiCountry = country !== 'stranger' ? (0, _emojiCountry.getEmojiByCountry)(country) : null;
+    var strangerLabel = country === 'stranger' ? t('country.stranger') : null;
+    return emojiCountry || strangerLabel ? "".concat(t(label, newOpts), " ").concat(emojiCountry || strangerLabel) : t(label, newOpts);
   };
 };
 /**

package/dist/models/document/locales/index.spec.js

@@ -24,6 +24,8 @@ describe('getBoundT', () => {
     ${'Scan.items.national_id_card'} | ${undefined}  | ${undefined} | ${'en'} | ${'ID card'}
     ${'Scan.items.national_id_card'} | ${'fr'}       | ${undefined} | ${'en'} | ${'ID card 🇫🇷'}
     ${'Scan.items.national_id_card'} | ${'stranger'} | ${undefined} | ${'en'} | ${'ID card Stranger'}
+    ${'Scan.items.national_id_card'} | ${'be'}       | ${1}         | ${'en'} | ${'ID card 🇧🇪'}
+    ${'Scan.items.national_id_card'} | ${'be'}       | ${2}         | ${'en'} | ${'ID cards 🇧🇪'}
     ${'Scan.items.national_id_card'} | ${'fr'}       | ${1}         | ${'en'} | ${'ID card 🇫🇷'}
     ${'Scan.items.national_id_card'} | ${'fr'}       | ${2}         | ${'en'} | ${'ID cards 🇫🇷'}
     ${'Scan.items.national_id_card'} | ${undefined}  | ${1}         | ${'en'} | ${'ID card'}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "46.10.0",
+  "version": "46.11.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "97faf6da325ae1051675f67dd455090cdc88f17c"
+  "gitHead": "c3881442529ce33d979fdc8a90396b6d68f507d7"
 }

package/types/models/document/emojiCountry.d.ts

@@ -1 +1 @@
-export function getEmojiByCountry(country: string, t: Function): string;
+export function getEmojiByCountry(countryCode: string): string;