move to async / await

Author: bertho-zero

.gitignore

@@ -10,4 +10,5 @@ npm-debug.log
 .happypack
 webpack/dlls/*.json
 api/**/*.nedb
-*.report.html
+*.report.html
+coverage

api/actions/__tests__/widget-load-test.js

@@ -31,9 +31,9 @@ describe('widget load', () => {
       sinon.stub(Math, 'random').returns(0.2);
     });
 
-    it('rejects the call', () => {
+    it('rejects the call', async () => {
       try {
-        load({ session: { user: {} } }, undefined);
+        await load({ session: { user: {} } }, undefined);
       } catch (err) {
         expect(err).to.equal('Widget load fails 33% of the time. You were unlucky.');
       }

api/actions/__tests__/widget-update-test.js

@@ -23,45 +23,30 @@ describe('widget update', () => {
       }
     });
 
-    it('does not accept green widgets', () => {
-      sinon.stub(load, 'default').returns(
-        new Promise(resolve => {
-          resolve(widgets);
-        })
-      );
-      return update({ session: {}, body: { color: 'Green' } }).then(
-        () => {},
-        err => {
-          expect(err.color).to.equal('We do not accept green widgets');
-        }
-      );
+    it('does not accept green widgets', async () => {
+      sinon.stub(load, 'default').resolves(widgets);
+      try {
+        await update({ session: {}, body: { color: 'Green' } });
+      } catch (err) {
+        expect(err.color).to.equal('We do not accept green widgets');
+      }
     });
 
-    it('fails to load widgets', () => {
-      sinon.stub(load, 'default').returns(
-        new Promise((resolve, reject) => {
-          reject('Widget fail to load.');
-        })
-      );
-      return update({ session: {}, body: { color: 'Blue' } }).then(
-        () => {},
-        err => {
-          expect(err).to.equal('Widget fail to load.');
-        }
-      );
+    it('fails to load widgets', async () => {
+      sinon.stub(load, 'default').rejects(new Error('Widget fail to load.'));
+      try {
+        await update({ session: {}, body: { color: 'Blue' } });
+      } catch (err) {
+        expect(err.message).to.equal('Widget fail to load.');
+      }
     });
 
-    it('updates a widget', () => {
-      sinon.stub(load, 'default').returns(
-        new Promise(resolve => {
-          resolve(widgets);
-        })
-      );
+    it('updates a widget', async () => {
+      sinon.stub(load, 'default').resolves(widgets);
       const widget = { id: 2, color: 'Blue' };
-      return update({ session: {}, body: widget }).then(res => {
-        expect(res).to.deep.equal(widget);
-        expect(widgets[1]).to.deep.equal(widget);
-      });
+      const res = await update({ session: {}, body: widget });
+      expect(res).to.deep.equal(widget);
+      expect(widgets[1]).to.deep.equal(widget);
     });
   });
 
@@ -70,13 +55,12 @@ describe('widget update', () => {
       sinon.stub(Math, 'random').returns(0.1);
     });
 
-    it('rejects the call in 20% of the time', () => {
-      update().then(
-        () => {},
-        err => {
-          expect(err).to.equal('Oh no! Widget save fails 20% of the time. Try again.');
-        }
-      );
+    it('rejects the call in 20% of the time', async () => {
+      try {
+        update();
+      } catch (err) {
+        expect(err).to.equal('Oh no! Widget save fails 20% of the time. Try again.');
+      }
     });
   });
 });

api/services/authentication/index.js

@@ -9,13 +9,11 @@ import { discard } from 'feathers-hooks-common';
 export socketAuth from './socketAuth';
 
 function populateUser(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;
-      });
+  return async hook => {
+    const payload = await hook.app.passport.verifyJWT(hook.result.accessToken, authConfig);
+    const user = await hook.app.service('users').get(payload.userId);
+    hook.result.user = user;
+  };
 }
 
 function restToSocketAuth() {

api/services/authentication/socketAuth.js

@@ -1,5 +1,5 @@
 export default function socketAuth(app) {
-  return (socket, next) => {
+  return async (socket, next) => {
     const { cookie } = socket.request.headers;
     const cookies =
       cookie &&
@@ -17,17 +17,17 @@ export default function socketAuth(app) {
 
     if (!accessToken) return next();
 
-    app.passport
-      .verifyJWT(accessToken, app.get('auth'))
-      .then(payload => app.service('users').get(payload.userId))
-      .then(user => {
-        Object.assign(socket.feathers, {
-          accessToken,
-          user,
-          authenticated: true
-        });
-        next();
-      })
-      .catch(() => next());
+    try {
+      const payload = await app.passport.verifyJWT(accessToken, app.get('auth'));
+      const user = await app.service('users').get(payload.userId);
+      Object.assign(socket.feathers, {
+        accessToken,
+        user,
+        authenticated: true
+      });
+      next();
+    } catch (e) {
+      next();
+    }
   };
 }

api/utils/validation.js

@@ -13,17 +13,21 @@ function createAsyncValidator(rules, params) {
       }
     }, {});
 
-    return (await Object.keys(finalErrors).length) ? Promise.reject(finalErrors) : data;
+    if (Object.keys(finalErrors).length) {
+      throw finalErrors;
+    }
+
+    return data;
   };
 }
 
 function unique(field) {
-  return (value, data, { hook }) =>
-    hook.service.find({ query: { [field]: value } }).then(result => {
-      if (result.total !== 0) {
-        return Promise.reject('Already exist');
-      }
-    });
+  return async (value, data, { hook }) => {
+    const result = await hook.service.find({ query: { [field]: value } });
+    if (result.total !== 0) {
+      return Promise.reject('Already exist');
+    }
+  };
 }
 
 module.exports = {

package.json

@@ -139,7 +139,6 @@
     "feathers-rest": "^1.7.3",
     "feathers-socketio": "^2.0.0",
     "http-proxy": "^1.16.2",
-    "is-promise": "^2.1.0",
     "js-cookie": "^2.1.3",
     "localforage": "^1.4.3",
     "lru-memoize": "^1.0.1",

src/client.js

@@ -43,7 +43,10 @@ function initSocket() {
 
 global.socket = initSocket();
 
-Promise.all([window.__data ? true : isOnline(), getStoredState(offlinePersistConfig)]).then(([online, storedData]) => {
+(async () => {
+  const storedData = await getStoredState(offlinePersistConfig);
+  const online = await (window.__data ? true : isOnline());
+
   if (online) socket.open();
 
   // if your server doesn't authenticate socket connexion by cookie
@@ -55,13 +58,14 @@ Promise.all([window.__data ? true : isOnline(), getStoredState(offlinePersistCon
 
   const redirect = bindActionCreators(replace, store.dispatch);
 
-  const renderRouter = props =>
-    (<ReduxAsyncConnect
+  const renderRouter = props => (
+    <ReduxAsyncConnect
       {...props}
       helpers={{ client, app, restApp, redirect }}
       filter={item => !item.deferred}
       render={applyRouterMiddleware(useScroll())}
-    />);
+    />
+  );
 
   const render = routes => {
     match({ history, routes }, (error, redirectLocation, renderProps) => {
@@ -116,21 +120,16 @@ Promise.all([window.__data ? true : isOnline(), getStoredState(offlinePersistCon
   }
 
   if (online && !__DEVELOPMENT__ && 'serviceWorker' in navigator) {
-    window.addEventListener('load', () => {
-      navigator.serviceWorker
-        .register('/dist/service-worker.js', { scope: '/' })
-        .then(() => {
-          console.log('Service worker registered!');
-        })
-        .catch(error => {
-          console.log('Error registering service worker: ', error);
-        });
-
-      navigator.serviceWorker.ready.then(
-        (/* registration */) => {
-          console.log('Service Worker Ready');
-        }
-      );
+    window.addEventListener('load', async () => {
+      try {
+        await navigator.serviceWorker.register('/dist/service-worker.js', { scope: '/' });
+        console.log('Service worker registered!');
+      } catch (error) {
+        console.log('Error registering service worker: ', error);
+      }
+
+      await navigator.serviceWorker.ready;
+      console.log('Service Worker Ready');
     });
   }
-});
+})();

src/containers/ChatFeathers/ChatFeathers.js

@@ -54,7 +54,6 @@ export default class ChatFeathers extends Component {
 
     try {
       await this.props.app.service('messages').create({ text: this.state.message });
-
       this.setState({ message: '', error: false });
     } catch (error) {
       console.log(error);

src/containers/Login/Login.js

@@ -30,30 +30,32 @@ export default class Login extends Component {
     if (err) return;
 
     try {
-      const result = await this.props.login('facebook', data, false);
-      this.successLogin(result);
+      await this.props.login('facebook', data, false);
+      this.successLogin();
     } catch (error) {
       if (error.message === 'Incomplete oauth registration') {
         this.context.router.push({
           pathname: '/register',
           state: { oauth: error.data }
         });
+      } else {
+        throw error;
       }
     }
   };
 
   login = async data => {
     const result = await this.props.login('local', data);
-    return this.successLogin(result);
+    this.successLogin();
+    return result;
   };
 
-  successLogin = data => {
+  successLogin = () => {
     this.props.notifSend({
       message: "You'r logged !",
       kind: 'success',
       dismissAfter: 2000
     });
-    return data;
   };
 
   FacebookLoginButton = ({ facebookLogin }) => (