ember_simple_auth-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07741959b67e856d702b434adb200d3f44a5fe0f
-  data.tar.gz: 5826b6b4444b4e1fd43b2a87ba1ea8b8e71f6072
+  metadata.gz: c712424c0c6c9b070df390bbd3c176c9bdb29b90
+  data.tar.gz: bf11d01a6f13699f90f05f9d9d705bb8d2f02d20
 SHA512:
-  metadata.gz: 81bfc6433b42d4b008b1b82f63415cc76d27f614fac0421b5916f29f65b0787413a9b93b016498290307aabfa184b767e9fdf5216f3e0a48dfe4e74caeac88ba
-  data.tar.gz: 95aad7c271b5adafb06213c1dca97bfeae3cdd475568ae93e5095d887bd38eeff970403d9941a1b1116b7ebc85f3fba7957224dbb67f3ac8cdefe475f70d24aa
+  metadata.gz: 848f5821f40b7f280d5cdb4a7e9691a1a03337a63ef139d931b7760d528f7d78ded2476dfa37d1b6c6e0170e61ca5ddc63ba067432e7b1b533b954798a4e565c
+  data.tar.gz: 7d9f664de21baf6f748e8e184ee0f980138ddc6b9b12cce15c1f4a2f849567bf0c829f5ddf16477b71f41578b37b9146f30319b042ca35fd0abd1a922a813b6b

data/lib/ember_simple_auth/rails/version.rb

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

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

