cozy-client 45.6.0 → 45.8.0

package/dist/CozyClient.js

@@ -2703,7 +2703,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 = "45.6.0";
+CozyClient.version = "45.8.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/flagship-certification/README.md

@@ -11,32 +11,27 @@ This verification is done by querying an app certificate from the app store (App
 - `attestation`: result from the `store certification`
 - `challenge`: unique token given to the app by `cozy-stack` that may be encrypted in the `attestation` as a proof of authenticity
 - `nonce`: data type used to store the `challenge` token
-- `SafetyNet`: Google's implementation of the `store certification`
+- `Play Integrity API`: Google's implementation of the `store certification`
 - `AppAttest`: Apple's implementation of the `store certification`
 
 ## Android certification
 
-Android certification is based on [SafetyNet](https://developer.android.com/training/safetynet/index.html).
+Android certification is based on [Play Integrity API](https://developer.android.com/google/play/integrity/overview).
 
-This process requires to query a `challenge` from `cozy-stack` and to use it to init the `store certification` process through `SafetyNet`. Then the received `attestation` is send to `cozy-stack` for verification.
+This process requires to query a `challenge` from `cozy-stack` and to use it to init the `store certification` process through `Play Integrity API`. Then the received `attestation` is send to `cozy-stack` for verification.
 
 The resulting `attestation` is in the form of a `JSON Web Signature` that embbed the following `JSON`:
-```json
+```js
 {
-    "apkCertificateDigestSha256": [
-        "base64 encoded, SHA-256 hash of the certificate used to sign requesting app="
-    ],
-    "apkDigestSha256": "kNv83tJLFqwliYQ/6HUPCeGkBzLLCX/nvT+EF3OEB2I=",
-    "apkPackageName": "com.package.name.of.requesting.app",
-    "basicIntegrity": true,
-    "ctsProfileMatch": true, 
-    "evaluationType": "BASIC",
-    "nonce": "R2Rra24fVm5xa2Mg",
-    "timestampMs": 9860437986543
+  requestDetails: { ... }
+  appIntegrity: { ... }
+  deviceIntegrity: { ... }
+  accountDetails: { ... }
+  environmentDetails: { ... }
 }
 ```
 
-The `attestation`'s content is described in the SafetyNet's documentation: https://developer.android.com/training/safetynet/attestation#use-response-server
+The `attestation`'s content is described in the Play Integrity API's documentation: https://developer.android.com/google/play/integrity/verdicts#returned-verdict-format
 
 ## iOS certification
 
@@ -65,7 +60,7 @@ const client = await initClient(uri, {
       clientName: 'YOUR_APP_NAME',
       shouldRequireFlagshipPermissions: true,
       certificationConfig: {
-        androidSafetyNetApiKey: 'YOUR_GOOGLE_SAFETY_NET_API_KEY'
+        cloudProjectNumber: 'YOUR_CLOUD_PROJECT_NUMBER'
       }
     },
 ```

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

@@ -69,20 +69,21 @@ var getStackChallenge = /*#__PURE__*/function () {
 
 var giveAppAttestationToStack = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(appAttestation, nonce, client) {
-    var platform, attestation, keyId, stackClient;
+    var platform, attestation, keyId, issuer, stackClient;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            platform = appAttestation.platform, attestation = appAttestation.attestation, keyId = appAttestation.keyId;
+            platform = appAttestation.platform, attestation = appAttestation.attestation, keyId = appAttestation.keyId, issuer = appAttestation.issuer;
             stackClient = client.getStackClient();
             _context2.next = 5;
             return stackClient.fetchJSON('POST', "/auth/clients/".concat(stackClient.oauthOptions.clientID, "/attestation"), {
               platform: platform,
               attestation: attestation,
               challenge: nonce,
-              keyId: keyId
+              keyId: keyId,
+              issuer: issuer
             }, {
               headers: {
                 Authorization: stackClient.registrationAccessTokenToAuthHeader()

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

@@ -44,7 +44,7 @@ const mockCorrectStoreApiRequest = () => {
 
 const mockCorrectCertificationConfig = () => {
   return {
-    androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+    cloudProjectNumber: 'SOME_CLOUD_PROJECT_NUMBER'
   }
 }
 
@@ -90,7 +90,7 @@ describe('certifyFlagship', () => {
     )
 
     expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
-      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+      cloudProjectNumber: 'SOME_CLOUD_PROJECT_NUMBER'
     })
 
     expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
@@ -171,7 +171,7 @@ describe('certifyFlagship', () => {
     )
 
     expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
-      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+      cloudProjectNumber: 'SOME_CLOUD_PROJECT_NUMBER'
     })
 
     expect(console.warn).toHaveBeenCalledWith(
@@ -201,7 +201,7 @@ describe('certifyFlagship', () => {
     )
 
     expect(getAppAttestationFromStore).toHaveBeenCalledWith('SOME_NONCE', {
-      androidSafetyNetApiKey: 'SOME_ANDROID_SAFETY_NET_API_KEY'
+      cloudProjectNumber: 'SOME_CLOUD_PROJECT_NUMBER'
     })
 
     expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(

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

@@ -11,9 +11,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _reactNativeGoogleSafetynet = _interopRequireDefault(require("react-native-google-safetynet"));
+var _reactNativeGooglePlayIntegrity = _interopRequireDefault(require("react-native-google-play-integrity"));
 
-//@ts-ignore next-line
+//@ts-ignore next-line - this is a react-native module that is not installed in the monorepo, only in the consumer app
 
 /**
  * Retrieve the app's attestation from the Google Play store
@@ -24,26 +24,27 @@ var _reactNativeGoogleSafetynet = _interopRequireDefault(require("react-native-g
  */
 var getAppAttestationFromStore = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(nonce, certificationConfig) {
-    var attestationResult;
+    var integrityToken;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
             _context.next = 3;
-            return _reactNativeGoogleSafetynet.default.sendAttestationRequestJWT(nonce, certificationConfig.androidSafetyNetApiKey);
+            return _reactNativeGooglePlayIntegrity.default.requestIntegrityToken(nonce, certificationConfig.cloudProjectNumber);
 
           case 3:
-            attestationResult = _context.sent;
+            integrityToken = _context.sent;
             return _context.abrupt("return", {
               platform: 'android',
-              attestation: attestationResult
+              attestation: integrityToken,
+              issuer: 'playintegrity'
             });
 
           case 7:
             _context.prev = 7;
             _context.t0 = _context["catch"](0);
-            throw new Error('[FLAGSHIP_CERTIFICATION] Something went wrong while requesting an attestation from Google Safetynet:\n' + _context.t0.message);
+            throw new Error('[FLAGSHIP_CERTIFICATION] Something went wrong while requesting an attestation from Google Play Integrity API:\n' + _context.t0.message);
 
           case 10:
           case "end":

package/dist/flagship-certification/typedefs.js

@@ -18,11 +18,12 @@ exports.default = void 0;
  * @property {string} platform
  * @property {jws|base64string} attestation
  * @property {string} [keyId]
+ * @property {string} [issuer]
  */
 
 /**
  * @typedef {object} CertificationConfig - Configuration to access the stores certification API
- * @property {string} androidSafetyNetApiKey
+ * @property {string} cloudProjectNumber
  */
 var _default = {};
 exports.default = _default;

package/dist/models/account.js

@@ -121,6 +121,10 @@ var setContractSyncStatusInAccount = function setContractSyncStatusInAccount(acc
 exports.setContractSyncStatusInAccount = setContractSyncStatusInAccount;
 
 var getAccountLogin = function getAccountLogin(account) {
+  if (account.identifier) {
+    return account.auth[account.identifier];
+  }
+
   if (account && account.auth) {
     var _iterator = _createForOfIteratorHelper(_manifest.legacyLoginFields),
         _step;

package/dist/models/account.spec.js

@@ -209,6 +209,33 @@ describe('account model', () => {
     })
   })
 
+  describe('getAccountLogin', () => {
+    it('should return account.identifier field if defined', () => {
+      expect(
+        getAccountLogin({
+          _id: 'accountid',
+          auth: {
+            login: 'loginfield',
+            other: 'identifierfield'
+          },
+          identifier: 'other'
+        })
+      ).toStrictEqual('identifierfield')
+    })
+
+    it('should return login field if no identifier is defined', () => {
+      expect(
+        getAccountLogin({
+          _id: 'accountid',
+          auth: {
+            login: 'loginfield',
+            other: 'identifierfield'
+          }
+        })
+      ).toStrictEqual('loginfield')
+    })
+  })
+
   describe('getAccountName', () => {
     it('should return auth.accountName in priority', () => {
       expect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "45.6.0",
+  "version": "45.8.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -70,10 +70,10 @@
     "cozy-ui": ">=93.1.1",
     "react": "^16.7.0",
     "react-native": "^0.65.0",
-    "react-native-google-safetynet": "npm:cozy-react-native-google-safetynet@^1.0.0",
+    "react-native-google-play-integrity": "github:cozy/react-native-google-play-integrity#1.0.1",
     "react-native-inappbrowser-reborn": "^3.5.1",
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "2ded95151510d0d9eddbdb585d8f860dce9240be"
+  "gitHead": "c88d681a2f65911a240a4b0bae19e88c8fd5a86e"
 }

package/types/flagship-certification/typedefs.d.ts

@@ -15,10 +15,11 @@ export type AttestationResult = {
     platform: string;
     attestation: jws | base64string;
     keyId?: string;
+    issuer?: string;
 };
 /**
  * - Configuration to access the stores certification API
  */
 export type CertificationConfig = {
-    androidSafetyNetApiKey: string;
+    cloudProjectNumber: string;
 };