ember_simple_auth-rails 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605845d85130ca07eae4a17a001b477882dd3a4e
-  data.tar.gz: 23a99b483687610f7585778b210d6209854f3cc7
+  metadata.gz: 07741959b67e856d702b434adb200d3f44a5fe0f
+  data.tar.gz: 5826b6b4444b4e1fd43b2a87ba1ea8b8e71f6072
 SHA512:
-  metadata.gz: b1849325e60e55838eed85a31518ab6ff1fd5daead223d23db22da875ae2d404d74d0ea325fe5200459e832efc1d8c4940332dea637bc7a65661db0163569a9b
-  data.tar.gz: be4eb68655dde906408d8f759dee565631e3cb220e4c737d312d162220d87e88a9a6de8663ef24174225b3f975e35a20fd2a25e0f6c027d0558292b920ec31cf
+  metadata.gz: 81bfc6433b42d4b008b1b82f63415cc76d27f614fac0421b5916f29f65b0787413a9b93b016498290307aabfa184b767e9fdf5216f3e0a48dfe4e74caeac88ba
+  data.tar.gz: 95aad7c271b5adafb06213c1dca97bfeae3cdd475568ae93e5095d887bd38eeff970403d9941a1b1116b7ebc85f3fba7957224dbb67f3ac8cdefe475f70d24aa

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/vendor/assets/javascripts/ember-simple-auth-cookie-store.js

@@ -82,8 +82,8 @@ define("ember-simple-auth-cookie-store/stores/cookie",
       This store will trigger the `'updated'` event when any of its cookies is
       changed from another tab or window.
 
-      _The factory for this store is registered as `'session-store:cookie'` in
-      Ember's container.
+      _The factory for this store is registered as
+      `'ember-simple-auth-session-store:cookie'` in Ember's container._
 
       @class Cookie
       @namespace Stores
@@ -220,6 +220,6 @@ define("ember-simple-auth-cookie-store/stores/cookie",
 global.Ember.SimpleAuth.Stores.Cookie = requireModule('ember-simple-auth-cookie-store').default;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
-  container.register('session-store:cookie', global.Ember.SimpleAuth.Stores.Cookie);
+  container.register('ember-simple-auth-session-store:cookie', global.Ember.SimpleAuth.Stores.Cookie);
 });
 })((typeof global !== 'undefined') ? global : window);

data/vendor/assets/javascripts/ember-simple-auth-devise.js

