cozy-client 27.16.0 → 27.18.0

package/dist/CozyClient.js

@@ -2464,7 +2464,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 = "27.16.0";
+CozyClient.version = "27.18.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/flagship-certification/flagship-certification.js

@@ -13,6 +13,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _CozyClient = _interopRequireDefault(require("../CozyClient"));
 
+var _logger = _interopRequireDefault(require("../logger"));
+
 var _storeAttestation = require("./store-attestation");
 
 /**
@@ -134,25 +136,38 @@ var certifyFlagship = /*#__PURE__*/function () {
             throw new Error('[FLAGSHIP_CERTIFICATION] Certification configuration is not set');
 
           case 2:
-            _context3.next = 4;
+            _context3.prev = 2;
+            _context3.next = 5;
             return getStackChallenge(client);
 
-          case 4:
+          case 5:
             stackChallengeNonce = _context3.sent;
-            _context3.next = 7;
+            _context3.next = 8;
             return (0, _storeAttestation.getAppAttestationFromStore)(stackChallengeNonce, certificationConfig);
 
-          case 7:
+          case 8:
             appAttestation = _context3.sent;
-            _context3.next = 10;
+            _context3.next = 11;
             return giveAppAttestationToStack(appAttestation, stackChallengeNonce, client);
 
-          case 10:
+          case 11:
+            _context3.next = 17;
+            break;
+
+          case 13:
+            _context3.prev = 13;
+            _context3.t0 = _context3["catch"](2);
+
+            _logger.default.warn('[FLAGSHIP_CERTIFICATION] Certification failed but the cozy-stack will continue with 2FA certification');
+
+            _logger.default.warn(_context3.t0.message);
+
+          case 17:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3);
+    }, _callee3, null, [[2, 13]]);
   }));
 
   return function certifyFlagship(_x5, _x6) {

package/dist/flagship-certification/flagship-certification.spec.js

@@ -0,0 +1,215 @@
+import { certifyFlagship } from './flagship-certification'
+import { createMockClient } from '../mock'
+
+import { getAppAttestationFromStore } from './store-attestation'
+import logger from '../logger'
+
+jest.mock('./store-attestation', () => ({
+  getAppAttestationFromStore: jest.fn()
+}))
+
+jest.mock('../logger', () => ({
+  warn: jest.fn()
+}))
+
+const getClientMock = () => {
+  const client = createMockClient({
+    clientOptions: {
+      oauth: {}
+    }
+  })
+
+  client.stackClient.oauthOptions = {
+    clientID: 'SOME_CLIENT_ID',
+    registrationAccessToken: 'SOME_REGISTRATION_ACCESS_TOKEN'
+  }
+
+  return client
+}
+
+const mockCorrectChallengeRequest = client => {
+  client.stackClient.fetchJSON.mockResolvedValueOnce({
+    nonce: 'SOME_NONCE'
+  })
+}
+
+const mockCorrectStoreApiRequest = () => {
+  getAppAttestationFromStore.mockResolvedValueOnce({
+    platform: 'android',
+    attestation: 'SOME_STORE_ATTESTATION',
+    keyId: 'SOME_KEY_ID'
+  })
+}
+
+const mockCorrectCertificationConfig = () => {
+  return {
+    androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+  }
+}
+
+const getFetchJsonPostParams = (url, body = null) => {
+  return [
+    'POST',
+    url,
+    body,
+    {
+      headers: {
+        Authorization: 'Bearer SOME_REGISTRATION_ACCESS_TOKEN'
+      }
+    }
+  ]
+}
+
+describe('certifyFlagship', () => {
+  afterEach(() => {
+    jest.restoreAllMocks()
+    getAppAttestationFromStore.mockReset()
+  })
+
+  it('should ask challenge to cozy-stack, call the store API and then send the result to the stack', async () => {
+    const client = getClientMock()
+
+    const certificationConfig = mockCorrectCertificationConfig()
+
+    mockCorrectChallengeRequest(client)
+
+    mockCorrectStoreApiRequest()
+
+    await certifyFlagship(certificationConfig, client)
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/challenge`)
+    )
+
+    expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
+      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+    })
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/attestation`, {
+        platform: 'android',
+        attestation: 'SOME_STORE_ATTESTATION',
+        challenge: 'SOME_NONCE',
+        keyId: 'SOME_KEY_ID'
+      })
+    )
+  })
+
+  it('should throw if no certification config is provided', async () => {
+    const client = getClientMock()
+
+    const certificationConfig = undefined
+
+    mockCorrectChallengeRequest(client)
+
+    client.stackClient.fetchJSON.mockImplementationOnce(() => {
+      throw Error('SOME_STACK_CERTIFICATION_ERROR')
+    })
+
+    mockCorrectStoreApiRequest()
+
+    await expect(certifyFlagship(certificationConfig, client)).rejects.toEqual(
+      new Error(
+        '[FLAGSHIP_CERTIFICATION] Certification configuration is not set'
+      )
+    )
+
+    expect(client.stackClient.fetchJSON).not.toHaveBeenCalled()
+    expect(getAppAttestationFromStore).not.toHaveBeenCalled()
+  })
+
+  it('should ask challenge to cozy-stack and then handle challenge query failure', async () => {
+    const client = getClientMock()
+
+    const certificationConfig = mockCorrectCertificationConfig()
+
+    // Mock errored stack challenge request
+    client.stackClient.fetchJSON.mockImplementation(() => {
+      throw Error('SOME_STACK_CHALLENGE_ERROR')
+    })
+
+    mockCorrectStoreApiRequest()
+
+    await certifyFlagship(certificationConfig, client)
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/challenge`)
+    )
+
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[FLAGSHIP_CERTIFICATION] Certification failed but the cozy-stack will continue with 2FA certification'
+    )
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[FLAGSHIP_CERTIFICATION] Something went wrong while requesting a challenge from CozyStack:\nSOME_STACK_CHALLENGE_ERROR'
+    )
+  })
+
+  it('should ask challenge to cozy-stack, call the store API and then handle store API failure', async () => {
+    const client = getClientMock()
+
+    const certificationConfig = mockCorrectCertificationConfig()
+
+    mockCorrectChallengeRequest(client)
+
+    // Mock errored store API
+    getAppAttestationFromStore.mockImplementationOnce(() => {
+      throw Error('SOME_STORE_API_ERROR')
+    })
+
+    await certifyFlagship(certificationConfig, client)
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/challenge`)
+    )
+
+    expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
+      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+    })
+
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[FLAGSHIP_CERTIFICATION] Certification failed but the cozy-stack will continue with 2FA certification'
+    )
+    expect(logger.warn).toHaveBeenCalledWith('SOME_STORE_API_ERROR')
+  })
+
+  it('should ask challenge to cozy-stack, call the store API, send the result to the stack and then handle cozy-stack certification failure', async () => {
+    const client = getClientMock()
+
+    const certificationConfig = mockCorrectCertificationConfig()
+
+    mockCorrectChallengeRequest(client)
+
+    // Mock errored stack certification request
+    client.stackClient.fetchJSON.mockImplementationOnce(() => {
+      throw Error('SOME_STACK_CERTIFICATION_ERROR')
+    })
+
+    mockCorrectStoreApiRequest()
+
+    await certifyFlagship(certificationConfig, client)
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/challenge`)
+    )
+
+    expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
+      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+    })
+
+    expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
+      ...getFetchJsonPostParams(`/auth/clients/SOME_CLIENT_ID/attestation`, {
+        platform: 'android',
+        attestation: 'SOME_STORE_ATTESTATION',
+        challenge: 'SOME_NONCE',
+        keyId: 'SOME_KEY_ID'
+      })
+    )
+
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[FLAGSHIP_CERTIFICATION] Certification failed but the cozy-stack will continue with 2FA certification'
+    )
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[FLAGSHIP_CERTIFICATION] Something went wrong while giving attestation to CozyStack:\nSOME_STACK_CERTIFICATION_ERROR'
+    )
+  })
+})

package/dist/flagship-certification/store-attestation.js

@@ -25,7 +25,7 @@ var validateAppMock = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            throw new Error("validateApp can only be called from a React Native container");
+            throw new Error("getAppAttestationFromStore can only be called from a React Native container");
 
           case 1:
           case "end":

package/dist/store/documents.js

@@ -159,16 +159,16 @@ var getCollectionFromSlice = function getCollectionFromSlice() {
   return Object.values(state[doctype]);
 };
 /*
-  This method has been created in order to get a returned object 
-  in `data` with the full set on information coming potentially from 
-  ìncluded`
+  This method has been created in order to get a returned object
+  in `data` with the full set on information coming potentially from
+  `included`
 
-  This method should be somewhere else. The `document` shall not be 
-  deal with included / data and so on. 
+  This method should be somewhere else. The `document` shall not be
+  dealt with included / data and so on.
 
-  This method takes data and included and merge both sources 
-  together. It should be always up to date. The returned object 
-  will be as full of informations as it can be.
+  This method takes `data` and `included` and merge both sources
+  together. It should be always up-to-date. The returned object
+  will be as full of information as it can be.
 */
 
 
@@ -185,8 +185,8 @@ var extractAndMergeDocument = function extractAndMergeDocument(data, updatedStat
 
   var sortedData = (0, _keyBy.default)(data, _helpers.properId);
   var mergedData = Object.assign({}, updatedStateWithIncluded);
+  mergedData[doctype] = Object.assign({}, updatedStateWithIncluded[doctype]);
   Object.values(sortedData).map(function (data) {
-    if (!mergedData[doctype]) mergedData[doctype] = {};
     var id = (0, _helpers.properId)(data);
 
     if (mergedData[doctype][id]) {

package/dist/store/documents.spec.js

@@ -4,23 +4,25 @@ import {
 } from './documents'
 
 describe('extractAndMerge', () => {
-  it('should return the right data', () => {
-    const data = {
-      0: {
-        id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        type: 'io.cozy.files',
-        _type: 'io.cozy.files'
-      },
-      1: {
-        id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        type: 'io.cozy.files',
-        _type: 'io.cozy.files',
-        _id: 'b6ff135b34e041ffb2d4a4865f3e235f'
-      }
+  const data = {
+    0: {
+      id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+      _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+      type: 'io.cozy.files',
+      _type: 'io.cozy.files',
+      blabla: 'new field'
+    },
+    1: {
+      id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+      type: 'io.cozy.files',
+      _type: 'io.cozy.files',
+      _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+      blibli: 'another new field'
     }
-    const updatedStateWithIncluded = {
-      0: {
+  }
+  const updatedStateWithIncluded = {
+    'io.cozy.files': {
+      b6ff135b34e041ffb2d4a4865f3e0a53: {
         attributes: {
           type: 'file',
           name: 'IMG_0016.PNG',
@@ -38,7 +40,7 @@ describe('extractAndMerge', () => {
         type: 'io.cozy.files',
         _type: 'io.cozy.files'
       },
-      1: {
+      b6ff135b34e041ffb2d4a4865f3e235f: {
         attributes: {
           type: 'file',
           name: 'IMG_0054.PNG',
@@ -57,65 +59,112 @@ describe('extractAndMerge', () => {
         _type: 'io.cozy.files'
       }
     }
+  }
+
+  it('should return the right data', () => {
     const returnedDatas = extractAndMergeDocument(
       data,
       updatedStateWithIncluded
     )
 
     const manuallyMergedData = {
-      '0': {
-        _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        _type: 'io.cozy.files',
-        attributes: {
-          dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
-          name: 'IMG_0016.PNG',
-          type: 'file'
-        },
-        id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e0a53' },
-        meta: { rev: '5-87840eceaab358e38aa8b6bb0d4577b1' },
-        relationships: {
-          parent: {
-            links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
-          }
-        },
-        type: 'io.cozy.files'
-      },
-      '1': {
-        _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        _type: 'io.cozy.files',
-        attributes: {
-          dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
-          name: 'IMG_0054.PNG',
-          type: 'file'
-        },
-        id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e235f' },
-        meta: { rev: '5-ca91c0dc02dafb38eb56070c1d80d62c' },
-        relationships: {
-          parent: {
-            links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
-          }
-        },
-        type: 'io.cozy.files'
-      },
       'io.cozy.files': {
         b6ff135b34e041ffb2d4a4865f3e0a53: {
           _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
           _type: 'io.cozy.files',
+          attributes: {
+            dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
+            name: 'IMG_0016.PNG',
+            type: 'file'
+          },
+          blabla: 'new field',
           id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e0a53' },
+          meta: { rev: '5-87840eceaab358e38aa8b6bb0d4577b1' },
+          relationships: {
+            parent: {
+              links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
+            }
+          },
           type: 'io.cozy.files'
         },
         b6ff135b34e041ffb2d4a4865f3e235f: {
           _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
           _type: 'io.cozy.files',
+          attributes: {
+            dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
+            name: 'IMG_0054.PNG',
+            type: 'file'
+          },
+          blibli: 'another new field',
           id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e235f' },
+          meta: { rev: '5-ca91c0dc02dafb38eb56070c1d80d62c' },
+          relationships: {
+            parent: {
+              links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
+            }
+          },
           type: 'io.cozy.files'
         }
       }
     }
     expect(returnedDatas).toEqual(manuallyMergedData)
   })
+
+  it(
+    'should assign a new object for doctype of document to update' +
+      'in order to allow selector to recompute their data when documents are updated',
+    () => {
+      const returnedDatas = extractAndMergeDocument(
+        data,
+        updatedStateWithIncluded
+      )
+
+      // Then
+      expect(
+        returnedDatas['io.cozy.files'] ===
+          updatedStateWithIncluded['io.cozy.files']
+      ).toBeFalsy()
+    }
+  )
+
+  it(
+    'should assign a new object for doctype of document to update' +
+      'even if the mergedData is the same, because reselect createSelector update ' +
+      'according to object reference, not only value',
+    () => {
+      const dataAlreadyIncludedInUpdatedStateWithIncluded = {
+        0: {
+          id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          type: 'io.cozy.files',
+          _type: 'io.cozy.files'
+        },
+        1: {
+          id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          type: 'io.cozy.files',
+          _type: 'io.cozy.files',
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f'
+        }
+      }
+
+      const returnedDatas = extractAndMergeDocument(
+        dataAlreadyIncludedInUpdatedStateWithIncluded,
+        updatedStateWithIncluded
+      )
+
+      // Then
+      expect(
+        returnedDatas['io.cozy.files'] ===
+          updatedStateWithIncluded['io.cozy.files']
+      ).toBeFalsy()
+
+      expect(returnedDatas['io.cozy.files']).toEqual(
+        updatedStateWithIncluded['io.cozy.files']
+      )
+    }
+  )
 })
 
 describe('mergeDocumentsWithRelationships', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "27.16.0",
+  "version": "27.18.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -21,7 +21,7 @@
     "cozy-device-helper": "^1.12.0",
     "cozy-flags": "2.7.1",
     "cozy-logger": "^1.6.0",
-    "cozy-stack-client": "^27.15.0",
+    "cozy-stack-client": "^27.17.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
     "microee": "^0.0.6",
@@ -71,5 +71,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "b52a6830a34c3a13bee265132f527c0b30d580a5"
+  "gitHead": "df36e3ca46da4adab20629f869296d20942fbc75"
 }