cozy-client 42.2.0 → 43.0.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 = "42.2.0";
+CozyClient.version = "43.0.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/helpers/urlHelper.js

@@ -297,10 +297,7 @@ var wellKnownUrl = function wellKnownUrl(url) {
  *   Cozy's root or to a specifc slug. The caller is responsible to handle that exception
  * - another status means there aren't any Cozy behind to the given origin
  *
- * @param {object} url          Object of URL elements
- * @param {string} url.protocol Protocol to use in the origin (e.g. http)
- * @param {string} url.hostname Hostname to use in the origin (e.g. claude.mycozy.cloud)
- * @param {string} url.port     Port to use in the origin (e.g. 8080)
+ * @param {URL} url URL to validate
  *
  * @returns {Promise<boolean>} True if we believe there's a Cozy behind the given origin
  * @throws {InvalidCozyUrlError} Thrown when we know for sure there aren't any Cozy behind the given origin
@@ -310,7 +307,7 @@ var wellKnownUrl = function wellKnownUrl(url) {
 
 var isValidOrigin = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url) {
-    var response, status;
+    var response, status, responseUri, wasRedirected;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -320,7 +317,7 @@ var isValidOrigin = /*#__PURE__*/function () {
 
           case 2:
             response = _context.sent;
-            status = response.status;
+            status = response.status, responseUri = response.url;
 
             if (!(status === 404)) {
               _context.next = 6;
@@ -342,9 +339,10 @@ var isValidOrigin = /*#__PURE__*/function () {
             throw new BlockedCozyError(url);
 
           case 10:
-            return _context.abrupt("return", status === 200);
+            wasRedirected = url.origin !== new URL(responseUri).origin;
+            return _context.abrupt("return", status === 200 && !wasRedirected);
 
-          case 11:
+          case 12:
           case "end":
             return _context.stop();
         }
@@ -401,7 +399,7 @@ var isValidOrigin = /*#__PURE__*/function () {
 
 var rootCozyUrl = /*#__PURE__*/function () {
   var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url) {
-    var _url$hostname$split, _url$hostname$split2, subDomain, domain, _hostname, hostname;
+    var _url$hostname$split, _url$hostname$split2, subDomain, domain, _hostname, noSlugUrl, hostname, noSubUrl;
 
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -424,62 +422,60 @@ var rootCozyUrl = /*#__PURE__*/function () {
               break;
             }
 
-            return _context2.abrupt("return", url);
+            return _context2.abrupt("return", new URL(uri({
+              protocol: url.protocol,
+              hostname: url.hostname,
+              port: url.port
+            })));
 
           case 6:
             if (!/^[^.-][^.]+-[^.-]+\./.test(url.hostname)) {
-              _context2.next = 13;
+              _context2.next = 14;
               break;
             }
 
             _url$hostname$split = url.hostname.split('.'), _url$hostname$split2 = (0, _toArray2.default)(_url$hostname$split), subDomain = _url$hostname$split2[0], domain = _url$hostname$split2.slice(1);
             _hostname = [subDomain.replace(/-.+/, '')].concat((0, _toConsumableArray2.default)(domain)).join('.');
-            _context2.next = 11;
-            return isValidOrigin({
+            noSlugUrl = new URL(uri({
               protocol: url.protocol,
               hostname: _hostname,
               port: url.port
-            });
+            }));
+            _context2.next = 12;
+            return isValidOrigin(noSlugUrl);
 
-          case 11:
+          case 12:
             if (!_context2.sent) {
-              _context2.next = 13;
+              _context2.next = 14;
               break;
             }
 
-            return _context2.abrupt("return", new URL(uri({
-              protocol: url.protocol,
-              hostname: _hostname,
-              port: url.port
-            })));
+            return _context2.abrupt("return", noSlugUrl);
 
-          case 13:
+          case 14:
             // Try to remove the first sub-domain in case its a nested app name
             // eslint-disable-next-line no-unused-vars
             hostname = url.hostname.split('.').splice(1).join('.');
-            _context2.next = 16;
-            return isValidOrigin({
+            noSubUrl = new URL(uri({
               protocol: url.protocol,
               hostname: hostname,
               port: url.port
-            });
+            }));
+            _context2.next = 18;
+            return isValidOrigin(noSubUrl);
 
-          case 16:
+          case 18:
             if (!_context2.sent) {
-              _context2.next = 18;
+              _context2.next = 20;
               break;
             }
 
-            return _context2.abrupt("return", new URL(uri({
-              protocol: url.protocol,
-              hostname: hostname,
-              port: url.port
-            })));
+            return _context2.abrupt("return", noSubUrl);
 
-          case 18:
+          case 20:
             throw new InvalidCozyUrlError(url);
 
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }

package/dist/helpers/urlHelper.spec.js

@@ -205,65 +205,88 @@ describe('rootCozyUrl', () => {
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus.mycozy.cloud'))
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle cozy-hosted https trailing slash', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus.mycozy.cloud/'))
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle cozy-hosted https trailing path', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus.mycozy.cloud/some-path'))
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle cozy-hosted drive web app url', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus-drive.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 401 }
+      {
+        status: 401,
+        url:
+          'https://camillenimbus-drive.mycozy.cloud/.well-known/change-password'
+      }
     )
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus-drive.mycozy.cloud/#/folder'))
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle cozy-hosted photos album url', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus-photos.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 401 }
+      {
+        status: 401,
+        url:
+          'https://camillenimbus-photos.mycozy.cloud/.well-known/change-password'
+      }
     )
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
@@ -272,36 +295,73 @@ describe('rootCozyUrl', () => {
           'https://camillenimbus-photos.mycozy.cloud/#/albums/68b5cda502ae29f5fa73fd89f1be4f92'
         )
       )
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle cozy-hosted app name', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus-drive.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 401 }
+      {
+        status: 401,
+        url:
+          'https://camillenimbus-drive.mycozy.cloud/.well-known/change-password'
+      }
     )
     fetch.mockOnceIf(
       'https://camillenimbus.mycozy.cloud/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus-drive.mycozy.cloud'))
