ember_simple_auth-rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3490369b67f03b10b7ce3350102b9bb902d28af
-  data.tar.gz: f64475c9fa708f8fe9e5da17a22dea0bd78aa671
+  metadata.gz: 498b715ab90033753bdf77832bb83bd477b626b3
+  data.tar.gz: bc8c1ff0e6e118dc9769930ed512f6495525b0cc
 SHA512:
-  metadata.gz: c27d60cc65d468d48134ea73c0ed3c7b16b5802ed0e60519bc425b2501dc0aaa14418f455b07e63322ec79300926efeef1e421d4134441a677884618ed9ec04b
-  data.tar.gz: 80a037ea6926c3262181c98a779a40213db7c0d6ed12c2d91731696f14cfebe4c31859a0c430c32a8cd797c73bf3a5f963aa4e748eead72543ec564b22bad645
+  metadata.gz: 5973918142232a714a0a9314d074e746d6de635467f4f0266d7dc8d1e8da994f5cb9043de202ea2875de741448c53b551e5b81761872ab29c73047ec3ccae18b
+  data.tar.gz: 22e3d4bc12c54181f52350240f2a9e73810da4ea078adcc2cba509083ac22132f1f5682ea8a228699f8bf4cf04ea7d9af7d119ade9adb41402132fba21d1b0ed

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

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

