Skip to content

Commit bc471e0

Browse files
chenkiechenkie
committed
simplify setSession
1 parent 6e86376 commit bc471e0

4 files changed

Lines changed: 41 additions & 51 deletions

File tree

‎01-Login/src/Auth/Auth.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@ export default class Auth {
3737
}
3838

3939
setSession(authResult) {
40-
if (authResult && authResult.accessToken && authResult.idToken) {
41-
// Set the time that the access token will expire at
42-
let expiresAt = JSON.stringify((authResult.expiresIn * 1000) + new Date().getTime());
43-
localStorage.setItem('access_token', authResult.accessToken);
44-
localStorage.setItem('id_token', authResult.idToken);
45-
localStorage.setItem('expires_at', expiresAt);
46-
// navigate to the home route
47-
history.replace('/home');
48-
}
40+
// Set the time that the access token will expire at
41+
let expiresAt = JSON.stringify((authResult.expiresIn * 1000) + new Date().getTime());
42+
localStorage.setItem('access_token', authResult.accessToken);
43+
localStorage.setItem('id_token', authResult.idToken);
44+
localStorage.setItem('expires_at', expiresAt);
45+
// navigate to the home route
46+
history.replace('/home');
4947
}
5048

5149
logout() {

‎02-User-Profile/src/Auth/Auth.js‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ export default class Auth {
2929

3030
handleAuthentication() {
3131
this.auth0.parseHash((err, authResult) => {
32-
console.log(err)
33-
console.log(authResult)
3432
if (authResult && authResult.accessToken && authResult.idToken) {
3533
this.setSession(authResult);
3634
history.replace('/home');
@@ -43,17 +41,15 @@ export default class Auth {
4341
}
4442

4543
setSession(authResult) {
46-
if (authResult && authResult.accessToken && authResult.idToken) {
47-
// Set the time that the access token will expire at
48-
let expiresAt = JSON.stringify(
49-
authResult.expiresIn * 1000 + new Date().getTime()
50-
);
51-
localStorage.setItem('access_token', authResult.accessToken);
52-
localStorage.setItem('id_token', authResult.idToken);
53-
localStorage.setItem('expires_at', expiresAt);
54-
// navigate to the home route
55-
history.replace('/home');
56-
}
44+
// Set the time that the access token will expire at
45+
let expiresAt = JSON.stringify(
46+
authResult.expiresIn * 1000 + new Date().getTime()
47+
);
48+
localStorage.setItem('access_token', authResult.accessToken);
49+
localStorage.setItem('id_token', authResult.idToken);
50+
localStorage.setItem('expires_at', expiresAt);
51+
// navigate to the home route
52+
history.replace('/home');
5753
}
5854

5955
getAccessToken() {

‎03-Calling-an-API/src/Auth/Auth.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,15 @@ export default class Auth {
4242
}
4343

4444
setSession(authResult) {
45-
if (authResult && authResult.accessToken && authResult.idToken) {
46-
// Set the time that the access token will expire at
47-
let expiresAt = JSON.stringify(
48-
authResult.expiresIn * 1000 + new Date().getTime()
49-
);
50-
localStorage.setItem('access_token', authResult.accessToken);
51-
localStorage.setItem('id_token', authResult.idToken);
52-
localStorage.setItem('expires_at', expiresAt);
53-
// navigate to the home route
54-
history.replace('/home');
55-
}
45+
// Set the time that the access token will expire at
46+
let expiresAt = JSON.stringify(
47+
authResult.expiresIn * 1000 + new Date().getTime()
48+
);
49+
localStorage.setItem('access_token', authResult.accessToken);
50+
localStorage.setItem('id_token', authResult.idToken);
51+
localStorage.setItem('expires_at', expiresAt);
52+
// navigate to the home route
53+
history.replace('/home');
5654
}
5755

5856
getAccessToken() {

‎04-Authorization/src/Auth/Auth.js‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,22 @@ export default class Auth {
4444
}
4545

4646
setSession(authResult) {
47-
if (authResult && authResult.accessToken && authResult.idToken) {
48-
// Set the time that the access token will expire at
49-
let expiresAt = JSON.stringify(
50-
authResult.expiresIn * 1000 + new Date().getTime()
51-
);
52-
// If there is a value on the `scope` param from the authResult,
53-
// use it to set scopes in the session for the user. Otherwise
54-
// use the scopes as requested. If no scopes were requested,
55-
// set it to nothing
56-
const scopes = authResult.scope || this.requestedScopes || '';
57-
58-
localStorage.setItem('access_token', authResult.accessToken);
59-
localStorage.setItem('id_token', authResult.idToken);
60-
localStorage.setItem('expires_at', expiresAt);
61-
localStorage.setItem('scopes', JSON.stringify(scopes));
62-
// navigate to the home route
63-
history.replace('/home');
64-
}
47+
// Set the time that the access token will expire at
48+
let expiresAt = JSON.stringify(
49+
authResult.expiresIn * 1000 + new Date().getTime()
50+
);
51+
// If there is a value on the `scope` param from the authResult,
52+
// use it to set scopes in the session for the user. Otherwise
53+
// use the scopes as requested. If no scopes were requested,
54+
// set it to nothing
55+
const scopes = authResult.scope || this.requestedScopes || '';
56+
57+
localStorage.setItem('access_token', authResult.accessToken);
58+
localStorage.setItem('id_token', authResult.idToken);
59+
localStorage.setItem('expires_at', expiresAt);
60+
localStorage.setItem('scopes', JSON.stringify(scopes));
61+
// navigate to the home route
62+
history.replace('/home');
6563
}
6664

6765
getAccessToken() {

0 commit comments

Comments
 (0)