Merge pull request #115 from Human-Connection/114_fix_change_of_usersettings_for_http_rest

114 fix change of usersettings for http rest

Author: appinteractive

features/api/usersettings.feature

@@ -0,0 +1,20 @@
+Feature: Save current newsfeed filters to usersettings
+  As a user of human connection
+  You would like to have my latest newsfeed filter settings saved
+  In order to see the same selection of content next time I log in
+
+  Background:
+    Given the Human Connection API is up and running
+    And there is a user in Human Connection with these credentials:
+      | email            | password | isVerified |
+      | user@example.com |     1234 | true       |
+
+  Scenario: Save user's language
+    Given you are authenticated
+    When you create your user settings via POST request to "/usersettings" with:
+    """
+    {
+      "uiLanguage": "de"
+    }
+    """
+    Then your language "de" is stored in your user settings

features/step_definitions/steps.js

@@ -30,6 +30,26 @@ function authenticate(email, plainTextPassword) {
     .then(json => json.accessToken);
 }
 
+function postRequest(route, body, callback) {
+  const params = {
+    method: 'post',
+    body,
+    headers: { 'Content-Type': 'application/json' },
+  };
+  if (currentUserAccessToken) {
+    params.headers.Authorization = `Bearer ${currentUserAccessToken}`;
+  }
+  fetch(`${hcBackendUrl}${route}`, params)
+    .then(response => response.json())
+    .catch((err) => {
+      throw (err);
+    })
+    .then((json) => {
+      httpResponse = json;
+      callback();
+    });
+}
+
 Given(/^the Human Connection API is up and running(?: on "http:\/\/localhost:3030")?/, (callback) => {
   waitOn({ resources: ['tcp:3030'], timeout: 30000 }, (err) => {
     if (err) throw (err);
@@ -53,25 +73,7 @@ Given('you are authenticated', () => authenticate(currentUser.email, currentUser
   currentUserAccessToken = accessToken;
 }));
 
-When('you send a POST request to {string} with:', (route, body, callback) => {
-  const params = {
-    method: 'post',
-    body,
-    headers: { 'Content-Type': 'application/json' },
-  };
-  if (currentUserAccessToken) {
-    params.headers.Authorization = `Bearer ${currentUserAccessToken}`;
-  }
-  fetch(`${hcBackendUrl}${route}`, params)
-    .then(response => response.json())
-    .catch((err) => {
-      throw (err);
-    })
-    .then((json) => {
-      httpResponse = json;
-      callback();
-    });
-});
+When('you send a POST request to {string} with:', (route, body, callback) => postRequest(route, body, callback));
 
 Then('there is an access token in the response:', (jsonResponse) => {
   expect(httpResponse.accessToken).to.be.a('string');
@@ -88,3 +90,22 @@ Then('a new post is created', function () {
   });
 });
 
+
+Then('your language {string} is stored in your user settings', function (lang) {
+  return this.app.service('usersettings').find({userId: currentUser._id.toString()}).then((settings) => {
+    expect(settings.total).to.eq(1);
+    expect(settings.data[0].uiLanguage).to.eq(lang);
+  });
+});
+
+Then('debug', function() {
+  // eslint-disable-next-line no-debugger
+  debugger;
+});
+
+When('you create your user settings via POST request to {string} with:', function (route, body, callback) {
+  let jsonBody = JSON.parse(body);
+  jsonBody.userId = currentUser._id.toString();
+  postRequest(route, JSON.stringify(jsonBody), callback);
+});
+

server/services/usersettings/usersettings.hooks.js

@@ -1,24 +1,30 @@
+const { iff, isProvider } = require('feathers-hooks-common');
 const { restrictToOwner } = require('feathers-authentication-hooks');
 const mapCreateToUpsert = require('../../hooks/map-create-to-upsert');
+const auth = require('@feathersjs/authentication');
 
 module.exports = {
   before: {
     all: [],
     find: [],
     get: [],
-    create: [
+    create:  [
+      auth.hooks.authenticate('jwt'),
       mapCreateToUpsert(context => {
         const { data } = context;
         return { userId: data.userId };
       })
     ],
     update: [
+      auth.hooks.authenticate('jwt'),
       restrictToOwner()
     ],
     patch: [
+      auth.hooks.authenticate('jwt'),
       restrictToOwner()
     ],
     remove: [
+      auth.hooks.authenticate('jwt'),
       restrictToOwner()
     ]
   },