@@ -103,7 +103,7 @@ define("simple-auth/authenticators/base",
       import AuthenticationControllerMixin from 'simple-auth/mixins/authentication-controller-mixin';
 
       export default Ember.Controller.extend(AuthenticationControllerMixin, {
-        authenticatorFactory: 'authenticator:custom'
+        authenticator: 'authenticator:custom'
       });
       ```
 
@@ -325,25 +325,25 @@ define("simple-auth/configuration",
         when the application does not interact with a server that requires
         authorized requests, no auzthorizer is needed.
 
-        @property sessionPropertyName
+        @property authorizer
         @readOnly
         @static
         @type String
         @default null
       */
-      authorizerFactory: null,
+      authorizer: null,
 
       /**
         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).
 
-        @property storeFactory
+        @property store
         @readOnly
         @static
         @type String
         @default simple-auth-session-store:local-storage
       */
-      storeFactory: 'simple-auth-session-store:local-storage',
+      store: 'simple-auth-session-store:local-storage',
 
       /**
         Ember Simple Auth will never authorize requests going to a different origin
@@ -375,8 +375,8 @@ define("simple-auth/configuration",
         this.authenticationRoute      = globalConfig.authenticationRoute || this.authenticationRoute;
         this.routeAfterAuthentication = globalConfig.routeAfterAuthentication || this.routeAfterAuthentication;
         this.sessionPropertyName      = globalConfig.sessionPropertyName || this.sessionPropertyName;
-        this.authorizerFactory        = globalConfig.authorizerFactory || this.authorizerFactory;
-        this.storeFactory             = globalConfig.storeFactory || this.storeFactory;
+        this.authorizer               = globalConfig.authorizer || this.authorizer;
+        this.store                    = globalConfig.store || this.store;
         this.applicationRootUrl       = container.lookup('router:main').get('rootURL') || '/';
       }
     };
@@ -696,7 +696,7 @@ define("simple-auth/mixins/authentication-controller-mixin",
       [`Configuration.authenticationRoute`](#SimpleAuth-Configuration-authenticationRoute).
       It provides the `authenticate` action that will authenticate the session with
       the configured authenticator (see
-      [`AuthenticationControllerMixin#authenticatorFactory`](#SimpleAuth-AuthenticationControllerMixin-authenticatorFactory)).
+      [`AuthenticationControllerMixin#authenticator`](#SimpleAuth-AuthenticationControllerMixin-authenticator)).
 
       @class AuthenticationControllerMixin
       @namespace SimpleAuth
@@ -705,28 +705,30 @@ define("simple-auth/mixins/authentication-controller-mixin",
     */
     __exports__["default"] = Ember.Mixin.create({
       /**
-        The authenticator used to authenticate the session.
+        The authenticator 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).
 
-        @property authenticatorFactory
+        @property authenticator
         @type String
         @default null
       */
-      authenticatorFactory: null,
+      authenticator: null,
 
       actions: {
         /**
           This action will authenticate the session with the configured
           authenticator (see
-          [`AuthenticationControllerMixin#authenticatorFactory`](#SimpleAuth-AuthenticationControllerMixin-authenticatorFactory),
+          [`AuthenticationControllerMixin#authenticator`](#SimpleAuth-AuthenticationControllerMixin-authenticator),
           [`Session#authenticate`](#SimpleAuth-Session-authenticate)).
 
           @method actions.authenticate
           @param {Object} options Any options the authenticator needs to authenticate the session
         */
         authenticate: function(options) {
-          var authenticatorFactory = this.get('authenticatorFactory');
-          Ember.assert('AuthenticationControllerMixin/LoginControllerMixin require the authenticatorFactory property to be set on the controller', !Ember.isEmpty(authenticatorFactory));
-          return this.get(Configuration.sessionPropertyName).authenticate(this.get('authenticatorFactory'), options);
+          var authenticator = this.get('authenticator');
+          Ember.assert('AuthenticationControllerMixin/LoginControllerMixin require the authenticator property to be set on the controller', !Ember.isEmpty(authenticator));
+          return this.get(Configuration.sessionPropertyName).authenticate(this.get('authenticator'), options);
         }
       }
     });
@@ -775,7 +777,7 @@ define("simple-auth/mixins/login-controller-mixin",
         /**
           This action will authenticate the session with the configured
           authenticator (see
-          [AuthenticationControllerMixin#authenticatorFactory](#SimpleAuth-Authentication-authenticatorFactory))
+          [AuthenticationControllerMixin#authenticator](#SimpleAuth-Authentication-authenticator))
           if both `identification` and `password` are non-empty. It passes both
           values to the authenticator.
 
@@ -820,7 +822,7 @@ define("simple-auth/session",
       authenticator needs to authenticate the session:
 
       ```javascript
-      this.get('session').authenticate('authenticatorFactory', { some: 'option' }).then(function() {
+      this.get('session').authenticate('authenticator:custom', { some: 'option' }).then(function() {
         // authentication was successful
       }, function() {
         // authentication failed
@@ -889,15 +891,17 @@ define("simple-auth/session",
       */
 
       /**
-        The authenticator factory used to authenticate the session. This is only
-        set when the session is currently authenticated.
+        The authenticator 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).
+        This is only set when the session is currently authenticated.
 
-        @property authenticatorFactory
+        @property authenticator
         @type String
         @readOnly
         @default null
       */
-      authenticatorFactory: null,
+      authenticator: null,
       /**
         The store used to persist session properties.
 
@@ -948,16 +952,16 @@ define("simple-auth/session",
         unauthenticated.
 
         @method authenticate
-        @param {String} authenticatorFactory The authenticator 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)
+        @param {String} authenticator The authenticator 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)
         @param {Object} options The options to pass to the authenticator; depending on the type of authenticator these might be a set of credentials, a Facebook OAuth Token, etc.
         @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));
+      authenticate: function(authenticator, options) {
+        Ember.assert('Session#authenticate requires the authenticator factory to be specified, was ' + authenticator, !Ember.isEmpty(authenticator));
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          _this.container.lookup(authenticatorFactory).authenticate(options).then(function(content) {
-            _this.setup(authenticatorFactory, content, true);
+          _this.container.lookup(authenticator).authenticate(options).then(function(content) {
+            _this.setup(authenticator, content, true);
             resolve();
           }, function(error) {
             _this.clear();
@@ -970,9 +974,9 @@ define("simple-auth/session",
       /**
         Invalidates the session with the authenticator it is currently
         authenticated with (see
-        [`Session#authenticatorFactory`](#SimpleAuth-Session-authenticatorFactory)).
-        __This invokes the authenticator's `invalidate` method and handles the
-        returned promise accordingly__ (see
+        [`Session#authenticator`](#SimpleAuth-Session-authenticator)). __This
+        invokes the authenticator's `invalidate` method and handles the returned
+        promise accordingly__ (see
         [`Authenticators.Base#invalidate`](#SimpleAuth-Authenticators-Base-invalidate)).
 
         __This method returns a promise itself. A resolving promise indicates that
@@ -988,7 +992,7 @@ define("simple-auth/session",
       invalidate: function() {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          var authenticator = _this.container.lookup(_this.authenticatorFactory);
+          var authenticator = _this.container.lookup(_this.authenticator);
           authenticator.invalidate(_this.content).then(function() {
             authenticator.off('sessionDataUpdated');
             _this.clear(true);
@@ -1007,12 +1011,12 @@ define("simple-auth/session",
       restore: function() {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          var restoredContent      = _this.store.restore();
-          var authenticatorFactory = restoredContent.authenticatorFactory;
-          if (!!authenticatorFactory) {
-            delete restoredContent.authenticatorFactory;
-            _this.container.lookup(authenticatorFactory).restore(restoredContent).then(function(content) {
-              _this.setup(authenticatorFactory, content);
+          var restoredContent = _this.store.restore();
+          var authenticator   = restoredContent.authenticator;
+          if (!!authenticator) {
+            delete restoredContent.authenticator;
+            _this.container.lookup(authenticator).restore(restoredContent).then(function(content) {
+              _this.setup(authenticator, content);
               resolve();
             }, function() {
               _this.store.clear();
@@ -1029,16 +1033,16 @@ define("simple-auth/session",
         @method setup
         @private
       */
-      setup: function(authenticatorFactory, content, trigger) {
+      setup: function(authenticator, content, trigger) {
         trigger = !!trigger && !this.get('isAuthenticated');
         this.beginPropertyChanges();
         this.setProperties({
-          isAuthenticated:      true,
-          authenticatorFactory: authenticatorFactory,
-          content:              content
+          isAuthenticated: true,
+          authenticator:   authenticator,
+          content:         content
         });
         this.bindToAuthenticatorEvents();
-        var data = Ember.$.extend({ authenticatorFactory: authenticatorFactory }, this.content);
+        var data = Ember.$.extend({ authenticator: authenticator }, this.content);
         this.store.replace(data);
         this.endPropertyChanges();
         if (trigger) {
@@ -1054,9 +1058,9 @@ define("simple-auth/session",
         trigger = !!trigger && this.get('isAuthenticated');
         this.beginPropertyChanges();
         this.setProperties({
-          isAuthenticated:      false,
-          authenticatorFactory: null,
-          content:              {}
+          isAuthenticated: false,
+          authenticator:   null,
+          content:         {}
         });
         this.store.clear();
         this.endPropertyChanges();
@@ -1071,11 +1075,11 @@ define("simple-auth/session",
       */
       bindToAuthenticatorEvents: function() {
         var _this = this;
-        var authenticator = this.container.lookup(this.authenticatorFactory);
+        var authenticator = this.container.lookup(this.authenticator);
         authenticator.off('sessionDataUpdated');
         authenticator.off('sessionDataInvalidated');
         authenticator.on('sessionDataUpdated', function(content) {
-          _this.setup(_this.authenticatorFactory, content);
+          _this.setup(_this.authenticator, content);
         });
         authenticator.on('sessionDataInvalidated', function(content) {
           _this.clear(true);
@@ -1089,11 +1093,11 @@ define("simple-auth/session",
       bindToStoreEvents: function() {
         var _this = this;
         this.store.on('sessionDataUpdated', function(content) {
-          var authenticatorFactory = content.authenticatorFactory;
-          if (!!authenticatorFactory) {
-            delete content.authenticatorFactory;
-            _this.container.lookup(authenticatorFactory).restore(content).then(function(content) {
-              _this.setup(authenticatorFactory, content, true);
+          var authenticator = content.authenticator;
+          if (!!authenticator) {
+            delete content.authenticator;
+            _this.container.lookup(authenticator).restore(content).then(function(content) {
+              _this.setup(authenticator, content, true);
             }, function() {
               _this.clear(true);
             });
@@ -1155,7 +1159,7 @@ define("simple-auth/setup",
       application.deferReadiness();
       registerStores(container);
 
-      var store            = container.lookup(Configuration.storeFactory);
+      var store            = container.lookup(Configuration.store);
       var session          = Session.create({ store: store, container: container });
       crossOriginWhitelist = Ember.A(Configuration.crossOriginWhitelist).map(function(origin) {
         return extractLocationOrigin(origin);
@@ -1166,8 +1170,8 @@ define("simple-auth/setup",
         container.injection(component, Configuration.sessionPropertyName, 'simple-auth-session:main');
       });
 
-      if (!Ember.isEmpty(Configuration.authorizerFactory)) {
-        var authorizer = container.lookup(Configuration.authorizerFactory);
+      if (!Ember.isEmpty(Configuration.authorizer)) {
+        var authorizer = container.lookup(Configuration.authorizer);
         if (!!authorizer) {
           authorizer.set('session', session);
           Ember.$.ajaxPrefilter(function(options, originalOptions, jqXHR) {
@@ -1212,7 +1216,7 @@ define("simple-auth/stores/base",
       ```js
       window.ENV = window.ENV || {};
       window.ENV['simple-auth'] = {
-        storeFactory: 'simple-auth-session-store:local-storage'
+        store: 'simple-auth-session-store:local-storage'
       }
       ```
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - frederik dudzik