@@ -3,19 +3,20 @@ import Service, { inject as service } from '@ember/service';
33import ajax from 'ember-fetch/ajax' ;
44import window from 'ember-window-mock' ;
55
6- export default Service . extend ( {
7- savedTransition : null ,
8- abortedTransition : null ,
9- isLoggedIn : false ,
10- currentUser : null ,
11- currentUserDetected : false ,
12- ownedCrates : A ( ) ,
6+ export default class SessionService extends Service {
7+ @service store ;
8+ @service router ;
139
14- store : service ( ) ,
15- router : service ( ) ,
10+ savedTransition = null ;
11+ abortedTransition = null ;
12+ isLoggedIn = false ;
13+ currentUser = null ;
14+ currentUserDetected = false ;
15+ ownedCrates = A ( ) ;
16+
17+ constructor ( ) {
18+ super ( ...arguments ) ;
1619
17- init ( ) {
18- this . _super ( ...arguments ) ;
1920 let isLoggedIn ;
2021 try {
2122 isLoggedIn = window . localStorage . getItem ( 'isLoggedIn' ) === '1' ;
@@ -24,7 +25,7 @@ export default Service.extend({
2425 }
2526 this . set ( 'isLoggedIn' , isLoggedIn ) ;
2627 this . set ( 'currentUser' , null ) ;
27- } ,
28+ }
2829
2930 loginUser ( user ) {
3031 this . set ( 'isLoggedIn' , true ) ;
@@ -34,7 +35,7 @@ export default Service.extend({
3435 } catch ( e ) {
3536 // ignore error
3637 }
37- } ,
38+ }
3839
3940 logoutUser ( ) {
4041 this . set ( 'savedTransition' , null ) ;
@@ -47,7 +48,7 @@ export default Service.extend({
4748 } catch ( e ) {
4849 // ignore error
4950 }
50- } ,
51+ }
5152
5253 loadUser ( ) {
5354 if ( this . isLoggedIn && ! this . currentUser ) {
@@ -64,7 +65,7 @@ export default Service.extend({
6465 } else {
6566 this . set ( 'currentUserDetected' , true ) ;
6667 }
67- } ,
68+ }
6869
6970 fetchUser ( ) {
7071 return ajax ( '/api/v1/me' ) . then ( response => {
@@ -73,7 +74,7 @@ export default Service.extend({
7374 response . owned_crates . map ( c => this . store . push ( this . store . normalize ( 'owned-crate' , c ) ) ) ,
7475 ) ;
7576 } ) ;
76- } ,
77+ }
7778
7879 checkCurrentUser ( transition , beforeRedirect ) {
7980 if ( this . currentUser ) {
@@ -94,5 +95,5 @@ export default Service.extend({
9495 }
9596 return this . router . transitionTo ( 'index' ) ;
9697 }
97- } ,
98- } ) ;
98+ }
99+ }
0 commit comments