cozy-client 26.0.1 → 27.1.0

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [27.1.0](https://github.com/cozy/cozy-client/compare/v27.0.1...v27.1.0) (2021-11-04)
+
+**Note:** Version bump only for package cozy-client
+
+
+
+
+
+## [27.0.1](https://github.com/cozy/cozy-client/compare/v27.0.0...v27.0.1) (2021-11-04)
+
+
+### Bug Fixes
+
+* Build new OAuth client from old OAuth client ([a8ecfd0](https://github.com/cozy/cozy-client/commit/a8ecfd0344d86ba7c45e2589442bb836ba274a89))
+
+
+
+
+
+# [27.0.0](https://github.com/cozy/cozy-client/compare/v26.0.2...v27.0.0) (2021-11-03)
+
+**Note:** Version bump only for package cozy-client
+
+
+
+
+
+## [26.0.2](https://github.com/cozy/cozy-client/compare/v26.0.1...v26.0.2) (2021-11-01)
+
+
+### Bug Fixes
+
+* Use regex supported by Safari ([1497318](https://github.com/cozy/cozy-client/commit/149731833c1830f4091f9361d717413caac4e664))
+
+
+
+
+
 ## [26.0.1](https://github.com/cozy/cozy-client/compare/v26.0.0...v26.0.1) (2021-10-30)
 
 **Note:** Version bump only for package cozy-client

package/dist/CozyClient.js

@@ -360,6 +360,7 @@ var CozyClient = /*#__PURE__*/function () {
      * a client with a cookie-based instance of cozy-client-js.
      *
      * @param {OldCozyClient} oldClient - An instance of the deprecated cozy-client
+     * @param {object} options - CozyStackClient options
      * @returns {CozyClient}
      */
 
@@ -2276,7 +2277,8 @@ var CozyClient = /*#__PURE__*/function () {
      *
      * Warning: unlike other instantiators, this one needs to be awaited.
      *
-     * @param {OldCozyClient} oldClient - An instance of the deprecated cozy-client
+     * @param {OldCozyClient} oldClient - An OAuth instance of the deprecated cozy-client
+     * @param {object} options - CozyStackClient options
      * @returns {Promise<CozyClient>} An instance of a client, configured from the old client
      */
 
@@ -2284,30 +2286,32 @@ var CozyClient = /*#__PURE__*/function () {
     key: "fromOldOAuthClient",
     value: function () {
       var _fromOldOAuthClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(oldClient, options) {
-        var hasOauthCreds, token;
+        var credentials, oauthOptions;
         return _regenerator.default.wrap(function _callee17$(_context17) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
-                hasOauthCreds = oldClient._oauth && oldClient._authcreds != null;
-
-                if (!hasOauthCreds) {
+                if (!oldClient._oauth) {
                   _context17.next = 8;
                   break;
                 }
 
-                _context17.next = 4;
-                return oldClient._authcreds;
+                _context17.next = 3;
+                return oldClient.authorize();
 
-              case 4:
-                token = _context17.sent.token;
-                return _context17.abrupt("return", new CozyClient(_objectSpread({
-                  uri: oldClient._url,
-                  token: token
-                }, options)));
+              case 3:
+                credentials = _context17.sent;
+                oauthOptions = {
+                  oauth: credentials.client,
+                  token: credentials.token,
+                  scope: credentials.token.scope
+                };
+                return _context17.abrupt("return", new CozyClient(_objectSpread(_objectSpread({
+                  uri: oldClient._url
+                }, oauthOptions), options)));
 
               case 8:
-                throw new Error('Old client does not have _oauth or _authcreds, cannot instantiate a new client, check if CozyClient.fromOldClient is more suitable');
+                throw new Error('Cannot instantiate a new client: old client is not an OAuth client. CozyClient.fromOldClient might be more suitable.');
 
               case 9:
               case "end":
@@ -2411,7 +2415,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 = "26.0.1";
+CozyClient.version = "27.1.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/CozyClient.spec.js

@@ -143,17 +143,30 @@ describe('CozyClient initialization', () => {
   it('can be instantiated from an oauth-based old client', async () => {
     // Not using a real cozy-client-js here not to have to add it as a dep
     const url = 'https://testcozy.mycozy.cloud'
-    const token = 'Registration-token'
+    const oauth = {
+      clientID: 'my-client'
+      // ... other OAuth client attributes
+    }
+    const token = {
+      tokenType: 'bearer',
+      accessToken: 'access-token',
+      refreshToken: 'refresh-token',
+      scope: ['io.cozy.files']
+    }
     const oldClient = {
       _url: url,
       _oauth: true,
-      _authcreds: Promise.resolve({
+      authorize: () => ({
+        client: oauth,
         token
       })
     }
     const client = await CozyClient.fromOldOAuthClient(oldClient)
+    console.log({ stackClient: client.stackClient })
     expect(client.stackClient.uri).toBe(url)
-    expect(client.stackClient.token.token).toBe(token)
+    expect(client.stackClient.oauthOptions.clientID).toBe(oauth.clientID)
+    expect(client.stackClient.token.accessToken).toBe(token.accessToken)
+    expect(client.stackClient.scope).toBe(token.scope)
   })
 
   it('can be instantiated from dataset injected by the Stack in DOM', async () => {

package/dist/models/file.js

@@ -690,15 +690,14 @@ exports.overrideFileForPath = overrideFileForPath;
 
 var generateNewFileNameOnConflict = function generateNewFileNameOnConflict(filenameWithoutExtension) {
   //Check if the string ends by _1
-  var regex = new RegExp('(?<=_)([0-9]+)$'); // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Assertions#other_assertions
-
+  var regex = new RegExp('(_)([0-9]+)$');
   var matches = filenameWithoutExtension.match(regex);
 
   if (matches) {
-    var versionNumber = parseInt(matches[1]); //increment versionNumber
+    var versionNumber = parseInt(matches[2]); //increment versionNumber
 
     versionNumber++;
-    var newFilenameWithoutExtension = filenameWithoutExtension.replace(regex, "".concat(versionNumber));
+    var newFilenameWithoutExtension = filenameWithoutExtension.replace(new RegExp('(_)([0-9]+)$'), "_".concat(versionNumber));
     return newFilenameWithoutExtension;
   } else {
     return "".concat(filenameWithoutExtension, "_1");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "26.0.1",
+  "version": "27.1.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": "^26.0.0",
+    "cozy-stack-client": "^27.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
     "microee": "^0.0.6",
@@ -68,5 +68,5 @@
     "react-native-inappbrowser-reborn": "^3.5.1"
   },
   "sideEffects": false,
-  "gitHead": "43eb8e9e1033b9ae7ab75f97656046e5add2a2af"
+  "gitHead": "b51301e21377602016243ed5a7d4d432075af7ef"
 }

package/types/CozyClient.d.ts

@@ -61,19 +61,21 @@ declare class CozyClient {
      * a client with a cookie-based instance of cozy-client-js.
      *
      * @param {OldCozyClient} oldClient - An instance of the deprecated cozy-client
+     * @param {object} options - CozyStackClient options
      * @returns {CozyClient}
      */
-    static fromOldClient(oldClient: OldCozyClient, options: any): CozyClient;
+    static fromOldClient(oldClient: OldCozyClient, options: object): CozyClient;
     /**
      * To help with the transition from cozy-client-js to cozy-client, it is possible to instantiate
      * a client with an OAuth-based instance of cozy-client-js.
      *
      * Warning: unlike other instantiators, this one needs to be awaited.
      *
-     * @param {OldCozyClient} oldClient - An instance of the deprecated cozy-client
+     * @param {OldCozyClient} oldClient - An OAuth instance of the deprecated cozy-client
+     * @param {object} options - CozyStackClient options
      * @returns {Promise<CozyClient>} An instance of a client, configured from the old client
      */
-    static fromOldOAuthClient(oldClient: OldCozyClient, options: any): Promise<CozyClient>;
+    static fromOldOAuthClient(oldClient: OldCozyClient, options: object): Promise<CozyClient>;
     /**
      * In konnector/service context, CozyClient can be instantiated from
      * environment variables