@@ -21,20 +21,18 @@ class Auth extends React.Component {
21
21
? Date . now ( ) + parseInt ( expires_in , 10 ) * 1000
22
22
: null ;
23
23
24
-
25
24
loginSuccess ( access_token , expiresAt ) ;
26
25
localStorage . setItem ( "access_token" , access_token ) ;
27
26
if ( expiresAt ) localStorage . setItem ( "expires_at" , expiresAt ) ;
28
27
29
-
30
28
fetchPermissions ( ) ;
31
29
32
30
window . location . hash = "" ;
33
31
history . replace ( location . pathname ) ;
34
32
return ;
35
33
}
36
34
37
-
35
+
38
36
if ( ! isLoggedIn ) {
39
37
const storedToken = localStorage . getItem ( "access_token" ) ;
40
38
const storedExpiry = localStorage . getItem ( "expires_at" ) ;
@@ -45,14 +43,12 @@ class Auth extends React.Component {
45
43
if ( ! storedExpiresAt || storedExpiresAt > Date . now ( ) ) {
46
44
loginSuccess ( storedToken , storedExpiresAt ) ;
47
45
} else {
48
- // expired → clear out
46
+ // expired
49
47
localStorage . removeItem ( "access_token" ) ;
50
48
localStorage . removeItem ( "expires_at" ) ;
51
49
}
52
50
}
53
51
}
54
-
55
-
56
52
if ( isLoggedIn ) {
57
53
fetchPermissions ( ) ;
58
54
}
@@ -71,8 +67,8 @@ class Auth extends React.Component {
71
67
}
72
68
73
69
const mapStateToProps = state => ( {
74
- hash : selectLocationHash ( state ) ,
75
- isLoggedIn : selectIsLoggedIn ( state )
70
+ hash : selectLocationHash ( state ) ,
71
+ isLoggedIn : selectIsLoggedIn ( state )
76
72
} ) ;
77
73
78
74
export default withRouter (
0 commit comments