From 459bd7d6bef6ba969face85e0c12694fa378edcc Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 8 Jun 2015 11:36:55 -0800 Subject: [PATCH] Upgrading authentication libs --- app/initializers/custom-session.js | 31 +++++++++++++++--------------- app/pods/application/route.js | 3 +++ app/pods/login/controller.js | 20 +++++++++---------- app/pods/login/route.js | 3 ++- bower.json | 2 +- config/environment.js | 3 +++ package.json | 4 ++-- 7 files changed, 36 insertions(+), 30 deletions(-) diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js index 7690ae2..45b2a27 100644 --- a/app/initializers/custom-session.js +++ b/app/initializers/custom-session.js @@ -1,5 +1,5 @@ -// from: http://blog.willrax.com/fetching-the-current-user-with-simple-auth/ import Ember from "ember"; +import DS from 'ember-data'; import Session from "simple-auth/session"; // This is pulled straight from ember-cli-simple-auth-token @@ -12,22 +12,23 @@ function getTokenData(token) { } } +var CustomSession = Session.extend({ + currentUser: function() { + let token = this.get('secure.token'); + if (!Ember.isEmpty(token)) { + let t = getTokenData(token); + return DS.PromiseObject.create({ + promise: this.container.lookup('store:main').find('user', t['sub']) + }); + } + return null; + }.property('token') +}); + export default { name: "custom-session", before: "simple-auth", - initialize: function(container) { - Session.reopen({ - setCurrentUser: function() { - var token = this.get("token"); - var self = this; - - if (!Ember.isEmpty(token)) { - var t = getTokenData(token); - return container.lookup("store:main").find("user", t['sub']).then(function(user) { - self.set("currentUser", user); - }); - } - }.observes("token") - }); + initialize: function(container, application) { + application.register('session:custom', CustomSession); } }; diff --git a/app/pods/application/route.js b/app/pods/application/route.js index 9556470..6d268cc 100644 --- a/app/pods/application/route.js +++ b/app/pods/application/route.js @@ -4,6 +4,9 @@ import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin'; export default Ember.Route.extend(ApplicationRouteMixin, { actions: { + invalidateSession: function() { + this.get('session').invalidate(); + }, loading: function() { NProgress.start(); this.router.one('didTransition', function() { diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index 20cb981..d055e8f 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -1,20 +1,18 @@ import Ember from 'ember'; -import LoginControllerMixin from 'simple-auth/mixins/login-controller-mixin'; -export default Ember.Controller.extend(LoginControllerMixin, { - authenticator: 'simple-auth-authenticator:jwt', - loading: false, +export default Ember.Controller.extend({ actions: { authenticate: function() { this.set('errorMessage', null); - var _this = this; + let credentials = this.getProperties('identification', 'password'); + let authenticator = 'simple-auth-authenticator:token'; + this.set('loading', true); - this._super().then(function() { - _this.set('loading', false); - }, function(error) { - _this.set('loading', false); - var message = error.error; - _this.set('errorMessage', message); + this.get('session').authenticate(authenticator, credentials).then(()=>{ + this.set('loading', false); + }, (error)=> { + this.set('loading', false); + this.set('errorMessage', error.error); }); } } diff --git a/app/pods/login/route.js b/app/pods/login/route.js index 003ca95..596bf30 100644 --- a/app/pods/login/route.js +++ b/app/pods/login/route.js @@ -1,6 +1,7 @@ import Ember from 'ember'; +import UnauthenticatedRouteMixin from 'simple-auth/mixins/unauthenticated-route-mixin'; -export default Ember.Route.extend({ +export default Ember.Route.extend(UnauthenticatedRouteMixin, { setupController: function(controller) { controller.set('errorMessage', null); } diff --git a/bower.json b/bower.json index eb8e9b7..a9a6549 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", "flakes": "~1.0.0", - "ember-simple-auth": "~0.7.3", + "ember-simple-auth": "~0.8.0-beta.3", "nprogress": "~0.1.6", "moment": "~2.9.0" } diff --git a/config/environment.js b/config/environment.js index 30f711b..95ffa79 100644 --- a/config/environment.js +++ b/config/environment.js @@ -27,6 +27,7 @@ module.exports = function(environment) { // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_VIEW_LOOKUPS = true; ENV['simple-auth'] = { + session: 'session:custom', authorizer: 'simple-auth-authorizer:token', crossOriginWhitelist: ['http://127.0.0.1:4200'] } @@ -57,6 +58,7 @@ module.exports = function(environment) { if (environment === 'test') { ENV['simple-auth'] = { + session: 'session:custom', authorizer: 'simple-auth-authorizer:token', crossOriginWhitelist: ['https://bactdb-test.herokuapp.com'] } @@ -91,6 +93,7 @@ module.exports = function(environment) { if (environment === 'production') { ENV['simple-auth'] = { + session: 'session:custom', authorizer: 'simple-auth-authorizer:token', crossOriginWhitelist: ['https://bactdb.herokuapp.com'] } diff --git a/package.json b/package.json index b4901de..b56d4eb 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.13", - "ember-cli-simple-auth": "^0.7.2", - "ember-cli-simple-auth-token": "^0.6.0", + "ember-cli-simple-auth": "^0.8.0-beta.3", + "ember-cli-simple-auth-token": "^0.7.2", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.17", "ember-disable-proxy-controllers": "^0.7.0",