-    ).resolves.toEqual(new URL('https://camillenimbus.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
+  })
+
+  it('should handle cozy-hosted special app name', async () => {
+    // XXX: `cozy-stack` redirects requests for deprecated apps (e.g.
+    // `onboarding`) to the Home app (via the login page if the user is not
+    // logged in).
+    fetch.mockOnceIf(
+      'https://camillenimbus-onboarding.mycozy.cloud/.well-known/change-password',
+      {},
+      {
+        status: 200,
+        url:
+          'https://camillenimbus.mycozy.cloud/auth/login?redirect=https%3A%2F%2Fcamillenimbus-home.mycozy.cloud%2F'
+      }
+    )
+    fetch.mockOnceIf(
+      'https://camillenimbus.mycozy.cloud/.well-known/change-password',
+      {},
+      {
+        status: 200,
+        url: 'https://camillenimbus.mycozy.cloud/.well-known/change-password'
+      }
+    )
+
+    await expect(
+      rootCozyUrl(new URL('https://camillenimbus-onboarding.mycozy.cloud'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.mycozy.cloud/')
   })
 
   it('should handle self-hosted https', async () => {
     fetch.mockOnceIf(
       'https://camillenimbus.com/.well-known/change-password',
       {},
-      { status: 200 }
+      {
+        status: 200,
+        url: 'https://camillenimbus.com/.well-known/change-password'
+      }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus.com'))
-    ).resolves.toEqual(new URL('https://camillenimbus.com'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.com/')
   })
 
   it('should handle self-hosted with dash', async () => {
@@ -309,13 +369,14 @@ describe('rootCozyUrl', () => {
       'https://camille-nimbus.com/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'https://camille-nimbus.com/.well-known/change-password'
       }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camille-nimbus.com'))
-    ).resolves.toEqual(new URL('https://camille-nimbus.com'))
+    ).resolves.toHaveProperty('href', 'https://camille-nimbus.com/')
   })
 
   it('should handle self-hosted http', async () => {
@@ -323,13 +384,14 @@ describe('rootCozyUrl', () => {
       'http://camille-nimbus.com/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'http://camille-nimbus.com/.well-known/change-password'
       }
     )
 
     await expect(
       rootCozyUrl(new URL('http://camille-nimbus.com'))
-    ).resolves.toEqual(new URL('http://camille-nimbus.com'))
+    ).resolves.toHaveProperty('href', 'http://camille-nimbus.com/')
   })
 
   it('should handle self-hosted https with port', async () => {
@@ -337,13 +399,14 @@ describe('rootCozyUrl', () => {
       'https://camillenimbus.com:666/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'https://camillenimbus.com:666/.well-known/change-password'
       }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camillenimbus.com:666'))
-    ).resolves.toEqual(new URL('https://camillenimbus.com:666'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.com:666/')
   })
 
   it('should handle self-hosted nested drive web app url', async () => {
@@ -351,20 +414,22 @@ describe('rootCozyUrl', () => {
       'https://drive.camillenimbus.com/.well-known/change-password',
       {},
       {
-        status: 401
+        status: 401,
+        url: 'https://drive.camillenimbus.com/.well-known/change-password'
       }
     )
     fetch.mockOnceIf(
       'https://camillenimbus.com/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'https://camillenimbus.com/.well-known/change-password'
       }
     )
 
     await expect(
       rootCozyUrl(new URL('https://drive.camillenimbus.com/#/folder'))
-    ).resolves.toEqual(new URL('https://camillenimbus.com'))
+    ).resolves.toHaveProperty('href', 'https://camillenimbus.com/')
   })
 
   it('should handle self-hosted flat drive web app url', async () => {
@@ -372,26 +437,36 @@ describe('rootCozyUrl', () => {
       'https://camille-drive.nimbus.com/.well-known/change-password',
       {},
       {
-        status: 401
+        status: 401,
+        url: 'https://camille-drive.nimbus.com/.well-known/change-password'
       }
     )
     fetch.mockOnceIf(
       'https://camille.nimbus.com/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'https://camille.nimbus.com/.well-known/change-password'
       }
     )
 
     await expect(
       rootCozyUrl(new URL('https://camille-drive.nimbus.com/#/folder'))
-    ).resolves.toEqual(new URL('https://camille.nimbus.com'))
+    ).resolves.toHaveProperty('href', 'https://camille.nimbus.com/')
   })
 
   it('should handle cozy.localhost', async () => {
+    fetch.mockOnceIf(
+      'http://cozy.localhost:8080/.well-known/change-password',
+      {},
+      {
+        status: 200,
+        url: 'http://cozy.localhost:8080/.well-known/change-password'
+      }
+    )
     await expect(
       rootCozyUrl(new URL('http://cozy.localhost:8080'))
-    ).resolves.toEqual(new URL('http://cozy.localhost:8080'))
+    ).resolves.toHaveProperty('href', 'http://cozy.localhost:8080/')
   })
 
   it('expects an http or https protocol', async () => {
@@ -399,7 +474,8 @@ describe('rootCozyUrl', () => {
       'ftp://camillenimbus.com/.well-known/change-password',
       {},
       {
-        status: 200
+        status: 200,
+        url: 'ftp://camillenimbus.com/.well-known/change-password'
       }
     )
 
@@ -413,7 +489,8 @@ describe('rootCozyUrl', () => {
       'https://missing.mycozy.cloud/.well-known/change-password',
       {},
       {
-        status: 404
+        status: 404,
+        url: 'https://missing.mycozy.cloud/.well-known/change-password'
       }
     )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "42.2.0",
+  "version": "43.0.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^42.0.1",
+    "cozy-stack-client": "^43.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "9c7fe8079758eb097916eaa2fe847d8730605021"
+  "gitHead": "5718d4351b1e258cfa829f487ee2c08bf6000f8c"
 }