@@ -80,8 +80,8 @@ define("ember-simple-auth-devise/authenticators/devise",
       see the README and
       [discussion here](https://gist.github.com/josevalim/fb706b1e933ef01e4fb6).
 
-      _The factory for this authenticator is registered as `'authenticator:devise'`
-      in Ember's container._
+      _The factory for this authenticator is registered as
+      `'ember-simple-auth-authenticator:devise'` in Ember's container._
 
       @class Devise
       @namespace Authenticators
@@ -98,6 +98,15 @@ define("ember-simple-auth-devise/authenticators/devise",
       */
       serverTokenEndpoint: '/users/sign_in',
 
+      /**
+        The devise resource name
+
+        @property resourceName
+        @type String
+        @default 'user'
+      */
+      resourceName: 'user',
+
       /**
         Restores the session from a set of session properties; __will return a
         resolving promise when there's a non-empty `auth_token` and a non-empty
@@ -132,7 +141,8 @@ define("ember-simple-auth-devise/authenticators/devise",
       authenticate: function(credentials) {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          var data = {
+          var data                 = {};
+          data[_this.resourceName] = {
             email:    credentials.identification,
             password: credentials.password
           };
@@ -167,11 +177,13 @@ define("ember-simple-auth-devise/authenticators/devise",
           Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
         }
         return Ember.$.ajax({
-          url:         this.serverTokenEndpoint,
-          type:        'POST',
-          data:        data,
-          dataType:    'json',
-          contentType: 'application/x-www-form-urlencoded'
+          url:        this.serverTokenEndpoint,
+          type:       'POST',
+          data:       data,
+          dataType:   'json',
+          beforeSend: function(xhr, settings) {
+            xhr.setRequestHeader('Accept', settings.accepts.json);
+          }
         });
       }
     });
@@ -187,16 +199,15 @@ define("ember-simple-auth-devise/authorizers/devise",
 
     /**
       Authenticator that works with the Ruby gem
-      [Devise](https://github.com/plataformatec/devise) by adding `auth-token` and
-      `auth-email` headers to requests.
+      [Devise](https://github.com/plataformatec/devise) by sending the `user_token`
+      and `user_email` properties from the session in the `Authorization` header.
 
       __As token authentication is not actually part of devise anymore, the server
       needs to implement some customizations__ to work with this authenticator -
-      see the README and
-      [discussion here](https://gist.github.com/josevalim/fb706b1e933ef01e4fb6).
+      see the README for more information.
 
-      _The factory for this authorizer is registered as `'authorizer:devise'` in
-      Ember's container._
+      _The factory for this authorizer is registered as
+      `'ember-simple-auth-authorizer:devise'` in Ember's container._
 
       @class Devise
       @namespace Authorizers
@@ -204,12 +215,11 @@ define("ember-simple-auth-devise/authorizers/devise",
     */
     var Devise = Ember.SimpleAuth.Authorizers.Base.extend({
       /**
-        Authorizes an XHR request by sending the `auth_token` and `auth_email`
-        properties from the session in custom headers:
+        Authorizes an XHR request by sending the `user_token` and `user_email`
+        properties from the session in the `Authorization` header:
 
         ```
-        auth-token: <auth_token>
-        auth-email: <auth_email>
+        Authorization: Token token="<user_token>", user_email="<user_email>"
         ```
 
         @method authorize
@@ -218,14 +228,14 @@ define("ember-simple-auth-devise/authorizers/devise",
       */
 
       authorize: function(jqXHR, requestOptions) {
-        var authToken = this.get('session.auth_token');
-        var authEmail = this.get('session.auth_email');
-        if (this.get('session.isAuthenticated') && !Ember.isEmpty(authToken) && !Ember.isEmpty(authEmail)) {
+        var userToken = this.get('session.user_token');
+        var userEmail = this.get('session.user_email');
+        if (this.get('session.isAuthenticated') && !Ember.isEmpty(userToken) && !Ember.isEmpty(userEmail)) {
           if (!Ember.SimpleAuth.Utils.isSecureUrl(requestOptions.url)) {
             Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
           }
-          jqXHR.setRequestHeader('auth-token', authToken);
-          jqXHR.setRequestHeader('auth-email', authEmail);
+          var authData = 'token="' + userToken + '", user_email="' + userEmail + '"';
+          jqXHR.setRequestHeader('Authorization', 'Token ' + authData);
         }
       }
     });
@@ -238,7 +248,7 @@ global.Ember.SimpleAuth.Authenticators.Devise = devise.Authenticator;
 global.Ember.SimpleAuth.Authorizers.Devise    = devise.Authorizer;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
-  container.register('authorizer:devise', global.Ember.SimpleAuth.Authorizers.Devise);
-  container.register('authenticator:devise', global.Ember.SimpleAuth.Authenticators.Devise);
+  container.register('ember-simple-auth-authorizer:devise', global.Ember.SimpleAuth.Authorizers.Devise);
+  container.register('ember-simple-auth-authenticator:devise', global.Ember.SimpleAuth.Authenticators.Devise);
 });
 })((typeof global !== 'undefined') ? global : window);

data/vendor/assets/javascripts/ember-simple-auth-oauth2.js

@@ -80,7 +80,8 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
       will trigger the `'updated'` event each time the token was refreshed.
 
       _The factory for this authenticator is registered as
-      `'authenticator:oauth2-password-grant'` in Ember's container._
+      `'ember-simple-auth-authenticator:oauth2-password-grant'` in Ember's
+      container._
 
       @class OAuth2
       @namespace Authenticators
