chore(rebase): Merge with latest crow main branch

daffl · daffl · commit 2ef92dd06ec1 · 2020-10-17T12:21:20.000-07:00
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
diff --git a/changelog.md b/changelog.md
@@ -5,7 +5,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [5.0.0-pre.0](https://github.com/feathersjs/feathers/compare/v4.5.4...v5.0.0-pre.0) (2020-05-19)
 
-
 ### Bug Fixes
 
 * **authentication-oauth:** Updated typings for projects with strictNullChecks ([#1941](https://github.com/feathersjs/feathers/issues/1941)) ([be91206](https://github.com/feathersjs/feathers/commit/be91206e3dba1e65a81412b7aa636bece3ab4aa2))
@@ -34,8 +33,24 @@ functionality like path replacements and automatic environment variable insertio
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+
+### Bug Fixes
+
+* **authentication-local:** Keep non-objects in protect hook ([#2085](https://github.com/feathersjs/feathers/issues/2085)) ([5a65e2e](https://github.com/feathersjs/feathers/commit/5a65e2e6cee0a15614f23ee2e0d3c25d3365027d))
+* **authentication-oauth:** Always end session after oAuth flows are finished ([#2087](https://github.com/feathersjs/feathers/issues/2087)) ([d219d0d](https://github.com/feathersjs/feathers/commit/d219d0d89c5e45aa289dd67cb0c8bdc05044c846))
+* **configuration:** Fix handling of config values that start with . or .. but are not actually relative paths; e.g. ".foo" or "..bar" ([#2065](https://github.com/feathersjs/feathers/issues/2065)) ([d07bf59](https://github.com/feathersjs/feathers/commit/d07bf5902e9c8c606f16b9523472972d3d2e9b49))
+* **rest-client:** Handle non-JSON errors with fetch adapter ([#2086](https://github.com/feathersjs/feathers/issues/2086)) ([e24217a](https://github.com/feathersjs/feathers/commit/e24217ad1e784ad71cd9d64fe1727dd02f039991))
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
+
 * **authentication-client:** Fix storage type so it works with all supported interfaces ([#2041](https://github.com/feathersjs/feathers/issues/2041)) ([6ee0e78](https://github.com/feathersjs/feathers/commit/6ee0e78d55cf1214f61458f386b94c350eec32af))
 
 
diff --git a/packages/authentication-client/CHANGELOG.md b/packages/authentication-client/CHANGELOG.md
@@ -17,6 +17,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/authentication-client
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 
diff --git a/packages/authentication-local/src/hooks/protect.ts b/packages/authentication-local/src/hooks/protect.ts
@@ -4,9 +4,14 @@ import { HookContext } from '@feathersjs/feathers';
 export default (...fields: string[]) => (context: HookContext) => {
   const result = context.dispatch || context.result;
   const o = (current: any) => {
-    const data = typeof current.toJSON === 'function'
-      ? current.toJSON() : current;
-    return omit(data, fields);
+    if (typeof current === 'object' && !Array.isArray(current)) {
+      const data = typeof current.toJSON === 'function'
+        ? current.toJSON() : current;
+
+      return omit(data, fields);
+    }
+
+    return current;
   };
 
   if (!result) {
diff --git a/packages/authentication-local/test/hooks/protect.test.ts b/packages/authentication-local/test/hooks/protect.test.ts
@@ -82,14 +82,16 @@ function testOmit (title: string, property: string) {
       });
     });
 
-    it('omits from array', () => {
+    it('omits from array but only objects (#2053)', () => {
       const data = [{
         email: 'test1@user.com',
         password: 'supersecret'
       }, {
         email: 'test2@user.com',
         password: 'othersecret'
-      }];
+      }, [
+        'one', 'two', 'three'
+      ], 'test'];
       const context = {
         [property]: data
       } as unknown as HookContext;
@@ -99,7 +101,9 @@ function testOmit (title: string, property: string) {
         [property]: data,
         dispatch: [
           { email: 'test1@user.com' },
-          { email: 'test2@user.com' }
+          { email: 'test2@user.com' }, [
+            'one', 'two', 'three'
+          ], 'test'
         ]
       });
     });
diff --git a/packages/authentication-oauth/CHANGELOG.md b/packages/authentication-oauth/CHANGELOG.md
@@ -9,6 +9,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+
+### Bug Fixes
+
+* **authentication-oauth:** Always end session after oAuth flows are finished ([#2087](https://github.com/feathersjs/feathers/issues/2087)) ([d219d0d](https://github.com/feathersjs/feathers/commit/d219d0d89c5e45aa289dd67cb0c8bdc05044c846))
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/authentication-oauth
diff --git a/packages/authentication-oauth/src/express.ts b/packages/authentication-oauth/src/express.ts
@@ -89,6 +89,10 @@ export default (options: OauthSetupSettings) => {
           ...payload
         };
 
+        await new Promise((resolve, reject) =>
+          req.session.destroy(err => err ? reject(err) : resolve())
+        );
+
         debug(`Calling ${authService}.create authentication with strategy ${name}`);
 
         const authResult = await service.create(authentication, params);
diff --git a/packages/authentication/CHANGELOG.md b/packages/authentication/CHANGELOG.md
@@ -5,10 +5,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [5.0.0-pre.0](https://github.com/feathersjs/feathers/compare/v4.5.4...v5.0.0-pre.0) (2020-05-19)
 
+
+
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
 **Note:** Version bump only for package @feathersjs/authentication
 
 
 
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/authentication
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -22,6 +22,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/client
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/client
diff --git a/packages/commons/CHANGELOG.md b/packages/commons/CHANGELOG.md
@@ -13,6 +13,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/commons
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/commons
diff --git a/packages/configuration/CHANGELOG.md b/packages/configuration/CHANGELOG.md
@@ -18,6 +18,18 @@ functionality like path replacements and automatic environment variable insertio
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+
+### Bug Fixes
+
+* **configuration:** Fix handling of config values that start with . or .. but are not actually relative paths; e.g. ".foo" or "..bar" ([#2065](https://github.com/feathersjs/feathers/issues/2065)) ([d07bf59](https://github.com/feathersjs/feathers/commit/d07bf5902e9c8c606f16b9523472972d3d2e9b49))
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/configuration
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
@@ -13,6 +13,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/errors
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/errors
diff --git a/packages/express/CHANGELOG.md b/packages/express/CHANGELOG.md
@@ -12,6 +12,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/express
diff --git a/packages/feathers/CHANGELOG.md b/packages/feathers/CHANGELOG.md
@@ -13,6 +13,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/feathers
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/feathers
diff --git a/packages/rest-client/CHANGELOG.md b/packages/rest-client/CHANGELOG.md
@@ -10,6 +10,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+
+### Bug Fixes
+
+* **rest-client:** Handle non-JSON errors with fetch adapter ([#2086](https://github.com/feathersjs/feathers/issues/2086)) ([e24217a](https://github.com/feathersjs/feathers/commit/e24217ad1e784ad71cd9d64fe1727dd02f039991))
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/rest-client
diff --git a/packages/rest-client/lib/fetch.js b/packages/rest-client/lib/fetch.js
@@ -30,7 +30,11 @@ class FetchService extends Base {
       return response;
     }
 
-    return response.json().then(error => {
+    return response.json().catch(() => {
+      const ErrorClass = errors[response.status] || Error;
+      
+      return new ErrorClass('JSON parsing error');
+    }).then(error => {
       error.response = response;
       throw error;
     });
diff --git a/packages/socketio-client/CHANGELOG.md b/packages/socketio-client/CHANGELOG.md
@@ -5,6 +5,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [5.0.0-pre.0](https://github.com/feathersjs/feathers/compare/v4.5.4...v5.0.0-pre.0) (2020-05-19)
 
+
+
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
 **Note:** Version bump only for package @feathersjs/socketio-client
 
 
diff --git a/packages/socketio/CHANGELOG.md b/packages/socketio/CHANGELOG.md
@@ -18,6 +18,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/socketio
diff --git a/packages/tests/CHANGELOG.md b/packages/tests/CHANGELOG.md
@@ -5,6 +5,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [5.0.0-pre.0](https://github.com/feathersjs/feathers/compare/v4.5.4...v5.0.0-pre.0) (2020-05-19)
 
+
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
+
 **Note:** Version bump only for package @feathersjs/tests
 
 
diff --git a/packages/transport-commons/CHANGELOG.md b/packages/transport-commons/CHANGELOG.md
@@ -15,6 +15,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 ### BREAKING CHANGES
 
 * **transport-commons:** Removes the old message format and client service timeout
+
+
+
+## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
 ## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
 
 **Note:** Version bump only for package @feathersjs/transport-commons
