fix(mqtt): topic includes undefined

src/store/getters.js

@@ -19,8 +19,11 @@ const getters = {
   userId (state) {
     return state.user.id
   },
+  account (state) {
+    return state.user.account
+  },
   name (state) {
-    return state.user.name
+    return state.user.name || state.user.account
   },
   avatar (state) {
     return state.user.avatar
@@ -54,9 +57,6 @@ const getters = {
   },
   isValid (state, getters) {
     return getters.token && (getters.tenant || getters.isSuperAdmin)
-  },
-  account (state) {
-    return state.user.account
   }
 }
 

src/store/modules/user.js

@@ -18,6 +18,7 @@ const state = {
   id: '',
   name: '',
   avatar: '',
+  account: '',
   roles: new Set(),
   access: new Set(),
   resourceAccess: new Set()
@@ -56,6 +57,9 @@ const mutations = {
   SET_AVATAR (state, avatar) {
     state.avatar = avatar
   },
+  SET_ACCOUNT (state, account) {
+    state.account = account
+  },
   SET_ROLES (state, roles) {
     console.log('roles', roles)
     state.roles = roles
@@ -106,7 +110,6 @@ function parseAccess (realmAccess, resourceAccess, options) {
 const actions = {
   async login ({ commit, dispatch, rootGetters }, keycloak) {
     if (keycloak.authenticated) {
-      inst()
       dispatch('updateUser', keycloak)
       const { tenant, org } = keycloak.tokenParsed
       const { roleSet, accessSet, resourceAccessSet } = parseAccess(keycloak.realmAccess, keycloak.resourceAccess)
@@ -128,13 +131,15 @@ const actions = {
         commit('SET_TENANT_KEY', tenant[0])
         commit('SET_ORG_KEY', org || tenant[0])
       }
+      inst()
     }
   },
   updateUser ({ commit }, keycloak) {
     const { sub, preferred_username, given_name, avatar } = keycloak.tokenParsed
     commit('SET_TOKEN', keycloak.token)
     commit('SET_ID', sub)
-    commit('SET_NAME', given_name || preferred_username)
+    commit('SET_NAME', given_name)
+    commit('SET_ACCOUNT', preferred_username)
     commit('SET_AVATAR', avatar)
   },
   logout () {