From 0ddbe70935cf92f3da66a729a257345985002a12 Mon Sep 17 00:00:00 2001 From: zinyando Date: Thu, 30 Jun 2016 12:45:50 +0200 Subject: [PATCH] Add simple-auth route mixins --- app/app/pods/auth/logout/route.js | 7 +++-- app/app/pods/auth/share/route.js | 3 +- app/app/pods/customize/folders/route.js | 3 +- app/app/pods/customize/general/route.js | 10 ++++-- app/app/pods/customize/route.js | 4 +-- app/app/pods/customize/users/route.js | 3 +- app/app/pods/document/edit/route.js | 5 +-- app/app/pods/document/index/route.js | 5 +-- app/app/pods/document/route.js | 3 +- app/app/pods/document/wizard/route.js | 3 +- app/app/pods/folders/folder/route.js | 3 +- app/app/pods/folders/route.js | 3 +- app/app/pods/folders/settings/route.js | 3 +- app/app/pods/not-found/route.js | 3 +- app/app/pods/profile/route.js | 42 ++++++++++++++----------- app/app/pods/search/route.js | 4 +-- app/app/pods/setup/route.js | 2 +- app/app/pods/widgets/route.js | 4 +-- app/app/routes/application.js | 2 +- 19 files changed, 67 insertions(+), 45 deletions(-) diff --git a/app/app/pods/auth/logout/route.js b/app/app/pods/auth/logout/route.js index cb5e8ba3..9b9fa898 100644 --- a/app/app/pods/auth/logout/route.js +++ b/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"; } } }); diff --git a/app/app/pods/auth/share/route.js b/app/app/pods/auth/share/route.js index 1e9869e8..2d4b7503 100644 --- a/app/app/pods/auth/share/route.js +++ b/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); diff --git a/app/app/pods/customize/folders/route.js b/app/app/pods/customize/folders/route.js index 87920662..a5b8a3a6 100644 --- a/app/app/pods/customize/folders/route.js +++ b/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() { diff --git a/app/app/pods/customize/general/route.js b/app/app/pods/customize/general/route.js index a4659df0..f58f3021 100644 --- a/app/app/pods/customize/general/route.js +++ b/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() { diff --git a/app/app/pods/customize/route.js b/app/app/pods/customize/route.js index 1f6a1416..f49002d0 100644 --- a/app/app/pods/customize/route.js +++ b/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')) { diff --git a/app/app/pods/customize/users/route.js b/app/app/pods/customize/users/route.js index 444762c2..4f385c09 100644 --- a/app/app/pods/customize/users/route.js +++ b/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() { diff --git a/app/app/pods/document/edit/route.js b/app/app/pods/document/edit/route.js index f0c6b802..83d06b96 100644 --- a/app/app/pods/document/edit/route.js +++ b/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) }); } -}); \ No newline at end of file +}); diff --git a/app/app/pods/document/index/route.js b/app/app/pods/document/index/route.js index a6970a6d..f7dc11e5 100644 --- a/app/app/pods/document/index/route.js +++ b/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'); } -}); \ No newline at end of file +}); diff --git a/app/app/pods/document/route.js b/app/app/pods/document/route.js index e72642cd..155d4920 100644 --- a/app/app/pods/document/route.js +++ b/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) { diff --git a/app/app/pods/document/wizard/route.js b/app/app/pods/document/wizard/route.js index fe460b1a..9ec0fe68 100644 --- a/app/app/pods/document/wizard/route.js +++ b/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'), diff --git a/app/app/pods/folders/folder/route.js b/app/app/pods/folders/folder/route.js index 9f99bc98..429c9800 100644 --- a/app/app/pods/folders/folder/route.js +++ b/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'), diff --git a/app/app/pods/folders/route.js b/app/app/pods/folders/route.js index cd49151f..8ef4415b 100644 --- a/app/app/pods/folders/route.js +++ b/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) { diff --git a/app/app/pods/folders/settings/route.js b/app/app/pods/folders/settings/route.js index 4ecfa128..56a14d6e 100644 --- a/app/app/pods/folders/settings/route.js +++ b/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: {}, diff --git a/app/app/pods/not-found/route.js b/app/app/pods/not-found/route.js index 2d0e9ae5..dae8fd4d 100644 --- a/app/app/pods/not-found/route.js +++ b/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'); diff --git a/app/app/pods/profile/route.js b/app/app/pods/profile/route.js index 851ac21f..468d1c94 100644 --- a/app/app/pods/profile/route.js +++ b/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({ - userService: Ember.inject.service('user'), - folderService: Ember.inject.service('folder'), +export default Ember.Route.extend(AuthenticatedRouteMixin, { + userService: Ember.inject.service('user'), + folderService: Ember.inject.service('folder'), + session: Ember.inject.service(), - beforeModel: function() { - if (!this.session.authenticated) { - this.transitionTo('auth.login'); - } - }, - model: function() { - return this.get('userService').getUser(this.session.user.id); - }, - - afterModel: function(model) { - this.browser.setTitleWithoutSuffix(model.get('fullname')); - }, - - setupController(controller, model) { - controller.set('model', model); - controller.set("folder", this.get('folderService.currentFolder')); + beforeModel: function() { + if (!this.get("session").authenticated) { + this.transitionTo('auth.login'); } + }, + + 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')); + } }); diff --git a/app/app/pods/search/route.js b/app/app/pods/search/route.js index 580776c8..585deb19 100644 --- a/app/app/pods/search/route.js +++ b/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); diff --git a/app/app/pods/setup/route.js b/app/app/pods/setup/route.js index a40ebd8c..d33439e1 100644 --- a/app/app/pods/setup/route.js +++ b/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 + "'"; } -}); \ No newline at end of file +}); diff --git a/app/app/pods/widgets/route.js b/app/app/pods/widgets/route.js index 26d9f312..c89c0208 100644 --- a/app/app/pods/widgets/route.js +++ b/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); diff --git a/app/app/routes/application.js b/app/app/routes/application.js index 40d173cc..a59fd75c 100644 --- a/app/app/routes/application.js +++ b/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');