From 7cce377f93a2f0085e794599cb74a5be7fdec386 Mon Sep 17 00:00:00 2001
From: zinyando <brizdigital@gmail.com>
Date: Mon, 27 Jun 2016 14:47:48 +0200
Subject: [PATCH] Clean up

---
 app/app/services/app-meta.js |  2 +-
 app/app/services/session.js  | 40 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/app/services/app-meta.js b/app/app/services/app-meta.js
index d1b89f19..b93b127d 100644
--- a/app/app/services/app-meta.js
+++ b/app/app/services/app-meta.js
@@ -33,7 +33,7 @@ export default Ember.Service.extend({
 		}
 
 		return this.get('ajax').request('public/meta')
-	        .then((response) => {
+		.then((response) => {
 				this.setProperties(response);
 	        });
 	}
diff --git a/app/app/services/session.js b/app/app/services/session.js
index dee0fac4..80bceaf0 100644
--- a/app/app/services/session.js
+++ b/app/app/services/session.js
@@ -139,6 +139,26 @@ export default Ember.Service.extend({
 
     // Application boot process
     boot() {
+		let token = this.getSessionItem('token');
+
+		// TODO: the rest should be done through ESA
+		if (is.not.undefined(token)) {
+			// We now validate current token
+
+			return this.get('ajax').request(`public/validate?token=${token}`, {
+				method: 'GET',
+				contentType: 'json'
+			}).then((user) => {
+				this.setSession(token, models.UserModel.create(user));
+				this.set('ready', true);
+			}).catch((reason) => {
+				if (netUtil.isAjaxAccessError(reason)) {
+					localStorage.clear();
+					window.location.href = "/auth/login";
+				}
+			});
+		}
+
         let self = this;
         let dbhash = "";
 
@@ -194,25 +214,5 @@ export default Ember.Service.extend({
                 });
             }
         });
-
-		let token = this.getSessionItem('token');
-
-		// TODO: the rest should be done through ESA
-		if (is.not.undefined(token)) {
-			// We now validate current token
-
-			return this.get('ajax').request(`public/validate?token=${token}`, {
-				method: 'GET',
-				contentType: 'json'
-			}).then((user) => {
-				this.setSession(token, models.UserModel.create(user));
-				this.set('ready', true);
-			}).catch((reason) => {
-				if (netUtil.isAjaxAccessError(reason)) {
-					localStorage.clear();
-					window.location.href = "/auth/login";
-				}
-			});
-		}
     }
 });