Add simple-auth route mixins

app/app/pods/auth/logout/route.js

@@ -2,14 +2,17 @@ import Ember from 'ember';
 import config from 'documize/config/environment';
 
 export default Ember.Route.extend({
+    session: Ember.inject.service(),
+    appMeta: Ember.inject.service(),
+
     activate: function(){
-        this.session.logout();
+        this.get('session').invalidate();
         this.audit.record("logged-in");
         this.audit.stop();
         if (config.environment === 'test') {
             this.transitionTo('auth.login');
         }else{
-            window.document.location = this.session.appMeta.allowAnonymousAccess ? "/" : "/auth/login";
+            window.document.location = this.get("appMeta.allowAnonymousAccess") ? "/" : "/auth/login";
         }
     }
 });

app/app/pods/auth/share/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     model: function(params) {
         this.set('folderId', params.id);
         this.set('slug', params.slug);

app/app/pods/customize/folders/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     folderService: Ember.inject.service('folder'),
 
     beforeModel() {

app/app/pods/customize/general/route.js

@@ -1,16 +1,20 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     orgService: Ember.inject.service('organization'),
+    appMeta: Ember.inject.service(),
+    session: Ember.inject.service(),
 
     beforeModel()  {
-        if (!this.session.isAdmin) {
+        if (!this.get("session.isAdmin")) {
             this.transitionTo('auth.login');
         }
     },
 
     model() {
-        return this.get('orgService').getOrg(this.session.appMeta.get('orgId'));
+        let orgId = this.get("appMeta.orgId");
+        return this.get('orgService').getOrg(orgId);
     },
 
     activate() {

app/app/pods/customize/route.js

@@ -1,8 +1,8 @@
 /*global is*/
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
-{
     beforeModel: function(transition)
     {
         if (is.equal(transition.targetName, 'customize.index')) {

app/app/pods/customize/users/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     userService: Ember.inject.service('user'),
 
     beforeModel: function() {

app/app/pods/document/edit/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     documentService: Ember.inject.service('document'),
     folderService: Ember.inject.service('folder'),
 
@@ -16,4 +17,4 @@ export default Ember.Route.extend({
             meta: self.get('documentService').getPageMeta(self.paramsFor('document').document_id, params.page_id)
         });
     }
-});
+});

app/app/pods/document/index/route.js

@@ -1,7 +1,8 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 // import models from '../../../utils/model';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     documentService: Ember.inject.service('document'),
     folderService: Ember.inject.service('folder'),
     userService: Ember.inject.service('user'),
@@ -106,4 +107,4 @@ export default Ember.Route.extend({
     deactivate() {
         Ember.$('html').removeClass('background-color-white');
     }
-});
+});

app/app/pods/document/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	documentService: Ember.inject.service('document'),
 
 	model: function(params) {

app/app/pods/document/wizard/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
     documentService: Ember.inject.service('document'),
 	folderService: Ember.inject.service('folder'),
 	sectionService: Ember.inject.service('section'),

app/app/pods/folders/folder/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	documentService: Ember.inject.service('document'),
     folderService: Ember.inject.service('folder'),
 

app/app/pods/folders/route.js

@@ -3,6 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
     folderService: Ember.inject.service('folder'),
+    localStorage: Ember.inject.service(),
     folder: {},
 
     model: function() {
@@ -13,7 +14,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
         let self = this;
 
         if (is.empty(this.paramsFor('folders.folder'))) {
-            var lastFolder = this.session.getSessionItem("folder");
+            var lastFolder = this.get('localStorage').getSessionItem("folder");
 
             if (is.not.undefined(lastFolder)) {
                 this.get('folderService').getFolder(lastFolder).then(function(folder) {

app/app/pods/folders/settings/route.js

@@ -1,8 +1,9 @@
 import Ember from 'ember';
 import models from '../../../utils/model';
 import NotifierMixin from '../../../mixins/notifier';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(NotifierMixin, {
+export default Ember.Route.extend(NotifierMixin, AuthenticatedRouteMixin, {
     folderService: Ember.inject.service('folder'),
     userService: Ember.inject.service('user'),
     folder: {},

app/app/pods/not-found/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
     beforeModel: function() {
         this.transitionTo('folders');

app/app/pods/profile/route.js

@@ -1,25 +1,29 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
-    userService: Ember.inject.service('user'),
+  userService: Ember.inject.service('user'),
-	folderService: Ember.inject.service('folder'),
+  folderService: Ember.inject.service('folder'),
+  session: Ember.inject.service(),
 
-    beforeModel: function() {
-        if (!this.session.authenticated) {
-            this.transitionTo('auth.login');
-        }
-    },
 
-    model: function() {
+  beforeModel: function() {
-        return this.get('userService').getUser(this.session.user.id);
+    if (!this.get("session").authenticated) {
-    },
+      this.transitionTo('auth.login');
-
-    afterModel: function(model) {
-        this.browser.setTitleWithoutSuffix(model.get('fullname'));
-    },
-
-    setupController(controller, model) {
-        controller.set('model', model);
-		controller.set("folder", this.get('folderService.currentFolder'));
     }
+  },
+
+  model: function() {
+    return this.get('userService').getUser(this.get("session.session.authenticated.user.id"));
+    debugger;
+  },
+
+  afterModel: function(model) {
+    this.browser.setTitleWithoutSuffix(model.get('fullname'));
+  },
+
+  setupController(controller, model) {
+    controller.set('model', model);
+    controller.set("folder", this.get('folderService.currentFolder'));
+  }
 });

app/app/pods/search/route.js

@@ -1,5 +1,5 @@
 // Copyright (c) 2015 Documize Inc.
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin);
-});

app/app/pods/setup/route.js

@@ -29,4 +29,4 @@ export default Ember.Route.extend({
     activate() {
         document.title = "Setup Documize database '" + document.head.querySelector("[property=dbname]").content + "'";
     }
-});
+});

app/app/pods/widgets/route.js

@@ -1,4 +1,4 @@
 import Ember from 'ember';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend({
+export default Ember.Route.extend(AuthenticatedRouteMixin);
-});

app/app/routes/application.js

@@ -28,7 +28,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
       return;
     });
   },
-  
+
   actions: {
     willTransition: function( /*transition*/ ) {
       $("#zone-sidebar").css('height', 'auto');