@@ -298,7 +299,7 @@ define("ember-simple-auth-oauth2/authorizers/oauth2",
       `Authorization` header.
 
       _The factory for this authorizer is registered as
-      `'authorizer:oauth2-bearer'` in Ember's container._
+      `'ember-simple-auth-authorizer:oauth2-bearer'` in Ember's container._
 
       @class OAuth2
       @namespace Authorizers
@@ -336,7 +337,7 @@ global.Ember.SimpleAuth.Authenticators.OAuth2 = oauth2.Authenticator;
 global.Ember.SimpleAuth.Authorizers.OAuth2    = oauth2.Authorizer;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
-  container.register('authorizer:oauth2-bearer', global.Ember.SimpleAuth.Authorizers.OAuth2);
-  container.register('authenticator:oauth2-password-grant', global.Ember.SimpleAuth.Authenticators.OAuth2);
+  container.register('ember-simple-auth-authorizer:oauth2-bearer', global.Ember.SimpleAuth.Authorizers.OAuth2);
+  container.register('ember-simple-auth-authenticator:oauth2-password-grant', global.Ember.SimpleAuth.Authenticators.OAuth2);
 });
 })((typeof global !== 'undefined') ? global : window);

data/vendor/assets/javascripts/ember-simple-auth.js

@@ -340,9 +340,8 @@ define("ember-simple-auth/core",
         'sessionInvalidationSucceeded',
         'sessionInvalidationFailed'
       ]).forEach(function(event) {
-        session.on(event, function() {
-          Array.prototype.unshift.call(arguments, event);
-          router.send.apply(router, arguments);
+        session.on(event, function(error) {
+          router.send(event, error);
         });
       });
       return session;
@@ -381,13 +380,26 @@ define("ember-simple-auth/core",
       */
       routeAfterAuthentication: 'index',
 
+      /**
+        The name of the property that the session is injected with into routes and
+        controllers; should be set through
+        [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup).
+
+        @property sessionPropertyName
+        @readOnly
+        @static
+        @type String
+        @default 'session'
+      */
+      sessionPropertyName: 'session',
+
       /**
         @property applicationRootUrl
         @static
         @private
         @type String
       */
-      applicationRootUrl: null,
+      applicationRootUrl: null
     };
 
     /**
@@ -411,6 +423,7 @@ define("ember-simple-auth/core",
       @param {Object} options
         @param {String} [options.authorizerFactory] The authorizer factory to use as it is registered with Ember's container, see [Ember's API docs](http://emberjs.com/api/classes/Ember.Application.html#method_register); when the application does not interact with a server that requires authorized requests, no auzthorizer is needed
         @param {Object} [options.storeFactory] The store factory to use as it is registered with Ember's container, see [Ember's API docs](http://emberjs.com/api/classes/Ember.Application.html#method_register) - defaults to `session-stores:local-storage`
+        @param {Object} [options.sessionPropertyName] The name for the property that the session is injected with into routes and controllers - defaults to `session`
         @param {String} [options.authenticationRoute] route to transition to for authentication - defaults to `'login'`
         @param {String} [options.routeAfterAuthentication] route to transition to after successful authentication - defaults to `'index'`
         @param {Array[String]} [options.crossOriginWhitelist] Ember.SimpleAuth will never authorize requests going to a different origin than the one the Ember.js application was loaded from; to explicitely enable authorization for additional origins, whitelist those origins - defaults to `[]` _(beware that origins consist of protocol, host and port (port can be left out when it is 80 for HTTP or 443 for HTTPS))_
@@ -425,18 +438,19 @@ define("ember-simple-auth/core",
       options                                = options || {};
       Configuration.routeAfterAuthentication = options.routeAfterAuthentication || Configuration.routeAfterAuthentication;
       Configuration.authenticationRoute      = options.authenticationRoute || Configuration.authenticationRoute;
+      Configuration.sessionPropertyName      = options.sessionPropertyName || Configuration.sessionPropertyName;
       Configuration.applicationRootUrl       = container.lookup('router:main').get('rootURL') || '/';
       crossOriginWhitelist                   = Ember.A(options.crossOriginWhitelist || []).map(function(origin) {
         return extractLocationOrigin(origin);
       });
 
-      options.storeFactory = options.storeFactory || 'session-store:local-storage';
+      options.storeFactory = options.storeFactory || 'ember-simple-auth-session-store:local-storage';
       var store            = container.lookup(options.storeFactory);
       var session          = setupSession(store, container);
 
-      container.register('session:main', session, { instantiate: false });
+      container.register('ember-simple-auth-session:main', session, { instantiate: false });
       Ember.A(['controller', 'route']).forEach(function(component) {
-        container.injection(component, 'session', 'session:main');
+        container.injection(component, Configuration.sessionPropertyName, 'ember-simple-auth-session:main');
       });
 
       if (!Ember.isEmpty(options.authorizerFactory)) {
@@ -564,10 +578,10 @@ define("ember-simple-auth/mixins/application_route_mixin",
           @method actions.sessionAuthenticationSucceeded
         */
         sessionAuthenticationSucceeded: function() {
-          var attemptedTransition = this.get('session.attemptedTransition');
+          var attemptedTransition = this.get(Configuration.sessionPropertyName).get('attemptedTransition');
           if (attemptedTransition) {
             attemptedTransition.retry();
-            this.set('session.attemptedTransition', null);
+            this.get(Configuration.sessionPropertyName).set('attemptedTransition', null);
           } else {
             this.transitionTo(Configuration.routeAfterAuthentication);
           }
@@ -606,7 +620,7 @@ define("ember-simple-auth/mixins/application_route_mixin",
           @method actions.invalidateSession
         */
         invalidateSession: function() {
-          this.get('session').invalidate();
+          this.get(Configuration.sessionPropertyName).invalidate();
         },
 
         /**
@@ -643,7 +657,7 @@ define("ember-simple-auth/mixins/application_route_mixin",
           @method actions.authorizationFailed
         */
         authorizationFailed: function() {
-          this.get('session').invalidate();
+          this.get(Configuration.sessionPropertyName).invalidate();
         },
 
         /**
@@ -662,12 +676,14 @@ define("ember-simple-auth/mixins/application_route_mixin",
     __exports__.ApplicationRouteMixin = ApplicationRouteMixin;
   });
 define("ember-simple-auth/mixins/authenticated_route_mixin", 
-  ["exports"],
-  function(__exports__) {
+  ["./../core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
+    var Configuration = __dependency1__.Configuration;
+
     /**
       The mixin for routes that require the session to be authenticated in order to
       be accessible. Including this mixin in a route automatically adds a hook that
@@ -703,9 +719,9 @@ define("ember-simple-auth/mixins/authenticated_route_mixin",
         @param {Transition} transition The transition that lead to this route
       */
       beforeModel: function(transition) {
-        if (!this.get('session.isAuthenticated')) {
+        if (!this.get(Configuration.sessionPropertyName).get('isAuthenticated')) {
           transition.abort();
-          this.set('session.attemptedTransition', transition);
+          this.get(Configuration.sessionPropertyName).set('attemptedTransition', transition);
           transition.send('authenticateSession');
         }
       }
@@ -714,12 +730,14 @@ define("ember-simple-auth/mixins/authenticated_route_mixin",
     __exports__.AuthenticatedRouteMixin = AuthenticatedRouteMixin;
   });
 define("ember-simple-auth/mixins/authentication_controller_mixin", 
-  ["exports"],
-  function(__exports__) {
+  ["./../core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
+    var Configuration = __dependency1__.Configuration;
+
     /**
       The mixin for the controller that handles the `authenticationRoute` specified
       in [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup)). It provides the
@@ -751,7 +769,7 @@ define("ember-simple-auth/mixins/authentication_controller_mixin",
           @param {Object} options Any options the auhtenticator needs to authenticate the session
         */
         authenticate: function(options) {
-          this.get('session').authenticate(this.get('authenticatorFactory'), options);
+          this.get(Configuration.sessionPropertyName).authenticate(this.get('authenticatorFactory'), options);
         }
       }
     });
@@ -759,13 +777,14 @@ define("ember-simple-auth/mixins/authentication_controller_mixin",
     __exports__.AuthenticationControllerMixin = AuthenticationControllerMixin;
   });
 define("ember-simple-auth/mixins/login_controller_mixin", 
-  ["./authentication_controller_mixin","exports"],
-  function(__dependency1__, __exports__) {
+  ["./../core","./authentication_controller_mixin","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var AuthenticationControllerMixin = __dependency1__.AuthenticationControllerMixin;
+    var Configuration = __dependency1__.Configuration;
+    var AuthenticationControllerMixin = __dependency2__.AuthenticationControllerMixin;
 
     /**
       The mixin to use with the controller that handles the `authenticationRoute`
@@ -831,7 +850,7 @@ define("ember-simple-auth/session",
       [Ember.SimpleAuth.Authenticators.Base#authenticate](#Ember-SimpleAuth-Authenticators-Base-authenticate)).
       It is created when Ember.SimpleAuth is set up (see
       [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup)) and __injected into all
-      models, controllers, routes and views so that all parts of the application
+      controllers and routes so that these parts of the application
       can always access the current authentication state and other data__,
       depending on the used authenticator and whether the session is actually
       authenticated (see
@@ -920,9 +939,9 @@ define("ember-simple-auth/session",
       },
 
       /**
-        Authentices the session with an `authenticator` and appropriate `options`.
-        __This delegates the actual authentication work to the `authenticator`__
-        and handles the returned promise accordingly (see
+        Authenticates the session with an `authenticator` and appropriate
+        `options`. __This delegates the actual authentication work to the
+        `authenticator`__ and handles the returned promise accordingly (see
         [Ember.SimpleAuth.Authenticators.Base#authenticate](#Ember-SimpleAuth-Authenticators-Base-authenticate)).
         All data the authenticator resolves with will be saved in the session.
 
@@ -937,6 +956,7 @@ define("ember-simple-auth/session",
         @return {Ember.RSVP.Promise} A promise that resolves when the session was authenticated successfully
       */
       authenticate: function(authenticatorFactory, options) {
+        Ember.assert('Session#authenticate requires the authenticator factory to be specified, was ' + authenticatorFactory, !Ember.isEmpty(authenticatorFactory));
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
           _this.container.lookup(authenticatorFactory).authenticate(options).then(function(content) {
@@ -1100,8 +1120,8 @@ define("ember-simple-auth/stores",
     };
 
     var registerStores = function(container) {
-      container.register('session-store:local-storage', LocalStorage);
-      container.register('session-store:ephemeral', Ephemeral);
+      container.register('ember-simple-auth-session-store:local-storage', LocalStorage);
+      container.register('ember-simple-auth-session-store:ephemeral', Ephemeral);
     };
 
     __exports__.registerStores = registerStores;
@@ -1209,8 +1229,8 @@ define("ember-simple-auth/stores/ephemeral",
 
       __This store is mainly useful for testing.__
 
-      _The factory for this store is registered as `'session-store:ephemeral'` in
-      Ember's container._
+      _The factory for this store is registered as
+      `'ember-simple-auth-session-store:ephemeral'` in Ember's container._
 
       @class Ephemeral
       @namespace Stores
@@ -1274,8 +1294,8 @@ define("ember-simple-auth/stores/local_storage",
       This store will trigger the `'updated'` event when any of the keys it manages
       is changed from another tab or window.
 
-      _The factory for this store is registered as `'session-store:local-storage'`
-      in Ember's container._
+      _The factory for this store is registered as
+      `'ember-simple-auth-session-store:local-storage'` in Ember's container._
 
       @class LocalStorage
       @namespace Stores
@@ -1447,7 +1467,7 @@ define("ember-simple-auth/utils/is_secure_url",
     */
     var isSecureUrl = function(url) {
       var link  = document.createElement('a');
-      link.href = location;
+      link.href = url;
       link.href = link.href;
       return link.protocol == 'https:';
     };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler