Merge branch 'master' into delete_topic

twistter-frontend/src/App.js

@@ -19,7 +19,7 @@ import { logoutUser, getUserData } from './redux/actions/userActions';
 // Components
 import AuthRoute from "./util/AuthRoute";
 
-axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
+// axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
 
 // Pages
 import home from './pages/Home';
@@ -36,14 +36,20 @@ const theme = createMuiTheme(themeObject);
 
 const token = localStorage.FBIdToken;
 if (token) {
-  const decodedToken = jwtDecode(token);
-  if (decodedToken.exp * 1000 < Date.now()) {
+
+  try {
+    const decodedToken = jwtDecode(token);
+    if (decodedToken.exp * 1000 < Date.now()) {
+      store.dispatch(logoutUser());
+      window.location.href = "/login";
+    } else {
+      store.dispatch({ type: SET_AUTHENTICATED });
+      axios.defaults.headers.common['Authorization'] = token;
+      store.dispatch(getUserData());
+    }
+  } catch (invalidTokenError) {
     store.dispatch(logoutUser());
     window.location.href = "/login";
-  } else {
-    store.dispatch({ type: SET_AUTHENTICATED });
-    axios.defaults.headers.common['Authorization'] = token;
-    store.dispatch(getUserData());
   }
 }
 

twistter-frontend/src/Writing_Microblogs.js

@@ -36,7 +36,6 @@ class Writing_Microblogs extends Component {
         // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
         const postData = {
             body: this.state.value,  
-            userHandle: "new user",
             userImage: "bing-url",
             microBlogTitle: this.state.title,
             microBlogTopics: this.state.topics.split(', ')
@@ -46,7 +45,7 @@ class Writing_Microblogs extends Component {
         }
         
         axios
-            .post('/putPost', postData, headers)
+            .post("/putPost", postData, headers)
             .then((res) =>{
                 alert('Post was shared successfully!')
                 console.log(res.data);