Replace jsonwebtoken with jwt-decode on client

Remchi · Aug 8, 2016 · ca69ef8 · ca69ef8
1 parent b15425c
commit ca69ef8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/client/actions/authActions.js b/client/actions/authActions.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import setAuthorizationToken from '../utils/setAuthorizationToken';
-import jwt from 'jsonwebtoken';
+import jwtDecode from 'jwt-decode';
 import { SET_CURRENT_USER } from './types';
 
 export function setCurrentUser(user) {
@@ -24,7 +24,7 @@ export function login(data) {
       const token = res.data.token;
       localStorage.setItem('jwtToken', token);
       setAuthorizationToken(token);
-      dispatch(setCurrentUser(jwt.decode(token)));
+      dispatch(setCurrentUser(jwtDecode(token)));
     });
   }
 }
diff --git a/client/index.js b/client/index.js
@@ -6,7 +6,7 @@ import thunk from 'redux-thunk';
 import { createStore, applyMiddleware, compose } from 'redux';
 import rootReducer from './rootReducer';
 import setAuthorizationToken from './utils/setAuthorizationToken';
-import jwt from 'jsonwebtoken';
+import jwtDecode from 'jwt-decode';
 import { setCurrentUser } from './actions/authActions';
 
 import routes from './routes';
@@ -21,7 +21,7 @@ const store = createStore(
 
 if (localStorage.jwtToken) {
   setAuthorizationToken(localStorage.jwtToken);
-  store.dispatch(setCurrentUser(jwt.decode(localStorage.jwtToken)));
+  store.dispatch(setCurrentUser(jwtDecode(localStorage.jwtToken)));
 }
 
 render(

diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "classnames": "^2.2.5",
     "express": "^4.14.0",
     "jsonwebtoken": "^7.1.7",
+    "jwt-decode": "^2.1.0",
     "knex": "^0.11.7",
     "lodash": "^4.13.1",
     "pg": "^6.0.2",

diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -30,9 +30,5 @@ export default {
   },
   resolve: {
     extentions: [ '', '.js' ]
-  },
-  node: {
-    net: 'empty',
-    dns: 'empty'
   }
 }