Test+Implement optional authentication

roschaefer · roschaefer · commit ef01ad116a3e · 2018-09-20T23:30:19.000+02:00
diff --git a/server/services/contributions/contributions.hooks.js b/server/services/contributions/contributions.hooks.js
@@ -1,5 +1,5 @@
 const {authenticate} = require('@feathersjs/authentication').hooks;
-const {discard, when, unless, isProvider, populate, softDelete, setNow} = require('feathers-hooks-common');
+const {iff, discard, when, unless, isProvider, populate, softDelete, setNow} = require('feathers-hooks-common');
 const {
   //queryWithCurrentUser,
   associateCurrentUser,
@@ -110,7 +110,10 @@ module.exports = {
       unless(isModerator(),
         excludeDisabled()
       ),
-      authenticate('jwt'),
+      iff(
+        hook => hook.params.headers && hook.params.headers.authorization,
+        authenticate('jwt')
+      ),
       excludeBlacklisted(),
       when(isProvider('server'),
         includeAll()
diff --git a/test/services/contributions.test.js b/test/services/contributions.test.js
@@ -4,6 +4,8 @@ const service = app.service('contributions');
 const userService = app.service('users');
 const notificationService = app.service('notifications');
 const categoryService = app.service('categories');
+const usersService = app.service('users');
+const usersettingsService = app.service('usersettings');
 const { userData, adminData } = require('../assets/users');
 const {
   contributionData,
@@ -172,6 +174,46 @@ describe('\'contributions\' service', () => {
         'does not populate'
       );
     });
+
+    describe('of an author', () => {
+      let author;
+      beforeEach(async() => {
+        author = await usersService.create({
+          email: 'bad.guy@example.org',
+          name: 'Bad guy'
+        });
+        const data = { ...contributionData, userId: author._id };
+        await service.create(data);
+      });
+
+      context('who is not blacklisted', () => {
+        it('contribution is included', async () => {
+          const contributions = await service.find(params);
+          assert.equal(contributions.total, 2);
+        });
+      });
+
+      context('who is blacklisted', () => {
+        beforeEach(async() => {
+          await usersettingsService.create({
+            userId: user._id,
+            blacklist: [author._id]
+          });
+        });
+
+        it('contribution is filtered', async () => {
+          const contributions = await service.find(params);
+          assert.equal(contributions.total, 1);
+        });
+
+        context('but if user is not authenticated', () => {
+          it('contribution is filtered', async () => {
+            const contributions = await service.find();
+            assert.equal(contributions.total, 2);
+          });
+        });
+      });
+    });
   });
 
   describe('contributions find by slug', () => {
