From 8e37bce7c7e21f6d4e31b45c8314409c0198e50a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 23 Mar 2015 14:17:57 -0800 Subject: [PATCH] Swapped custom auth for component. --- app/authenticators/custom.js | 48 ------------------------------ app/authorizers/custom.js | 10 ------- app/controllers/login.js | 10 +------ app/initializers/authentication.js | 10 ------- bower.json | 2 +- config/environment.js | 19 ++++++++++-- package.json | 4 +++ server/mocks/authenticate.js | 12 +++++++- 8 files changed, 33 insertions(+), 82 deletions(-) delete mode 100644 app/authenticators/custom.js delete mode 100644 app/authorizers/custom.js delete mode 100644 app/initializers/authentication.js diff --git a/app/authenticators/custom.js b/app/authenticators/custom.js deleted file mode 100644 index bf5f48d..0000000 --- a/app/authenticators/custom.js +++ /dev/null @@ -1,48 +0,0 @@ -import Ember from 'ember'; -import Base from 'simple-auth/authenticators/base'; -import config from '../config/environment'; - -export default Base.extend({ - tokenEndpoint: config.apiURL + '/api/authenticate', - - restore: function(data) { - return new Ember.RSVP.Promise(function(resolve, reject) { - if (!Ember.isEmpty(data.token)) { - resolve(data); - } else { - reject(); - } - }); - }, - - authenticate: function(credentials) { - var _this = this; - return new Ember.RSVP.Promise(function(resolve, reject) { - Ember.$.ajax({ - url: _this.tokenEndpoint, - type: 'POST', - data: {username: credentials.identification, password: credentials.password}, - contentType: 'application/x-www-form-urlencoded' - }).then(function(response) { - Ember.run(function() { - resolve({ token: response.token }); - }); - }, function(xhr) { - var response = JSON.parse(xhr.responseText); - Ember.run(function() { - reject(response.error); - }); - }); - }); - }, - - invalidate: function() { - var _this = this; - return new Ember.RSVP.Promise(function(resolve) { - Ember.$.ajax({ url: _this.tokenEndpoint, type: 'DELETE' }).always(function() { - resolve(); - }); - }); - }, - -}); diff --git a/app/authorizers/custom.js b/app/authorizers/custom.js deleted file mode 100644 index c2c349a..0000000 --- a/app/authorizers/custom.js +++ /dev/null @@ -1,10 +0,0 @@ -import Ember from 'ember'; -import Base from 'simple-auth/authorizers/base'; - -export default Base.extend({ - authorize: function(jqXHR) { - if (this.get('session.isAuthenticated') && !Ember.isEmpty(this.get('session.token'))) { - jqXHR.setRequestHeader('Authorization', 'Bearer ' + this.get('session.token')); - } - } -}); diff --git a/app/controllers/login.js b/app/controllers/login.js index 1cb83f5..d84a03e 100644 --- a/app/controllers/login.js +++ b/app/controllers/login.js @@ -2,13 +2,5 @@ import Ember from 'ember'; import LoginControllerMixin from 'simple-auth/mixins/login-controller-mixin'; export default Ember.Controller.extend(LoginControllerMixin, { - authenticator: 'authenticators:custom', - actions: { - authenticate: function() { - var _this = this; - this._super().then(null, function(message) { - _this.set('errorMessage', message); - }); - } - } + authenticator: 'simple-auth-authenticator:jwt' }); diff --git a/app/initializers/authentication.js b/app/initializers/authentication.js deleted file mode 100644 index bf7b139..0000000 --- a/app/initializers/authentication.js +++ /dev/null @@ -1,10 +0,0 @@ -import Authenticator from './../authenticators/custom'; -import Authorizer from './../authorizers/custom'; - -export default { - name: 'bling', - initialize: function(container) { - container.register('authenticators:custom', Authenticator); - container.register('authorizers:custom', Authorizer); - } -}; diff --git a/bower.json b/bower.json index cb5bcfc..6853cc1 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "ember-qunit-notifications": "0.0.7", "qunit": "~1.17.1", "flakes": "~1.0.0", - "ember-simple-auth": "~0.7.2", + "ember-simple-auth": "~0.7.3", "nprogress": "~0.1.6", "moment": "~2.9.0" } diff --git a/config/environment.js b/config/environment.js index 2a44216..73ce9e4 100644 --- a/config/environment.js +++ b/config/environment.js @@ -22,13 +22,26 @@ module.exports = function(environment) { if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; // ENV.APP.LOG_ACTIVE_GENERATION = true; - ENV.APP.LOG_TRANSITIONS = true; - ENV.APP.LOG_TRANSITIONS_INTERNAL = true; + // ENV.APP.LOG_TRANSITIONS = true; + // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_VIEW_LOOKUPS = true; ENV['simple-auth'] = { - authorizer: 'authorizers:custom', + authorizer: 'simple-auth-authorizer:token', crossOriginWhitelist: ['http://127.0.0.1:4200'] } + ENV['simple-auth-token'] = { + serverTokenEndpoint: '/api/authenticate', + identificationField: 'username', + passwordField: 'password', + tokenPropertyName: 'token', + authorizationPrefix: 'Bearer ', + authorizationHeaderName: 'Authorization', + refreshAccessTokens: true, + serverTokenRefreshEndpoint: '/api/authenticate', + tokenExpireName: 'exp', + refreshLeeway: 300, + timeFactor: 1 + } ENV.apiURL = 'http://127.0.0.1:4200'; ENV.contentSecurityPolicy = { 'default-src': "'none'", diff --git a/package.json b/package.json index 34c884c..96cbd97 100644 --- a/package.json +++ b/package.json @@ -32,11 +32,15 @@ "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.9", "ember-cli-simple-auth": "^0.7.2", + "ember-cli-simple-auth-token": "^0.6.0", "ember-cli-uglify": "1.0.1", "ember-data": "1.0.0-beta.15", "ember-export-application-global": "^1.0.2", "express": "^4.12.3", "glob": "^4.5.3", "morgan": "^1.5.2" + }, + "dependencies": { + "jsonwebtoken": "^4.2.1" } } diff --git a/server/mocks/authenticate.js b/server/mocks/authenticate.js index ad5ff6f..f1e0987 100644 --- a/server/mocks/authenticate.js +++ b/server/mocks/authenticate.js @@ -1,10 +1,20 @@ module.exports = function(app) { var express = require('express'); + var jwt = require('jsonwebtoken'); var authenticateRouter = express.Router(); authenticateRouter.post('/', function(req, res) { + var token = jwt.sign({ + 'name': 'Test User', + 'role': 'admin' + }, 'secret', + { + expiresInMinutes: 60, + issuer: 'bactdb', + subject: 'Test User', + }); res.send({ - 'token': 'abc123' + 'token': token }); });