@@ -46,7 +46,7 @@ export default {
46
46
BanStore . initBanNotice ( user )
47
47
$prefs . fetch ( )
48
48
socketLogin ( user )
49
- } ) . catch ( ( ) => { } )
49
+ } ) . catch ( ( ) => userCleanup ( `Goodbye ${ user . username } , your session has expired` ) )
50
50
51
51
const login = ( username , password , rememberMe ) => authApi . login ( { username, password, rememberMe } )
52
52
. then ( dbUser => {
@@ -59,18 +59,20 @@ export default {
59
59
} ) . catch ( ( ) => { } )
60
60
61
61
const logout = ( ) => authApi . logout ( )
62
- . then ( ( ) => {
63
- delete user . token // clear token to invalidate session immediately
64
- $appCache . delete ( AUTH_KEY )
65
- $prefs . clear ( )
66
- BanStore . clearBanNotice ( )
67
- $alertStore . warn ( `Goodbye ${ user . username } , you have successfully logged out!` )
68
- // redirect to home on logout
69
- if ( $route . meta . requiresAuth && $route . path !== '/' ) $router . push ( { path : '/' } )
70
- // delay clearing reactive user to give css transitions time to complete
71
- setTimeout ( ( ) => Object . assign ( user , cloneDeep ( emtpyUser ) ) , 500 )
72
- socketLogout ( emtpyUser )
73
- } ) . catch ( ( ) => { } )
62
+ . then ( ( ) => userCleanup ( `Goodbye ${ user . username } , you have successfully logged out!` ) )
63
+
64
+ const userCleanup = msg => {
65
+ delete user . token // clear token to invalidate session immediately
66
+ $appCache . delete ( AUTH_KEY )
67
+ $prefs . clear ( )
68
+ BanStore . clearBanNotice ( )
69
+ $alertStore . warn ( msg )
70
+ // redirect to home on logout
71
+ if ( $route . meta . requiresAuth && $route . path !== '/' ) $router . push ( { path : '/' } )
72
+ // delay clearing reactive user to give css transitions time to complete
73
+ setTimeout ( ( ) => Object . assign ( user , cloneDeep ( emtpyUser ) ) , 500 )
74
+ socketLogout ( emtpyUser )
75
+ }
74
76
75
77
const register = ( email , username , password ) => authApi . register ( { email, username, password } )
76
78
. then ( dbUser => {
0 commit comments