diff --git a/admin/.env.dist b/admin/.env.dist index 6d78e6782..7e81ca9ab 100644 --- a/admin/.env.dist +++ b/admin/.env.dist @@ -1,3 +1,4 @@ GRAPHQL_URI=http://localhost:4000/graphql WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1 +WALLET_URL=http://localhost/vue/login DEBUG_DISABLE_AUTH=false \ No newline at end of file diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js index 6871cb4f7..621ba0eb9 100644 --- a/admin/src/components/NavBar.spec.js +++ b/admin/src/components/NavBar.spec.js @@ -53,13 +53,17 @@ describe('NavBar', () => { }) describe('logout', () => { - // const assignLocationSpy = jest.fn() + const windowLocationMock = jest.fn() beforeEach(async () => { + delete window.location + window.location = { + assign: windowLocationMock, + } await wrapper.findAll('a').at(6).trigger('click') }) it('redirects to /logout', () => { - expect(routerPushMock).toBeCalledWith('/logout') + expect(windowLocationMock).toBeCalledWith('http://localhost/vue/login') }) it('dispatches logout to store', () => { diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 03ace0335..c1c315755 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -33,8 +33,9 @@ export default { name: 'navbar', methods: { logout() { + window.location.assign(CONFIG.WALLET_URL) + // window.location = CONFIG.WALLET_URL this.$store.dispatch('logout') - this.$router.push('/logout') }, wallet() { window.location = CONFIG.WALLET_AUTH_URL.replace('$1', this.$store.state.token) diff --git a/admin/src/config/index.js b/admin/src/config/index.js index 69d30a66a..430f10d36 100644 --- a/admin/src/config/index.js +++ b/admin/src/config/index.js @@ -20,6 +20,7 @@ const environment = { const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1', + WALLET_URL: process.env.WALLET_URL || 'http://localhost/vue/login', } const debug = {