Merge remote-tracking branch 'upstream/master'

Author: arfianadam

.babelrc

@@ -7,8 +7,7 @@
   "plugins": [
     "transform-runtime",
     "add-module-exports",
-    "transform-decorators-legacy",
-    "flow-runtime"
+    "transform-decorators-legacy"
   ],
   "env": {
     "development": {

.bootstraprc

@@ -5,11 +5,20 @@
   "loglevel": "disabled",
   "env": {
     "development": {
-      "styleLoaders": ["style-loader", "css-loader", "resolve-url-loader", "sass-loader"],
+      "styleLoaders": [
+        "style-loader?sourceMap",
+        "css-loader?sourceMap&importLoaders=2",
+        "resolve-url-loader",
+        "sass-loader?sourceMap"
+      ],
       "extractStyles": false
     },
     "production": {
-      "styleLoaders": ["style-loader", "css-loader", "sass-loader"],
+      "styleLoaders": [
+        "style-loader",
+        "css-loader?importLoaders=1",
+        "sass-loader?sourceMap"
+      ],
       "extractStyles": true
     }
   },

.dockerignore

@@ -3,7 +3,6 @@
 node_modules/
 yarn.lock
 static/dist/
-static/service-worker.js
 *.iml
 webpack-assets.json
 webpack-stats.json

.gitignore

@@ -2,7 +2,6 @@
 node_modules/
 yarn.lock
 static/dist/
-static/service-worker.js
 *.iml
 webpack-assets.json
 webpack-stats.json

.travis.yml

@@ -3,9 +3,9 @@ dist: trusty
 language: node_js
 
 node_js:
-  - "4.0"
   - "4"
   - "5"
+  - "6"
   - "stable"
 
 addons:

api/api.js

@@ -8,7 +8,6 @@ import rest from 'feathers-rest';
 import socketio from 'feathers-socketio';
 import isPromise from 'is-promise';
 import PrettyError from 'pretty-error';
-import publicConfig from '../src/config';
 import config from './config';
 import middleware from './middleware';
 import services from './services';
@@ -35,16 +34,15 @@ app.set('config', config)
 
 const actionsHandler = (req, res, next) => {
   const splittedUrlPath = req.url.split('?')[0].split('/').slice(1);
-
   const { action, params } = mapUrl(actions, splittedUrlPath);
 
+  req.app = app;
+
   const catchError = error => {
     console.error('API ERROR:', pretty.render(error));
     res.status(error.status || 500).json(error);
   };
 
-  req.app = app;
-
   if (action) {
     try {
       const handle = action(req, params);
@@ -79,13 +77,13 @@ app.configure(hooks())
   .configure(services)
   .configure(middleware);
 
-if (publicConfig.apiPort) {
-  app.listen(publicConfig.apiPort, err => {
+if (process.env.APIPORT) {
+  app.listen(process.env.APIPORT, err => {
     if (err) {
       console.error(err);
     }
-    console.info('----\n==> 🌎  API is running on port %s', publicConfig.apiPort);
-    console.info('==> 💻  Send requests to http://%s:%s', publicConfig.apiHost, publicConfig.apiPort);
+    console.info('----\n==> 🌎  API is running on port %s', process.env.APIPORT);
+    console.info('==> 💻  Send requests to http://localhost:%s', process.env.APIPORT);
   });
 } else {
   console.error('==>     ERROR: No APIPORT environment variable has been specified');

api/hooks/index.js

@@ -1,2 +1 @@
-export restrictToOwner from './restrictToOwner';
 export validateHook from './validateHook';

api/hooks/restrictToOwner.js

@@ -4,28 +4,18 @@ import local from 'feathers-authentication-local';
 // import oauth1 from 'feathers-authentication-oauth1';
 import oauth2 from 'feathers-authentication-oauth2';
 import FacebookTokenStrategy from 'passport-facebook-token';
-import hooks from 'feathers-hooks-common';
-import { verifyJWT } from 'feathers-authentication/lib/utils';
+import { discard } from 'feathers-hooks-common';
 
 export socketAuth from './socketAuth';
 
 function populateUser(authConfig) {
-  return hook => verifyJWT(hook.result.accessToken, authConfig)
+  return hook => hook.app.passport.verifyJWT(hook.result.accessToken, authConfig)
     .then(payload => hook.app.service('users').get(payload.userId))
     .then(user => {
       hook.result.user = user;
     });
 }
 
-function addTokenExpiration() {
-  return hook => {
-    if (hook.result.accessToken) {
-      hook.result.expires = hook.app.get('auth').cookie.maxAge || null;
-    }
-    return hook;
-  };
-}
-
 function restToSocketAuth() {
   return hook => {
     if (hook.params.provider !== 'rest') return hook;
@@ -70,8 +60,7 @@ export default function authenticationService() {
       after: {
         create: [
           populateUser(config),
-          hooks.remove('user.password'),
-          addTokenExpiration(),
+          discard('user.password'),
           restToSocketAuth()
         ]
       }

api/services/authentication/index.js

@@ -1,5 +1,3 @@
-import { verifyJWT } from 'feathers-authentication/lib/utils';
-
 export default function socketAuth(app) {
   return (socket, next) => {
     const { cookie } = socket.request.headers;
@@ -18,7 +16,7 @@ export default function socketAuth(app) {
 
     if (!accessToken) return next();
 
-    verifyJWT(accessToken, app.get('auth'))
+    app.passport.verifyJWT(accessToken, app.get('auth'))
       .then(payload => app.service('users').get(payload.userId))
       .then(user => {
         Object.assign(socket.feathers, {