cozy-client 34.6.3 → 34.6.4

package/dist/CozyClient.js

@@ -237,6 +237,7 @@ var CozyClient = /*#__PURE__*/function () {
     }
 
     this.appMetadata = appMetadata;
+    this.loginPromise = null;
     _options.uri = securiseUri(_options.uri);
     this.options = _options;
     this.queryIdGenerator = new _queries.QueryIDGenerator();
@@ -272,6 +273,15 @@ var CozyClient = /*#__PURE__*/function () {
       } catch (err) {// not a critical error, we may be in node or the instance options are not on the default HTML element
       }
     }
+    /**
+     * Holds in-flight promises for deduplication purpose
+     *
+     * @private
+     * @type {PromiseCache}
+     */
+
+
+    this._promiseCache = new _promiseCache.default();
 
     if (_options.uri && _options.token) {
       this.login();
@@ -286,15 +296,6 @@ var CozyClient = /*#__PURE__*/function () {
     if (_options.store !== false) {
       this.ensureStore();
     }
-    /**
-     * Holds in-flight promises for deduplication purpose
-     *
-     * @private
-     * @type {PromiseCache}
-     */
-
-
-    this._promiseCache = new _promiseCache.default();
   }
   /**
    * Gets overrided by MicroEE.mixin
@@ -2516,13 +2517,13 @@ var CozyClient = /*#__PURE__*/function () {
     key: "fromOldOAuthClient",
     value: function () {
       var _fromOldOAuthClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(oldClient, options) {
-        var credentials, oauthOptions;
+        var credentials, oauthOptions, client;
         return _regenerator.default.wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
               case 0:
                 if (!oldClient._oauth) {
-                  _context19.next = 8;
+                  _context19.next = 12;
                   break;
                 }
 
@@ -2536,14 +2537,25 @@ var CozyClient = /*#__PURE__*/function () {
                   token: credentials.token,
                   scope: credentials.token.scope
                 };
-                return _context19.abrupt("return", new CozyClient(_objectSpread(_objectSpread({
+                client = new CozyClient(_objectSpread(_objectSpread({
                   uri: oldClient._url
-                }, oauthOptions), options)));
+                }, oauthOptions), options));
 
-              case 8:
-                throw new Error('Cannot instantiate a new client: old client is not an OAuth client. CozyClient.fromOldClient might be more suitable.');
+                if (!client.loginPromise) {
+                  _context19.next = 9;
+                  break;
+                }
+
+                _context19.next = 9;
+                return client.loginPromise;
 
               case 9:
+                return _context19.abrupt("return", client);
+
+              case 12:
+                throw new Error('Cannot instantiate a new client: old client is not an OAuth client. CozyClient.fromOldClient might be more suitable.');
+
+              case 13:
               case "end":
                 return _context19.stop();
             }
@@ -2644,7 +2656,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 = "34.6.3";
+CozyClient.version = "34.6.4";
 
 _microee.default.mixin(CozyClient);
 

package/dist/CozyClient.spec.js

@@ -576,6 +576,10 @@ describe('CozyClient logout', () => {
   })
 
   it('should reset the redux state', async () => {
+    stackClient = {
+      fetch: jest.fn(),
+      on: jest.fn()
+    }
     client = new CozyClient({
       links,
       stackClient,

package/dist/__mocks__/cozy-stack-client.js

@@ -31,6 +31,13 @@ var collectionMock = {
   all: jest.fn(function () {
     return Promise.resolve();
   }),
+  // needed because we call it inside the CozyClient constructor
+  // so we can't define it during the test
+  get: jest.fn(function () {
+    return Promise.resolve({
+      data: []
+    });
+  }),
   find: jest.fn(function () {
     return Promise.resolve();
   }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "34.6.3",
+  "version": "34.6.4",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -73,5 +73,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "e5116f9e96d80328a10ac2ad71e8a292831d944e"
+  "gitHead": "3e09f987a419949c27bc750cf6c94bcfa70a1bef"
 }

package/types/CozyClient.d.ts

@@ -146,6 +146,7 @@ declare class CozyClient {
      */
     constructor(rawOptions?: ClientOptions);
     appMetadata: any;
+    loginPromise: Promise<void>;
     options: {
         client?: object;
         token?: Token;
@@ -183,10 +184,6 @@ declare class CozyClient {
      */
     capabilities: ClientCapabilities;
     plugins: {};
-    /**
-     * @type {object}
-     */
-    storeAccesors: object;
     /**
      * Holds in-flight promises for deduplication purpose
      *
@@ -194,6 +191,10 @@ declare class CozyClient {
      * @type {PromiseCache}
      */
     private _promiseCache;
+    /**
+     * @type {object}
+     */
+    storeAccesors: object;
     /**
      * Gets overrided by MicroEE.mixin
      * This is here just so typescript does not scream
@@ -275,7 +276,6 @@ declare class CozyClient {
         token: string;
         uri: string;
     }): Promise<any>;
-    loginPromise: Promise<void>;
     _login(options: any): Promise<void>;
     isRevoked: boolean;
     /**

package/types/__mocks__/cozy-stack-client.d.ts

@@ -4,6 +4,9 @@ export class OAuthClient extends OAuthClient_base {
     constructor(opts: any);
     collection: jest.Mock<{
         all: jest.Mock<Promise<void>, []>;
+        get: jest.Mock<Promise<{
+            data: any[];
+        }>, []>;
         find: jest.Mock<Promise<void>, []>;
         create: jest.Mock<Promise<void>, []>;
         update: jest.Mock<Promise<void>, []>;
@@ -19,6 +22,9 @@ declare class MockedStackClient extends MockedStackClient_base {
     constructor(opts: any);
     collection: jest.Mock<{
         all: jest.Mock<Promise<void>, []>;
+        get: jest.Mock<Promise<{
+            data: any[];
+        }>, []>;
         find: jest.Mock<Promise<void>, []>;
         create: jest.Mock<Promise<void>, []>;
         update: jest.Mock<Promise<void>, []>;