redirect to login or app depending on if logged in

backend/src/baserow/api/v0/jwt.py

@@ -0,0 +1,8 @@
+from .serializers.user import UserSerializer
+
+
+def jwt_response_payload_handler(token, user=None, request=None):
+    return {
+        'token': token,
+        'user': UserSerializer(user, context={'request': request}).data
+    }

backend/src/baserow/config/settings/base.py

@@ -129,7 +129,8 @@ CORS_ORIGIN_WHITELIST = (
 )
 
 JWT_AUTH = {
-    'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=30),
+    'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=300),
     'JWT_ALLOW_REFRESH': True,
-    'JWT_REFRESH_EXPIRATION_DELTA': datetime.timedelta(days=7)
+    'JWT_REFRESH_EXPIRATION_DELTA': datetime.timedelta(days=7),
+    'JWT_RESPONSE_PAYLOAD_HANDLER': 'baserow.api.v0.jwt.jwt_response_payload_handler'
 }

web-frontend/pages/app/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <h1>Welcome {{ user }}</h1>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  middleware: 'authenticated',
+  computed: {
+    ...mapState({
+      user: state => state.auth.user
+    })
+  }
+}
+</script>

web-frontend/pages/index.vue

@@ -1,16 +1,12 @@
 <template>
-  <div>
+  <div></div>
-    <h1>Baserow</h1>
-    <p>authenticated: {{ isAuthenticated }}</p>
-    <nuxt-link :to="{ name: 'login' }">Login</nuxt-link>
-  </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-
 export default {
-  middleware: 'authenticated',
+  mounted() {
-  computed: { ...mapGetters({ isAuthenticated: 'auth/isAuthenticated' }) }
+    const name = this.$store.getters['auth/isAuthenticated'] ? 'app' : 'login'
+    this.$nuxt.$router.replace({ name: name })
+  }
 }
 </script>

web-frontend/pages/login/index.vue

@@ -107,7 +107,7 @@ export default {
             password: this.credentials.password
           })
           .then(() => {
-            console.log('@TODO navigate to main page')
+            this.$nuxt.$router.replace({ name: 'app' })
           })
           .catch(() => {
             this.invalid = true

web-frontend/store/auth.js

@@ -10,9 +10,10 @@ export const state = () => ({
 })
 
 export const mutations = {
-  SET_USER_DATA(state, token) {
+  SET_USER_DATA(state, { token, user }) {
     state.token = token
-    state.user = jwtDecode(token)
+    state.token_data = jwtDecode(token)
+    state.user = user
   },
   CLEAR_USER_DATA(state) {
     state.token = null
@@ -31,7 +32,7 @@ export const actions = {
   login({ commit, dispatch }, { email, password }) {
     return AuthService.login(email, password).then(({ data }) => {
       setToken(data.token, this.app.$cookies)
-      commit('SET_USER_DATA', data.token)
+      commit('SET_USER_DATA', data)
       dispatch('startRefreshTimeout')
     })
   },
@@ -44,7 +45,7 @@ export const actions = {
     return AuthService.refresh(token)
       .then(({ data }) => {
         setToken(data.token, this.app.$cookies)
-        commit('SET_USER_DATA', data.token)
+        commit('SET_USER_DATA', data)
         dispatch('startRefreshTimeout')
       })
       .catch(() => {
@@ -93,6 +94,6 @@ export const getters = {
    */
   tokenExpireSeconds(state) {
     const now = Math.ceil(new Date().getTime() / 1000)
-    return state.user.exp - now
+    return state.token_data.exp - now
   }
 }