fix(authentication-local): Keep non-objects in protect hook (#2085)

feathersjs · Oct 9, 2020 · 8977bb7 · 8977bb7
1 parent 6369f0b
commit 8977bb7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
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: '[email protected]',
         password: 'supersecret'
       }, {
         email: '[email protected]',
         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: '[email protected]' },
-          { email: '[email protected]' }
+          { email: '[email protected]' }, [
+            'one', 'two', 'three'
+          ], 'test'
         ]
       });
     });