Clean up

app/app/models/folder.js

@@ -2,6 +2,7 @@ import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import constants from '../utils/constants';
 import stringUtil from '../utils/string';
+import Ember from 'ember';
 // import { belongsTo, hasMany } from 'ember-data/relationships';
 
 export default Model.extend({

app/app/models/protected-folder-participant.js

@@ -1,5 +1,6 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
+import Ember from 'ember';
 // import { belongsTo, hasMany } from 'ember-data/relationships';
 
 export default Model.extend({

app/app/models/section.js

@@ -1,5 +1,6 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
+import Ember from 'ember';
 // import { belongsTo, hasMany } from 'ember-data/relationships';
 
 export default Model.extend({

app/app/services/ajax.js

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -14,6 +14,7 @@ import AjaxService from 'ember-ajax/services/ajax';
 import config from '../config/environment';
 
 const {
+	computed,
 	inject: { service }
 } = Ember;
 
@@ -22,7 +23,7 @@ export default AjaxService.extend({
 	host: config.apiHost,
 	namespace: config.apiNamespace,
 
-	headers: Ember.computed('session.session.content.authenticated.token', {
+	headers: computed('session.session.content.authenticated.token', {
 		get() {
 			let headers = {};
 			const token = this.get('session.session.content.authenticated.token');
@@ -33,4 +34,4 @@ export default AjaxService.extend({
 			return headers;
 		}
 	})
-});
+});

app/app/services/audit.js

@@ -13,9 +13,13 @@ import Ember from 'ember';
 import netUtil from '../utils/net';
 import config from '../config/environment';
 
+const {
+	inject: { service }
+} = Ember;
+
 export default Ember.Service.extend({
-	session: Ember.inject.service('session'),
+	session: service('session'),
-	appMeta: Ember.inject.service(),
+	appMeta: service(),
 	ready: false,
 	enabled: config.APP.auditEnabled,
 	appId: config.APP.intercomKey,

app/app/services/document.js

@@ -253,6 +253,10 @@ export default Ember.Service.extend({
 		}).then((response) => {
 			let data = [];
 
+			if (isObject(response)) {
+				return data;
+			}
+
 			data = response.map((obj) => {
 				let data = this.get('store').normalize('attachment', obj);
 				return this.get('store').push({ data: data });
@@ -270,3 +274,7 @@ export default Ember.Service.extend({
 		});
 	},
 });
+
+function isObject(a) {
+	return (!!a) && (a.constructor === Object);
+}

app/app/services/folder.js

@@ -14,6 +14,7 @@ import BaseService from '../services/base';
 
 const {
 	get,
+	RSVP: { resolve },
 	inject: { service }
 } = Ember;
 
@@ -29,7 +30,6 @@ export default BaseService.extend({
 
 	// Add a new folder.
 	add(folder) {
-
 		return this.get('ajax').post(`folders`, {
 			contentType: 'json',
 			data: JSON.stringify(folder)
@@ -54,7 +54,7 @@ export default BaseService.extend({
 	getAll() {
 
 		if (this.get('folders') != null) {
-			return new Ember.RSVP.resolve(this.get('folders'));
+			return new resolve(this.get('folders'));
 		} else {
 			return this.reload();
 		}

app/app/services/search.js

@@ -11,16 +11,20 @@
 
 import Ember from 'ember';
 
+const {
+	inject: { service }
+} = Ember;
+
 export default Ember.Service.extend({
-    sessionService: Ember.inject.service('session'),
+	sessionService: service('session'),
-    ajax: Ember.inject.service(),
+	ajax: service(),
 
-    // getUsers returns all users for organization.
+	// getUsers returns all users for organization.
-    find(keywords) {
+	find(keywords) {
-        let url = "search?keywords=" + encodeURIComponent(keywords);
+		let url = "search?keywords=" + encodeURIComponent(keywords);
 
-        return this.get('ajax').request(url, {
+		return this.get('ajax').request(url, {
-            method: "GET"
+			method: "GET"
-        });
+		});
-    },
+	},
 });

app/app/services/section.js

@@ -12,10 +12,14 @@
 import Ember from 'ember';
 import BaseService from '../services/base';
 
+const {
+	inject: { service }
+} = Ember;
+
 export default BaseService.extend({
-	sessionService: Ember.inject.service('session'),
+	sessionService: service('session'),
-	ajax: Ember.inject.service(),
+	ajax: service(),
-	store: Ember.inject.service(),
+	store: service(),
 
 	// Returns all available sections.
 	getAll() {

app/app/services/user.js

@@ -11,10 +11,16 @@
 
 import Ember from 'ember';
 
+const {
+	isEmpty,
+	RSVP,
+	inject: { service }
+} = Ember;
+
 export default Ember.Service.extend({
-	sessionService: Ember.inject.service('session'),
+	sessionService: service('session'),
-	ajax: Ember.inject.service(),
+	ajax: service(),
-	store: Ember.inject.service(),
+	store: service(),
 
 	// Adds a new user.
 	add(user) {
@@ -23,8 +29,8 @@ export default Ember.Service.extend({
 			data: JSON.stringify(user),
 			contentType: 'json'
 		}).then((response) => {
-			let user = this.get('store').normalize('user', response);
+			let data = this.get('store').normalize('user', response);
-			return this.get('store').push({ data: user });
+			return this.get('store').push({ data: data });
 		});
 	},
 
@@ -35,8 +41,8 @@ export default Ember.Service.extend({
 		return this.get('ajax').request(url, {
 			type: 'GET'
 		}).then((response) => {
-			let user = this.get('store').normalize('user', response);
+			let data = this.get('store').normalize('user', response);
-			return this.get('store').push({ data: user });
+			return this.get('store').push({ data: data });
 		});
 	},
 
@@ -44,8 +50,8 @@ export default Ember.Service.extend({
 	getAll() {
 		return this.get('ajax').request(`users`).then((response) => {
 			return response.map((obj) => {
-				let user = this.get('store').normalize('user', obj);
+				let data = this.get('store').normalize('user', obj);
-				return this.get('store').push({ data: user });
+				return this.get('store').push({ data: data });
 			});
 		});
 	},
@@ -61,7 +67,7 @@ export default Ember.Service.extend({
 
 			data = response.map((obj) => {
 				let data = this.get('store').normalize('user', obj);
-				return this.get('store').push({ data: data })
+				return this.get('store').push({ data: data });
 			});
 
 			return data;
@@ -105,8 +111,8 @@ export default Ember.Service.extend({
 	forgotPassword(email) {
 		let url = `public/forgot`;
 
-		if (is.empty(email)) {
+		if (isEmpty(email)) {
-			return Ember.RSVP.reject("invalid");
+			return RSVP.reject("invalid");
 		}
 
 		let data = JSON.stringify({
@@ -124,8 +130,8 @@ export default Ember.Service.extend({
 	resetPassword(token, password) {
 		var url = `public/reset/${token}`;
 
-		if (is.empty(token) || is.empty(password)) {
+		if (isEmpty(token) || isEmpty(password)) {
-			return Ember.RSVP.reject("invalid");
+			return RSVP.reject("invalid");
 		}
 
 		return this.get('ajax').request(url, {