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 setup-seeding

Browse Source
This commit is contained in:
Moriz Wahl 2021-11-30 08:46:24 +01:00
commit 0d2cf7da48
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -441,7 +441,7 @@ jobs:
report_name: Coverage Admin Interface report_name: Coverage Admin Interface
type: lcov type: lcov
result_path: ./coverage/lcov.info result_path: ./coverage/lcov.info
min_coverage: 51 min_coverage: 49
token: ${{ github.token }} token: ${{ github.token }}
############################################################################## ##############################################################################

7
admin/src/main.js
View File

@ -32,18 +32,17 @@ const authLink = new ApolloLink((operation, forward) => {
Authorization: token && token.length > 0 ? `Bearer ${token}` : '', Authorization: token && token.length > 0 ? `Bearer ${token}` : '',
}, },
}) })
return forward(operation) return forward(operation).map((response) => {
/* .map((response) => {
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 !== '/login') router.push('/login') if (router.currentRoute.path !== '/logout') router.push('/logout')
return response return response
} }
const newToken = operation.getContext().response.headers.get('token') const newToken = operation.getContext().response.headers.get('token')
if (newToken) store.commit('token', newToken) if (newToken) store.commit('token', newToken)
return response return response
}) */ })
}) })
const apolloClient = new ApolloClient({ const apolloClient = new ApolloClient({