Skip to content

Commit

Permalink
Fixed: Invalid JWT: Not enough segments on Logout
Browse files Browse the repository at this point in the history 
The reconnectSSE function attempts to reconnect on error. Avoid attempting to reconnect to SSE with cleared credentials.
  • Loading branch information
Jan Polonsky committed Nov 26, 2024
1 parent 77c935a commit 0a9ab65
Showing 1 changed file with 126 additions and 124 deletions.
250 changes: 126 additions & 124 deletions src/gui/src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,138 @@
<template>
<v-app class="taranis">

<MainMenu v-if="isAuthenticated()"/>

<v-navigation-drawer v-model="visible" width="96px" app clipped color="cx-drawer-bg" v-if="isAuthenticated()">
<router-view name="nav"></router-view>
</v-navigation-drawer>

<v-main>
<router-view/>
</v-main>

<Notification v-if="isAuthenticated()"/>
</v-app>
</template>

<script>
import MainMenu from "./components/MainMenu";
import AuthMixin from "./services/auth/auth_mixin";
import Notification from "./components/common/Notification";
export default {
name: 'App',
components: {
MainMenu,
Notification,
},
data: () => ({
visible: null,
isDark: true,
<template>
<v-app class="taranis">

<MainMenu v-if="isAuthenticated()"/>

<v-navigation-drawer v-model="visible" width="96px" app clipped color="cx-drawer-bg" v-if="isAuthenticated()">
<router-view name="nav"></router-view>
</v-navigation-drawer>

<v-main>
<router-view/>
</v-main>

<Notification v-if="isAuthenticated()"/>
</v-app>
</template>

<script>
import MainMenu from "./components/MainMenu";
import AuthMixin from "./services/auth/auth_mixin";
import Notification from "./components/common/Notification";
export default {
name: 'App',
components: {
MainMenu,
Notification,
},
data: () => ({
visible: null,
isDark: true,
sseConnection: null,
}),
mixins: [AuthMixin],
methods: {
connectSSE() {
this.$sse(((typeof (process.env.VUE_APP_TARANIS_NG_CORE_SSE) == "undefined") ? "$VUE_APP_TARANIS_NG_CORE_SSE" : process.env.VUE_APP_TARANIS_NG_CORE_SSE) + "?jwt=" + this.$store.getters.getJWT, {format: 'json'})
.then(sse => {
}),
mixins: [AuthMixin],
methods: {
connectSSE() {
this.$sse(((typeof (process.env.VUE_APP_TARANIS_NG_CORE_SSE) == "undefined") ? "$VUE_APP_TARANIS_NG_CORE_SSE" : process.env.VUE_APP_TARANIS_NG_CORE_SSE) + "?jwt=" + this.$store.getters.getJWT, {format: 'json'})
.then(sse => {
this.sseConnection = sse
sse.onError(() => {
this.reconnectSSE()
if (this.$store.getters.getJWT != '') {
this.reconnectSSE()
}
});
sse.subscribe('news-items-updated', (data) => {
this.$root.$emit('news-items-updated', data)
});
sse.subscribe('report-items-updated', (data) => {
this.$root.$emit('report-items-updated', data)
});
sse.subscribe('report-item-updated', (data) => {
this.$root.$emit('report-item-updated', data)
});
sse.subscribe('report-item-locked', (data) => {
this.$root.$emit('report-item-locked', data)
});
sse.subscribe('report-item-unlocked', (data) => {
this.$root.$emit('report-item-unlocked', data)
});
sse.subscribe('news-items-updated', (data) => {
this.$root.$emit('news-items-updated', data)
});
sse.subscribe('report-items-updated', (data) => {
this.$root.$emit('report-items-updated', data)
});
sse.subscribe('report-item-updated', (data) => {
this.$root.$emit('report-item-updated', data)
});
sse.subscribe('report-item-locked', (data) => {
this.$root.$emit('report-item-locked', data)
});
sse.subscribe('report-item-unlocked', (data) => {
this.$root.$emit('report-item-unlocked', data)
});
}).catch(event => {
this.sseConnection = event.currentTarget
})
},
reconnectSSE() {
if (this.sseConnection !== null) {
this.sseConnection.close()
this.sseConnection = null
}
this.connectSSE()
},
initUserSettings() {
this.$store.dispatch('getUserProfile').then(() => {
this.$vuetify.theme.dark = this.$store.getters.getProfileDarkTheme
this.$i18n.locale = this.$store.getters.getProfileLanguage
});
}
},
updated() {
this.$root.$emit('app-updated');
},
mounted() {
if (typeof(process.env.VUE_APP_TARANIS_NG_TESTING_TOKEN) == "string") {
this.$cookies.set('jwt', process.env.VUE_APP_TARANIS_NG_TESTING_TOKEN);
}
if (this.$cookies.isKey('jwt')) {
this.$store.dispatch('setToken', this.$cookies.get('jwt')).then(() => {
this.$cookies.remove("jwt")
this.connectSSE()
});
}
if (localStorage.ACCESS_TOKEN) {
if (this.isAuthenticated()) {
this.initUserSettings();
this.connectSSE()
} else {
if (this.$store.getters.getJWT) {
this.logout()
}
}
}
setInterval(function () {
if (this.isAuthenticated()) {
if (this.needTokenRefresh() === true) {
this.$store.dispatch("refresh").then(() => {
this.reconnectSSE()
})
}
} else {
if (this.$store.getters.getJWT) {
this.logout()
}
}
}.bind(this), 5000);
this.$root.$on('nav-clicked', () => {
this.visible = !this.visible
});
this.$root.$on('logged-in', () => {
this.initUserSettings();
this.connectSSE()
});
},
},
reconnectSSE() {
if (this.sseConnection !== null) {
this.sseConnection.close()
this.sseConnection = null
}
this.connectSSE()
},
initUserSettings() {
this.$store.dispatch('getUserProfile').then(() => {
this.$vuetify.theme.dark = this.$store.getters.getProfileDarkTheme
this.$i18n.locale = this.$store.getters.getProfileLanguage
});
}
},
updated() {
this.$root.$emit('app-updated');
},
mounted() {
if (typeof(process.env.VUE_APP_TARANIS_NG_TESTING_TOKEN) == "string") {
this.$cookies.set('jwt', process.env.VUE_APP_TARANIS_NG_TESTING_TOKEN);
}
if (this.$cookies.isKey('jwt')) {
this.$store.dispatch('setToken', this.$cookies.get('jwt')).then(() => {
this.$cookies.remove("jwt")
this.connectSSE()
});
}
if (localStorage.ACCESS_TOKEN) {
if (this.isAuthenticated()) {
this.initUserSettings();
this.connectSSE()
} else {
if (this.$store.getters.getJWT) {
this.logout()
}
}
}
setInterval(function () {
if (this.isAuthenticated()) {
if (this.needTokenRefresh() === true) {
this.$store.dispatch("refresh").then(() => {
this.reconnectSSE()
})
}
} else {
if (this.$store.getters.getJWT) {
this.logout()
}
}
}.bind(this), 5000);
this.$root.$on('nav-clicked', () => {
this.visible = !this.visible
});
this.$root.$on('logged-in', () => {
this.initUserSettings();
this.connectSSE()
});
},
beforeDestroy() {
if (this.sseConnection !== null) {
this.sseConnection.close()
}
}
};
</script>

<style src="./assets/common.css"></style>
<style src="./assets/centralize.css"></style>
};
</script>

<style src="./assets/common.css"></style>
<style src="./assets/centralize.css"></style>

0 comments on commit 0a9ab65

Please sign in to comment.