cozy-client 47.1.1 → 47.2.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 = "47.1.1";
+CozyClient.version = "47.2.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/country/countries.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getEmojiByCountry = exports.getAllNationalities = exports.getNationalityByCodeISO = exports.getAllCountryNames = exports.getCountryNameByCodeISO = exports.getAllCountries = exports.checkCountryCode = exports.COUNTRIES_ISO = void 0;
+exports.getEmojiByCountry = exports.getAllNationalities = exports.getNationalityByCodeISO = exports.getAllCountryNames = exports.getCountryNameByCodeISO = exports.getAllCountries = exports.checkCountryCode = exports.isCountryCodeAlpha2 = exports.isCountryCodeAlpha3 = exports.isValidCountryCodeTranslation = exports.COUNTRIES_ISO = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -1003,21 +1003,67 @@ var COUNTRIES_ISO = [{
   number: '248'
 }];
 /**
- * Check if a country code is valid
+ * Check if a country code translation is valid
  *
- * @param {string} code - The country code
- * @returns {boolean} - True if the code is valid, false otherwise
+ * @param {string} lang - Language of country names and nationalities
+ * @param {string} val - Country code
+ * @returns {boolean} - True if the translation is valid, false otherwise
  */
 
 exports.COUNTRIES_ISO = COUNTRIES_ISO;
 
