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

Fix redirect to /logout, now redirects to the wallet login.

Browse Source
This commit is contained in:
elweyn 2022-01-12 11:52:30 +01:00
parent e5a79982b5
commit a3682a424e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/src/plugins/apolloProvider.js
View File

@ -2,7 +2,6 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
import VueApollo from 'vue-apollo' import VueApollo from 'vue-apollo'
import CONFIG from '../config' import CONFIG from '../config'
import store from '../store/store' import store from '../store/store'
import router from '../router/router'
import i18n from '../i18n' import i18n from '../i18n'
const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
@ -18,7 +17,7 @@ const authLink = new ApolloLink((operation, forward) => {
if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') { if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
response.errors[0].message = i18n.t('error.session-expired') response.errors[0].message = i18n.t('error.session-expired')
store.dispatch('logout', null) store.dispatch('logout', null)
if (router.currentRoute.path !== '/logout') router.push('/logout') window.location.assign(CONFIG.WALLET_URL)
return response return response
} }
const newToken = operation.getContext().response.headers.get('token') const newToken = operation.getContext().response.headers.get('token')

14
admin/src/plugins/apolloProvider.test.js
View File

@ -66,6 +66,11 @@ describe('apolloProvider', () => {
path: '/overview', path: '/overview',
} }
const windowLocationMock = jest.fn()
delete window.location
window.location = {
assign: windowLocationMock,
}
// mock context // mock context
const setContextMock = jest.fn() const setContextMock = jest.fn()
const getContextMock = jest.fn(() => { const getContextMock = jest.fn(() => {
@ -130,18 +135,13 @@ describe('apolloProvider', () => {
describe('current route is not logout', () => { describe('current route is not logout', () => {
it('redirects to logout', () => { it('redirects to logout', () => {
expect(routerPushMock).toBeCalledWith('/logout') expect(windowLocationMock).toBeCalledWith('http://localhost/vue/login')
}) })
}) })
describe('current route is logout', () => { describe('current route is logout', () => {
beforeEach(() => {
jest.clearAllMocks()
router.currentRoute.path = '/logout'
})
it('does not redirect to logout', () => { it('does not redirect to logout', () => {
expect(routerPushMock).not.toBeCalled() expect(windowLocationMock).toBeCalledWith('http://localhost/vue/login')
}) })
}) })
}) })