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 pull request #889 from gradido/hadnle-expired-jwt

Browse Source 
feat: Redirect to Login when JWT has expired
This commit is contained in:
Moriz Wahl 2021-09-24 11:17:53 +02:00 committed by GitHub
commit f792d8e02b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/jwt/decode.ts
View File

@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken'
import CONFIG from '../config/' import CONFIG from '../config/'
export default (token: string): any => { export default (token: string): any => {
if (!token) return null if (!token) return new Error('401 Unauthorized')
let sessionId = null let sessionId = null
try { try {
const decoded = jwt.verify(token, CONFIG.JWT_SECRET) const decoded = jwt.verify(token, CONFIG.JWT_SECRET)
@ -15,6 +15,6 @@ export default (token: string): any => {
sessionId, sessionId,
} }
} catch (err) { } catch (err) {
return null throw new Error('403.13 - Client certificate revoked')
} }
} }

3
frontend/src/locales/de.json
View File

@ -36,7 +36,8 @@
"error": { "error": {
"change-password": "Fehler beim Ändern des Passworts", "change-password": "Fehler beim Ändern des Passworts",
"error": "Fehler", "error": "Fehler",
"no-account": "Leider konnten wir keinen Account finden mit diesen Daten!" "no-account": "Leider konnten wir keinen Account finden mit diesen Daten!",
"session-expired": "Sitzung abgelaufen!"
}, },
"form": { "form": {
"amount": "Betrag", "amount": "Betrag",

3
frontend/src/locales/en.json
View File

@ -36,7 +36,8 @@
"error": { "error": {
"change-password": "Error while changing password", "change-password": "Error while changing password",
"error": "Error", "error": "Error",
"no-account": "Unfortunately we could not find an account to the given data!" "no-account": "Unfortunately we could not find an account to the given data!",
"session-expired": "The session expired"
}, },
"form": { "form": {
"amount": "Amount", "amount": "Amount",

6
frontend/src/main.js
View File

@ -21,6 +21,12 @@ const authLink = new ApolloLink((operation, forward) => {
}, },
}) })
return forward(operation).map((response) => { return forward(operation).map((response) => {
if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
response.errors[0].message = i18n.t('error.session-expired')
store.dispatch('logout', null)
if (router.currentRoute.path !== '/login') router.push('/login')
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