Merge pull request #193 from ekonstantinidis/fix-login

Fix Release Bug

Author: ekonstantinidis

gulpfile.js

@@ -67,6 +67,11 @@ gulp.task('copy:fonts', function () {
   .pipe(gulp.dest('./dist/fonts'));
 });
 
-gulp.task('build', ['copy:fonts', 'build:js', 'build:scss']);
+gulp.task('apply-prod-environment', function() {
+  process.env.NODE_ENV = 'production';
+});
+
 gulp.task('watch', ['watch:js', 'watch:scss']);
+gulp.task('build', ['copy:fonts', 'build:js', 'build:scss']);
+gulp.task('release', ['apply-prod-environment', 'build']);
 gulp.task('default', ['build']);

package.json

@@ -8,7 +8,7 @@
     "watch": "gulp watch",
     "package": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=1.0.2 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
     "codesign": "bash scripts/codesign.bash",
-    "dist": "npm run build && npm run package && npm run codesign",
+    "dist": "gulp release && npm run package && npm run codesign",
     "lint-js": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
     "lint-sass": "sass-lint -c .sass-lint.yml -v -q",
     "mocha": "mocha --opts src/js/__tests__/__helpers__/mocha.opts",

src/js/__tests__/actions/index.js

@@ -73,20 +73,6 @@ describe('actions/index.js', () => {
 
   });
 
-  it('should check auth status', () => {
-
-    const token = 'HELLO';
-    localStorage.setItem('token', token);
-
-    const expectedAction = {
-      type: actions.CHECK_AUTH,
-      token
-    };
-
-    expect(actions.checkAuth()).to.eql(expectedAction);
-
-  });
-
   it('should fetch notifications with success', () => {
     const notifications = [
       {

src/js/__tests__/middleware/authentication.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import reducer from '../../reducers/auth';
 import {
-  LOGIN_REQUEST, LOGIN_SUCCESS, LOGIN_FAILURE, LOGOUT, CHECK_AUTH
+  LOGIN_REQUEST, LOGIN_SUCCESS, LOGIN_FAILURE, LOGOUT
 } from '../../actions';
 
 describe('reducers/auth.js', () => {
@@ -114,30 +114,4 @@ describe('reducers/auth.js', () => {
 
   });
 
-  it('should handle CHECK_AUTH', () => {
-
-    const fakeState = {
-      isFetching: false,
-      failed: false,
-      response: {},
-      token: null
-    };
-
-    const fakeToken = '123HELLOWORLDTOKEN';
-
-    expect(reducer(fakeState, {}).token).to.be.null;
-
-    const action = {
-      type: CHECK_AUTH,
-      token: fakeToken
-    };
-
-    expect(reducer(fakeState, action)).to.eql({
-      ...initialState,
-      token: fakeToken
-    });
-
-    expect(reducer(fakeState, action).token).to.not.be.null;
-
-  });
 });

src/js/__tests__/reducers/auth.js

@@ -40,16 +40,6 @@ export function logout() {
   return { type: LOGOUT };
 };
 
-export const CHECK_AUTH = 'CHECK_AUTH';
-export function checkAuth() {
-  const userToken = localStorage.getItem('token');
-
-  return {
-    type: CHECK_AUTH,
-    token: userToken
-  };
-};
-
 
 // Notifications
 

src/js/actions/index.js

@@ -18,7 +18,10 @@ export class Navigation extends React.Component {
   }
 
   refreshNotifications() {
-    this.props.fetchNotifications();
+    const isLoggedIn = this.props.token !== null;
+    if (isLoggedIn) {
+      this.props.fetchNotifications();
+    }
   }
 
   goToSettings() {

src/js/components/navigation.js

@@ -1,5 +1,5 @@
 import {
-  LOGIN_REQUEST, LOGIN_SUCCESS, LOGIN_FAILURE, LOGOUT, CHECK_AUTH
+  LOGIN_REQUEST, LOGIN_SUCCESS, LOGIN_FAILURE, LOGOUT
 } from '../actions';
 
 const initialState = {
@@ -38,11 +38,6 @@ export default function reducer(state = initialState, action) {
         response: null,
         token: null
       };
-    case CHECK_AUTH:
-      return {
-        ...state,
-        token: action.token
-      };
     default:
       return state;
   }

src/js/middleware/authentication.js

@@ -5,21 +5,19 @@ import * as storage from 'redux-storage';
 import createEngine from 'redux-storage-engine-localstorage';
 import filter from 'redux-storage-decorator-filter';
 
-import { checkAuth, fetchNotifications, UPDATE_SETTING } from '../actions';
-import authentication from '../middleware/authentication';
+import { fetchNotifications, UPDATE_SETTING, LOGIN_SUCCESS, LOGOUT } from '../actions';
 import constants from '../utils/constants';
 import notifications from '../middleware/notifications';
 import requests from '../middleware/requests';
 import rootReducer from '../reducers';
 
 export default function configureStore(initialState) {
-  const engine = filter(createEngine(constants.STORAGE_KEY), ['settings']);
-  const storageMiddleware = storage.createMiddleware(engine, [], [UPDATE_SETTING]);
+  const engine = filter(createEngine(constants.STORAGE_KEY), ['settings', ['auth', 'token']]);
+  const storageMiddleware = storage.createMiddleware(engine, [], [UPDATE_SETTING, LOGIN_SUCCESS, LOGOUT]);
 
   const createStoreWithMiddleware = applyMiddleware(
     requests, // Should be passed before 'apiMiddleware'
     apiMiddleware,
-    authentication,
     notifications,
     storageMiddleware
   )(createStore);
@@ -31,9 +29,7 @@ export default function configureStore(initialState) {
   load(store)
     .then(function (newState) {
       // Check if the user is logged in
-      store.dispatch(checkAuth());
       const isLoggedIn = store.getState().auth.token !== null;
-
       if (isLoggedIn) { store.dispatch(fetchNotifications()); }
     });