-var checkCountryCode = function checkCountryCode(code) {
+var isValidCountryCodeTranslation = function isValidCountryCodeTranslation(lang, val) {
+  var _getLocalizer = (0, _locales.getLocalizer)(lang),
+      polyglot = _getLocalizer.polyglot;
+
+  return isCountryCodeAlpha2(val) && polyglot.has("nationalities.".concat(val)) && polyglot.has("countries.".concat(val));
+};
+/**
+ * Check if a country code is an ISO 3166-1 alpha-3 code
+ *
+ * @param {string} code - The country code
+ * @returns {boolean} - True if the code is an ISO 3166-1 alpha-3 code, false otherwise
+ */
+
+
+exports.isValidCountryCodeTranslation = isValidCountryCodeTranslation;
+
+var isCountryCodeAlpha3 = function isCountryCodeAlpha3(code) {
   if (!code) return false;
   var codeUpperCase = code.toUpperCase();
-  var foundCountry = COUNTRIES_ISO.find(function (country) {
-    return country.code2 === codeUpperCase || country.code3 === codeUpperCase;
+  return COUNTRIES_ISO.some(function (c) {
+    return c.code3 === codeUpperCase;
   });
-  return !!foundCountry;
+};
+/**
+ * Check if a country code is an ISO 3166-1 alpha-2 code
+ *
+ * @param {string} code - The country code
+ * @returns {boolean} - True if the code is an ISO 3166-1 alpha-2 code, false otherwise
+ */
+
+
+exports.isCountryCodeAlpha3 = isCountryCodeAlpha3;
+
+var isCountryCodeAlpha2 = function isCountryCodeAlpha2(code) {
+  if (!code) return false;
+  var codeUpperCase = code.toUpperCase();
+  return COUNTRIES_ISO.some(function (c) {
+    return c.code2 === codeUpperCase;
+  });
+};
+/**
+ * Check if a country code is valid
+ *
+ * @param {string} code - The country code
+ * @returns {boolean} - True if the code is valid, false otherwise
+ */
+
+
+exports.isCountryCodeAlpha2 = isCountryCodeAlpha2;
+
+var checkCountryCode = function checkCountryCode(code) {
+  return isCountryCodeAlpha2(code) || isCountryCodeAlpha3(code);
 };
 /**
  * Get all countries with all their information (ISO codes, names, nationalities)
@@ -1030,7 +1076,9 @@ var checkCountryCode = function checkCountryCode(code) {
 exports.checkCountryCode = checkCountryCode;
 
 var getAllCountries = function getAllCountries(lang) {
-  var t = (0, _locales.getLocalizer)(lang);
+  var _getLocalizer2 = (0, _locales.getLocalizer)(lang),
+      t = _getLocalizer2.t;
+
   return COUNTRIES_ISO.map(function (country) {
     return {
       code2: country.code2,

package/dist/models/country/countries.spec.js

@@ -4,7 +4,9 @@ import {
   getAllCountryNames,
   getAllNationalities,
   getCountryNameByCodeISO,
-  getEmojiByCountry
+  getEmojiByCountry,
+  isCountryCodeAlpha2,
+  isCountryCodeAlpha3
 } from './countries'
 import logger from '../../logger'
 
@@ -165,3 +167,37 @@ describe('getEmojiByCountry', () => {
     expect(res).toBe(null)
   })
 })
+
+describe('isCountryCodeAlpha3', () => {
+  it('should return true for valid country codes', () => {
+    expect(isCountryCodeAlpha3('FRA')).toBe(true)
+    expect(isCountryCodeAlpha3('fra')).toBe(true)
+    expect(isCountryCodeAlpha3('USA')).toBe(true)
+    expect(isCountryCodeAlpha3('usa')).toBe(true)
+  })
+
+  it('should return false for invalid country codes', () => {
+    expect(isCountryCodeAlpha3(undefined)).toBe(false)
+    expect(isCountryCodeAlpha3(null)).toBe(false)
+    expect(isCountryCodeAlpha3('')).toBe(false)
+    expect(isCountryCodeAlpha3('AAA')).toBe(false)
+    expect(isCountryCodeAlpha3('FR')).toBe(false)
+  })
+})
+
+describe('isCountryCodeAlpha2', () => {
+  it('should return true for valid country codes', () => {
+    expect(isCountryCodeAlpha2('FR')).toBe(true)
+    expect(isCountryCodeAlpha2('fr')).toBe(true)
+    expect(isCountryCodeAlpha2('US')).toBe(true)
+    expect(isCountryCodeAlpha2('us')).toBe(true)
+  })
+
+  it('should return false for invalid country codes', () => {
+    expect(isCountryCodeAlpha2(undefined)).toBe(false)
+    expect(isCountryCodeAlpha2(null)).toBe(false)
+    expect(isCountryCodeAlpha2('')).toBe(false)
+    expect(isCountryCodeAlpha2('AA')).toBe(false)
+    expect(isCountryCodeAlpha2('FRA')).toBe(false)
+  })
+})

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

@@ -28,14 +28,18 @@ for (var _i = 0, _langs = langs; _i < _langs.length; _i++) {
 }
 /**
  * @param {string} lang - fr, en, etc
- * @returns {Function} - localization function
+ * @returns {{ t: Function, polyglot: object, lang: string }}
  */
 
 
 var getLocalizer = function getLocalizer(lang) {
   var polyglot = polyglots[lang] || polyglots['en'];
   var t = polyglot.t.bind(polyglot);
-  return t;
+  return {
+    t: t,
+    polyglot: polyglot,
+    lang: lang
+  };
 };
 
 exports.getLocalizer = getLocalizer;

package/dist/models/document/locales/en.json

@@ -1,6 +1,6 @@
 {
   "country": {
-    "stranger": "Stranger"
+    "foreign": "Foreign"
   },
   "Scan": {
     "scan_a_doc": "Scan a doc",

package/dist/models/document/locales/fr.json

@@ -1,6 +1,6 @@
 {
   "country": {
-    "stranger": "Étranger"
+    "foreign": "Étranger"
   },
   "Scan": {
     "scan_a_doc": "Numériser un doc",

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

@@ -50,8 +50,8 @@ var getBoundT = function getBoundT(lang) {
     });
 
     var country = opts === null || opts === void 0 ? void 0 : opts.country;
-    var emojiCountry = country !== 'stranger' ? (0, _countries.getEmojiByCountry)(country) : null;
-    var strangerLabel = country === 'stranger' ? t('country.stranger') : null;
+    var emojiCountry = country !== 'foreign' ? (0, _countries.getEmojiByCountry)(country) : null;
+    var strangerLabel = country === 'foreign' ? t('country.foreign') : null;
     return emojiCountry || strangerLabel ? "".concat(t(label, newOpts), " ").concat(emojiCountry || strangerLabel) : t(label, newOpts);
   };
 };

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

@@ -20,16 +20,16 @@ describe('getBoundT', () => {
   })
 
   it.each`
-    translationKey                   | country       | smart_count  | lang    | expected
-    ${'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'}
-    ${'Scan.items.national_id_card'} | ${undefined}  | ${2}         | ${'en'} | ${'ID cards'}
+    translationKey                   | country      | smart_count  | lang    | expected
+    ${'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'} | ${'foreign'} | ${undefined} | ${'en'} | ${'ID card Foreign'}
+    ${'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'}
+    ${'Scan.items.national_id_card'} | ${undefined} | ${2}         | ${'en'} | ${'ID cards'}
   `(
     'should test if the translation is suitable with the param country: $country and with the param smart_count: $smart_count',
     ({ translationKey, country, smart_count, lang, expected }) => {

package/dist/models/paper.js

@@ -427,7 +427,9 @@ var formatInformationMetadataValue = function formatInformationMetadataValue(val
       name = _ref5.name,
       qualificationLabel = _ref5.qualificationLabel;
   var tDoc = (0, _locales.getLocalizer)(lang);
-  var tCountry = (0, _locales2.getLocalizer)(lang);
+
+  var _localizerCountry = (0, _locales2.getLocalizer)(lang),
+      tCountry = _localizerCountry.t;
 
   if (typeof value !== 'number' && !value) {
     return tDoc('Scan.qualification.noInfo');
@@ -449,7 +451,7 @@ var formatInformationMetadataValue = function formatInformationMetadataValue(val
     return "".concat(value, " \u20AC");
   }
 
-  if (name === 'country' && (0, _countries.checkCountryCode)(value)) {
+  if (name === 'country' && (0, _countries.isValidCountryCodeTranslation)(lang, value)) {
     return tCountry("nationalities.".concat(value));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "47.1.1",
+  "version": "47.2.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": "54801076e3cfb57c7ab4db021871c23cd07c0130"
+  "gitHead": "6e8e15ab4f4d7ee4a2a1ef52367f6fea9b41f9fe"
 }

package/types/models/country/countries.d.ts

@@ -5,6 +5,9 @@
  * @type {import('../../types').CountryISO[]}
  */
 export const COUNTRIES_ISO: import('../../types').CountryISO[];
+export function isValidCountryCodeTranslation(lang: string, val: string): boolean;
+export function isCountryCodeAlpha3(code: string): boolean;
+export function isCountryCodeAlpha2(code: string): boolean;
 export function checkCountryCode(code: string): boolean;
 export function getAllCountries(lang: string): import('../../types').Country[];
 export function getCountryNameByCodeISO(code: string | number, { lang }?: {

package/types/models/country/locales/index.d.ts

@@ -1 +1,5 @@
-export function getLocalizer(lang: string): Function;
+export function getLocalizer(lang: string): {
+    t: Function;
+    polyglot: object;
+    lang: string;
+};