Auto merge of #2290 - rust-lang:native-classes-services, r=Turbo87

Migrate services to native classes

Author: bors

app/services/fetcher.js

@@ -1,8 +1,8 @@
 import Service, { inject as service } from '@ember/service';
 import ajax from 'ember-fetch/ajax';
 
-export default Service.extend({
-  fastboot: service(),
+export default class FetcherService extends Service {
+  @service fastboot;
 
   ajax(url) {
     let fastboot = this.fastboot;
@@ -23,8 +23,8 @@ export default Service.extend({
       }
       return resp;
     });
-  },
-});
+  }
+}
 
 function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj));

app/services/flash-messages.js

@@ -1,19 +1,19 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-  message: null,
-  _nextMessage: null,
+export default class FlashMessagesService extends Service {
+  message = null;
+  _nextMessage = null;
 
   show(message) {
     this.set('message', message);
-  },
+  }
 
   queue(message) {
     this.set('_nextMessage', message);
-  },
+  }
 
   step() {
     this.set('message', this._nextMessage);
     this.set('_nextMessage', null);
-  },
-});
+  }
+}

app/services/redirector.js

@@ -1,8 +1,8 @@
 import Service, { inject as service } from '@ember/service';
 import window from 'ember-window-mock';
 
-export default Service.extend({
-  fastboot: service(),
+export default class RedirectorService extends Service {
+  @service fastboot;
 
   redirectTo(url) {
     if (this.fastboot.isFastBoot) {
@@ -12,5 +12,5 @@ export default Service.extend({
     } else {
       window.location = url;
     }
-  },
-});
+  }
+}

app/services/search.js

@@ -1,5 +1,5 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-  q: null,
-});
+export default class SearchService extends Service {
+  q = null;
+}

app/services/session.js

@@ -3,19 +3,20 @@ import Service, { inject as service } from '@ember/service';
 import ajax from 'ember-fetch/ajax';
 import window from 'ember-window-mock';
 
-export default Service.extend({
-  savedTransition: null,
-  abortedTransition: null,
-  isLoggedIn: false,
-  currentUser: null,
-  currentUserDetected: false,
-  ownedCrates: A(),
+export default class SessionService extends Service {
+  @service store;
+  @service router;
 
-  store: service(),
-  router: service(),
+  savedTransition = null;
+  abortedTransition = null;
+  isLoggedIn = false;
+  currentUser = null;
+  currentUserDetected = false;
+  ownedCrates = A();
+
+  constructor() {
+    super(...arguments);
 
-  init() {
-    this._super(...arguments);
     let isLoggedIn;
     try {
       isLoggedIn = window.localStorage.getItem('isLoggedIn') === '1';
@@ -24,7 +25,7 @@ export default Service.extend({
     }
     this.set('isLoggedIn', isLoggedIn);
     this.set('currentUser', null);
-  },
+  }
 
   loginUser(user) {
     this.set('isLoggedIn', true);
@@ -34,7 +35,7 @@ export default Service.extend({
     } catch (e) {
       // ignore error
     }
-  },
+  }
 
   logoutUser() {
     this.set('savedTransition', null);
@@ -47,7 +48,7 @@ export default Service.extend({
     } catch (e) {
       // ignore error
     }
-  },
+  }
 
   loadUser() {
     if (this.isLoggedIn && !this.currentUser) {
@@ -64,7 +65,7 @@ export default Service.extend({
     } else {
       this.set('currentUserDetected', true);
     }
-  },
+  }
 
   fetchUser() {
     return ajax('/api/v1/me').then(response => {
@@ -73,7 +74,7 @@ export default Service.extend({
         response.owned_crates.map(c => this.store.push(this.store.normalize('owned-crate', c))),
       );
     });
-  },
+  }
 
   checkCurrentUser(transition, beforeRedirect) {
     if (this.currentUser) {
@@ -94,5 +95,5 @@ export default Service.extend({
       }
       return this.router.transitionTo('index');
     }
-  },
-});
+  }
+}