IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docu-env-vars

Browse Source
This commit is contained in:
Moriz Wahl 2022-07-14 18:39:21 +02:00 committed by GitHub
commit 46650133b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/SessionLogoutTimeout.spec.js
View File

@ -62,12 +62,16 @@ describe('SessionLogoutTimeout', () => {
}) })
}) })
describe('token is expired', () => { describe('token is expired for several seconds', () => {
beforeEach(() => { beforeEach(() => {
mocks.$store.state.tokenTime = setTokenTime(-60) mocks.$store.state.tokenTime = setTokenTime(-60)
wrapper = Wrapper() wrapper = Wrapper()
}) })
it('has value for remaining seconds equal 0', () => {
expect(wrapper.tokenExpiresInSeconds === 0)
})
it('emits logout', () => { it('emits logout', () => {
expect(wrapper.emitted('logout')).toBeTruthy() expect(wrapper.emitted('logout')).toBeTruthy()
}) })

7
frontend/src/components/SessionLogoutTimeout.vue
View File

@ -65,7 +65,7 @@ export default {
this.$timer.restart('tokenExpires') this.$timer.restart('tokenExpires')
this.$bvModal.show('modalSessionTimeOut') this.$bvModal.show('modalSessionTimeOut')
} }
if (this.tokenExpiresInSeconds <= 0) { if (this.tokenExpiresInSeconds === 0) {
this.$timer.stop('tokenExpires') this.$timer.stop('tokenExpires')
this.$emit('logout') this.$emit('logout')
} }
@ -90,7 +90,10 @@ export default {
}, },
computed: { computed: {
tokenExpiresInSeconds() { tokenExpiresInSeconds() {
return Math.floor((new Date(this.$store.state.tokenTime * 1000).getTime() - this.now) / 1000) const remainingSecs = Math.floor(
(new Date(this.$store.state.tokenTime * 1000).getTime() - this.now) / 1000,
)
return remainingSecs <= 0 ? 0 : remainingSecs
}, },
}, },
beforeDestroy() { beforeDestroy() {