@@ -79,9 +79,6 @@ define("ember-simple-auth-cookie-store/stores/cookie",
       stores data but instead of cookies relies on the `localStorage` API and does
       not need to poll for external changes.
 
-      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
       `'ember-simple-auth-session-store:cookie'` in Ember's container._
 
@@ -206,7 +203,7 @@ define("ember-simple-auth-cookie-store/stores/cookie",
         var data = this.restore();
         if (!Ember.SimpleAuth.Utils.flatObjectsAreEqual(data, this._lastData)) {
           this._lastData = data;
-          this.trigger('updated', data);
+          this.trigger('sessionDataUpdated', data);
         }
         if (!Ember.testing) {
           Ember.run.cancel(this._syncDataTimeout);

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

@@ -109,8 +109,8 @@ define("ember-simple-auth-devise/authenticators/devise",
 
       /**
         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
-        `auth_email` in the `properties`__ and a rejecting promise otherwise.
+        resolving promise when there's a non-empty `user_token` and a non-empty
+        `user_email` in the `properties`__ and a rejecting promise otherwise.
 
         @method restore
         @param {Object} properties The properties to restore the session from
@@ -118,7 +118,7 @@ define("ember-simple-auth-devise/authenticators/devise",
       */
       restore: function(properties) {
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          if (!Ember.isEmpty(properties.auth_token) && !Ember.isEmpty(properties.auth_email)) {
+          if (!Ember.isEmpty(properties.user_token) && !Ember.isEmpty(properties.user_email)) {
             resolve(properties);
           } else {
             reject();

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

@@ -76,8 +76,8 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
       ([RFC 6749](http://tools.ietf.org/html/rfc6749)), specifically the _"Resource
       Owner Password Credentials Grant Type"_.
 
-      This authenticator supports refreshing the access token automatically and
-      will trigger the `'updated'` event each time the token was refreshed.
+      This authenticator supports access token refresh (see
+      [RFC 6740, section 6](http://tools.ietf.org/html/rfc6749#section-6)).
 
       _The factory for this authenticator is registered as
       `'ember-simple-auth-authenticator:oauth2-password-grant'` in Ember's
@@ -88,6 +88,14 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
       @extends Base
     */
     var OAuth2 = Ember.SimpleAuth.Authenticators.Base.extend({
+      /**
+        Triggered when the authenticator refreshes the access token (see
+        [RFC 6740, section 6](http://tools.ietf.org/html/rfc6749#section-6)).
+
+        @event updated
+        @param {Object} data The updated session data
+      */
+
       /**
         The endpoint on the server the authenticator acquires the access token
         from.
@@ -262,7 +270,7 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
               var expiresAt = _this.absolutizeExpirationTime(expiresIn);
               var data      = Ember.$.extend(response, { expires_in: expiresIn, expires_at: expiresAt, refresh_token: refreshToken });
               _this.scheduleAccessTokenRefresh(expiresIn, null, refreshToken);
-              _this.trigger('updated', data);
+              _this.trigger('sessionDataUpdated', data);
               resolve(data);
             });
           }, function(xhr, status, error) {

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

@@ -128,12 +128,6 @@ define("ember-simple-auth/authenticators/base",
       [Ember.SimpleAuth.Stores.Base](#Ember-SimpleAuth-Stores-Base)) is sufficient
       for the session to be authenticated or not.
 
-      Authenticators may trigger the `'updated'` and the `'invalidated'` events.
-      The `'updated'` event signals that the session data changed while the
-      `'ìnvalidated`' event signals that the authenticator decided that the
-      session became invalid. Both events are handled by the session automatically.
-      The `'updated'` event requires the complete session data as its argument.
-
       __Custom authenticators have to be registered with Ember's dependency
       injection container__ so that the session can retrieve an instance, e.g.:
 
@@ -159,6 +153,28 @@ define("ember-simple-auth/authenticators/base",
       @uses Ember.Evented
     */
     var Base = Ember.Object.extend(Ember.Evented, {
+      /**
+        __Triggered when the data that constitutes the session is updated by the
+        authenticator__. This might happen e.g. because the authenticator refreshes
+        it or an event from is triggered from an external authentication provider.
+        The session automatically catches that event, passes the updated data back
+        to the authenticator's
+        [Ember.SimpleAuth.Authenticators.Base#restore](#Ember-SimpleAuth-Authenticators-Base-restore)
+        method and handles the result of that invocation accordingly.
+
+        @event sessionDataUpdated
+        @param {Object} data The updated session data
+      */
+      /**
+        __Triggered when the data that constitutes the session is invalidated by
+        the authenticator__. This might happen e.g. because the date expires or an
+        event is triggered from an external authentication provider. The session
+        automatically catches that event and invalidates itself.
+
+        @event sessionDataInvalidated
+        @param {Object} data The updated session data
+      */
+
       /**
         Restores the session from a set of properties. __This method is invoked by
         the session either after the application starts up and session data was
@@ -331,22 +347,6 @@ define("ember-simple-auth/core",
       return crossOriginWhitelist.indexOf(urlOrigin) > -1 || urlOrigin === documentOrigin;
     }
 
-    function setupSession(store, container) {
-      var session = Session.create({ store: store, container: container });
-      var router  = container.lookup('router:main');
-      Ember.A([
-        'sessionAuthenticationSucceeded',
-        'sessionAuthenticationFailed',
-        'sessionInvalidationSucceeded',
-        'sessionInvalidationFailed'
-      ]).forEach(function(event) {
-        session.on(event, function(error) {
-          router.send(event, error);
-        });
-      });
-      return session;
-    }
-
     var extensionInitializers = [];
 
     /**
@@ -446,7 +446,7 @@ define("ember-simple-auth/core",
 
       options.storeFactory = options.storeFactory || 'ember-simple-auth-session-store:local-storage';
       var store            = container.lookup(options.storeFactory);
-      var session          = setupSession(store, container);
+      var session          = Session.create({ store: store, container: container });
 
       container.register('ember-simple-auth-session:main', session, { instantiate: false });
       Ember.A(['controller', 'route']).forEach(function(component) {
@@ -462,6 +462,11 @@ define("ember-simple-auth/core",
               authorizer.authorize(jqXHR, options);
             }
           });
+          Ember.$(document).ajaxError(function(event, jqXHR, setting, exception) {
+            if (jqXHR.status === 401) {
+              session.trigger('authorizationFailed');
+            }
+          });
         }
       } else {
         Ember.Logger.debug('No authorizer factory was specified for Ember.SimpleAuth - specify one if backend requests need to be authorized.');
@@ -531,12 +536,35 @@ define("ember-simple-auth/mixins/application_route_mixin",
       invalidation fails. These actions provide a good starting point for adding
       custom behavior to these events.
 
+      __When this mixin is used and the application's ApplicationRoute defines the
+      `acticate` method, that method has to call `_super`.__
+
       @class ApplicationRouteMixin
       @namespace $mainModule
       @extends Ember.Mixin
       @static
     */
     var ApplicationRouteMixin = Ember.Mixin.create({
+      /**
+        @method activate
+        @private
+      */
+      activate: function() {
+        var _this = this;
+        Ember.A([
+          'sessionAuthenticationSucceeded',
+          'sessionAuthenticationFailed',
+          'sessionInvalidationSucceeded',
+          'sessionInvalidationFailed',
+          'authorizationFailed'
+        ]).forEach(function(event) {
+          _this.get('session').on(event, function(error) {
+            Array.prototype.unshift.call(arguments, event);
+            _this.send.apply(_this, arguments);
+          });
+        });
+      },
+
       actions: {
         /**
           This action triggers transition to the `authenticationRoute` specified in
@@ -658,17 +686,6 @@ define("ember-simple-auth/mixins/application_route_mixin",
         */
         authorizationFailed: function() {
           this.get(Configuration.sessionPropertyName).invalidate();
-        },
-
-        /**
-          @method actions.error
-          @private
-        */
-        error: function(reason) {
-          if (reason.status === 401) {
-            this.send('authorizationFailed');
-          }
-          return true;
         }
       }
     });
@@ -766,10 +783,10 @@ define("ember-simple-auth/mixins/authentication_controller_mixin",
           [Ember.SimpleAuth.Session#authenticate](#Ember-SimpleAuth-Session-authenticate)).
 
           @method actions.authenticate
-          @param {Object} options Any options the auhtenticator needs to authenticate the session
+          @param {Object} options Any options the authenticator needs to authenticate the session
         */
         authenticate: function(options) {
-          this.get(Configuration.sessionPropertyName).authenticate(this.get('authenticatorFactory'), options);
+          return this.get(Configuration.sessionPropertyName).authenticate(this.get('authenticatorFactory'), options);
         }
       }
     });
@@ -889,6 +906,50 @@ define("ember-simple-auth/session",
       @uses Ember.Evented
     */
     var Session = Ember.ObjectProxy.extend(Ember.Evented, {
+      /**
+        Triggered __whenever the session is successfully authenticated__. When the
+        application uses the mixin,
+        [Ember.SimpleAuth.ApplicationRouteMixin.actions#sessionAuthenticationSucceeded](#Ember-SimpleAuth-ApplicationRouteMixin-sessionAuthenticationSucceeded)
+        will be invoked whenever this event is triggered.
+
+        @event sessionAuthenticationSucceeded
+      */
+      /**
+        Triggered __whenever an attempt to authenticate the session fails__. When
+        the application uses the mixin,
+        [Ember.SimpleAuth.ApplicationRouteMixin.actions#sessionAuthenticationFailed](#Ember-SimpleAuth-ApplicationRouteMixin-sessionAuthenticationFailed)
+        will be invoked whenever this event is triggered.
+
+        @event sessionAuthenticationFailed
+        @param {Object} error The error object; this depends on the authenticator in use, see [Ember.SimpleAuth.Authenticators.Base#authenticate](#Ember-SimpleAuth-Authenticators-Base-authenticate)
+      */
+      /**
+        Triggered __whenever the session is successfully invalidated__. When the
+        application uses the mixin,
+        [Ember.SimpleAuth.ApplicationRouteMixin.actions#sessionInvalidationSucceeded](#Ember-SimpleAuth-ApplicationRouteMixin-sessionInvalidationSucceeded)
+        will be invoked whenever this event is triggered.
+
+        @event sessionInvalidationSucceeded
+      */
+      /**
+        Triggered __whenever an attempt to invalidate the session fails__. When the
+        application uses the mixin,
+        [Ember.SimpleAuth.ApplicationRouteMixin.actions#sessionInvalidationFailed](#Ember-SimpleAuth-ApplicationRouteMixin-sessionInvalidationFailed)
+        will be invoked whenever this event is triggered.
+
+        @event sessionInvalidationFailed
+        @param {Object} error The error object; this depends on the authenticator in use, see [Ember.SimpleAuth.Authenticators.Base#invalidate](#Ember-SimpleAuth-Authenticators-Base-invalidate)
+      */
+      /**
+        Triggered __whenever the server rejects the authorization information
+        passed with a request and responds with status 401__. When the application
+        uses the mixin,
+        [Ember.SimpleAuth.ApplicationRouteMixin.actions#authorizationFailed](#Ember-SimpleAuth-ApplicationRouteMixin-authorizationFailed)
+        will be invoked whenever this event is triggered.
+
+        @event authorizationFailed
+      */
+
       /**
         The authenticator factory used to authenticate the session. This is only
         set when the session is currently authenticated.
@@ -993,7 +1054,7 @@ define("ember-simple-auth/session",
         return new Ember.RSVP.Promise(function(resolve, reject) {
           var authenticator = _this.container.lookup(_this.authenticatorFactory);
           authenticator.invalidate(_this.content).then(function() {
-            authenticator.off('updated');
+            authenticator.off('sessionDataUpdated');
             _this.clear(true);
             resolve();
           }, function(error) {
@@ -1034,6 +1095,7 @@ define("ember-simple-auth/session",
       */
       setup: function(authenticatorFactory, content, trigger) {
         trigger = !!trigger && !this.get('isAuthenticated');
+        this.beginPropertyChanges();
         this.setProperties({
           isAuthenticated:      true,
           authenticatorFactory: authenticatorFactory,
@@ -1042,6 +1104,7 @@ define("ember-simple-auth/session",
         this.bindToAuthenticatorEvents();
         var data = Ember.$.extend({ authenticatorFactory: authenticatorFactory }, this.content);
         this.store.replace(data);
+        this.endPropertyChanges();
         if (trigger) {
           this.trigger('sessionAuthenticationSucceeded');
         }
@@ -1053,12 +1116,14 @@ define("ember-simple-auth/session",
       */
       clear: function(trigger) {
         trigger = !!trigger && this.get('isAuthenticated');
+        this.beginPropertyChanges();
         this.setProperties({
           isAuthenticated:      false,
           authenticatorFactory: null,
           content:              {}
         });
         this.store.clear();
+        this.endPropertyChanges();
         if (trigger) {
           this.trigger('sessionInvalidationSucceeded');
         }
@@ -1071,12 +1136,12 @@ define("ember-simple-auth/session",
       bindToAuthenticatorEvents: function() {
         var _this = this;
         var authenticator = this.container.lookup(this.authenticatorFactory);
-        authenticator.off('updated');
-        authenticator.off('invalidated');
-        authenticator.on('updated', function(content) {
+        authenticator.off('sessionDataUpdated');
+        authenticator.off('sessionDataInvalidated');
+        authenticator.on('sessionDataUpdated', function(content) {
           _this.setup(_this.authenticatorFactory, content);
         });
-        authenticator.on('invalidated', function(content) {
+        authenticator.on('sessionDataInvalidated', function(content) {
           _this.clear(true);
         });
       },
@@ -1087,7 +1152,7 @@ define("ember-simple-auth/session",
       */
       bindToStoreEvents: function() {
         var _this = this;
-        this.store.on('updated', function(content) {
+        this.store.on('sessionDataUpdated', function(content) {
           var authenticatorFactory = content.authenticatorFactory;
           if (!!authenticatorFactory) {
             delete content.authenticatorFactory;
@@ -1146,19 +1211,24 @@ define("ember-simple-auth/stores/base",
       Ember.SimpleAuth's setup
       (see [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup)).
 
-      Stores may trigger the `'updated'` event when their data changed due to
-      external actions (e.g. from another tab). The session listens to that event
-      and will handle the changes accordingly. Whenever the event is triggered by
-      the store, the session will forward the data to its authenticator which
-      decides whether the session is still valid (see
-      [Ember.SimpleAuth.Authenticators.Base#restore](#Ember-SimpleAuth-Authenticators-Base-restore)).
-
       @class Base
       @namespace Stores
       @extends Ember.Object
       @uses Ember.Evented
     */
     var Base = Ember.Object.extend(Ember.Evented, {
+      /**
+        __Triggered when the data that constitutes the session changes in the
+        store. This usually happens because the session is authenticated or
+        invalidated in another tab or window.__ The session automatically catches
+        that event, passes the updated data to its authenticator's
+        [Ember.SimpleAuth.Authenticators.Base#restore](#Ember-SimpleAuth-Authenticators-Base-restore)
+        method and handles the result of that invocation accordingly.
+
+        @event sessionDataUpdated
+        @param {Object} data The updated session data
+      */
+
       /**
         Persists the `data` in the store.
 
@@ -1291,9 +1361,6 @@ define("ember-simple-auth/stores/local_storage",
     /**
       Store that saves its data in the browser's `localStorage`.
 
-      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
       `'ember-simple-auth-session-store:local-storage'` in Ember's container._
 
@@ -1405,7 +1472,7 @@ define("ember-simple-auth/stores/local_storage",
             _this._lastData = data;
             Ember.run.cancel(_this._triggerChangeEventTimeout);
             _this._triggerChangeEventTimeout = Ember.run.next(_this, function() {
-              this.trigger('updated', data);
+              this.trigger('sessionDataUpdated', data);
             });
           }
         });

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: 
@@ -59,14 +59,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ember_simple_auth/rails/version.rb
+- LICENSE.txt
+- README.md
 - lib/ember_simple_auth/rails.rb
+- lib/ember_simple_auth/rails/version.rb
 - vendor/assets/javascripts/ember-simple-auth-cookie-store.js
 - vendor/assets/javascripts/ember-simple-auth-devise.js
 - vendor/assets/javascripts/ember-simple-auth-oauth2.js
 - vendor/assets/javascripts/ember-simple-auth.js
-- LICENSE.txt
-- README.md
 homepage: https://github.com/doodzik/ember_simple_auth-rails
 licenses:
 - MIT
@@ -77,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ember-simple-auth for the rails asset pipeline