ember_simple_auth-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6956583f0ef31fb5eae582aa5fda6d694df753e6
-  data.tar.gz: 89333e5c0135e5ffdefbd282416c7ac7ba6e86e8
+  metadata.gz: 73f2d4ad8f745292a30ac576c6db894f387c276d
+  data.tar.gz: 38b0fe4355b5d8ccd9b3801512800bdaf331131f
 SHA512:
-  metadata.gz: a04c7aed11be25c49ee59176aa38e67509323d0c828fdc42edd118243c8fed8f5fd72ce4d82304efdca792d2245d58305d51bc3f7d03b3fc8da8a7c001a4c29d
-  data.tar.gz: 1400dd996f404f5732577804651f9d8fbc970e17acbb8b8a7fcffe0a18cbad5b73918cd6554d3ee1a890a15464ac9334faca1e41323020b55e015f3ac28647e3
+  metadata.gz: c35fb4d3f62dbaa128ff332f38260def9215f99db29e1d636ee689c438c56c05abc5862501d229c41041ba0d6b1ab74c22bdf381b08de02f6f3a030750f570ba
+  data.tar.gz: bf9eff7b02ccc43b52a701fbaed86fa2c9e63e07d3ecc1dc2b13098b85e096c4778442fa421ee9c5a7e9d02b0b8057d30641ecdde0374adc288c5753b95fb692

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

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

@@ -54,18 +54,13 @@ var define, requireModule;
   requireModule.registry = registry;
 })();
 
-define("ember-simple-auth-cookie-store", 
-  ["./ember-simple-auth-cookie-store/stores/cookie","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Cookie = __dependency1__.Cookie;
-
-    __exports__["default"] = Cookie;
-  });
 define("ember-simple-auth-cookie-store/stores/cookie", 
-  ["exports"],
-  function(__exports__) {
+  ["ember-simple-auth/stores/base","ember-simple-auth/utils/flat_objects_are_equal","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
+    var Base = __dependency1__["default"];
+    var flatObjectsAreEqual = __dependency2__["default"];
+
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
@@ -86,7 +81,7 @@ define("ember-simple-auth-cookie-store/stores/cookie",
       @namespace Stores
       @extends Stores.Base
     */
-    var Cookie = Ember.SimpleAuth.Stores.Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         The prefix to use for the store's cookie names so they can be distinguished
         from other cookies.
@@ -201,7 +196,7 @@ define("ember-simple-auth-cookie-store/stores/cookie",
       */
       syncData: function() {
         var data = this.restore();
-        if (!Ember.SimpleAuth.Utils.flatObjectsAreEqual(data, this._lastData)) {
+        if (!flatObjectsAreEqual(data, this._lastData)) {
           this._lastData = data;
           this.trigger('sessionDataUpdated', data);
         }
@@ -211,10 +206,16 @@ define("ember-simple-auth-cookie-store/stores/cookie",
         }
       }
     });
-
-    __exports__.Cookie = Cookie;
   });
-global.Ember.SimpleAuth.Stores.Cookie = requireModule('ember-simple-auth-cookie-store').default;
+define('ember-simple-auth/stores/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Stores.Base;
+});
+define('ember-simple-auth/utils/flat_objects_are_equal',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Utils.flatObjectsAreEqual;
+});
+
+var Cookie = requireModule('ember-simple-auth-cookie-store/stores/cookie').default;
+global.Ember.SimpleAuth.Stores.Cookie = Cookie;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
   container.register('ember-simple-auth-session-store:cookie', global.Ember.SimpleAuth.Stores.Cookie);

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

@@ -54,20 +54,13 @@ var define, requireModule;
   requireModule.registry = registry;
 })();
 
-define("ember-simple-auth-devise", 
-  ["./ember-simple-auth-devise/authenticators/devise","./ember-simple-auth-devise/authorizers/devise","exports"],
+define("ember-simple-auth-devise/authenticators/devise", 
+  ["ember-simple-auth/authenticators/base","ember-simple-auth/utils/is_secure_url","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Authenticator = __dependency1__.Devise;
-    var Authorizer = __dependency2__.Devise;
+    var Base = __dependency1__["default"];
+    var isSecureUrl = __dependency2__["default"];
 
-    __exports__.Authenticator = Authenticator;
-    __exports__.Authorizer = Authorizer;
-  });
-define("ember-simple-auth-devise/authenticators/devise", 
-  ["exports"],
-  function(__exports__) {
-    "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
@@ -87,7 +80,7 @@ define("ember-simple-auth-devise/authenticators/devise",
       @namespace Authenticators
       @extends Base
     */
-    var Devise = Ember.SimpleAuth.Authenticators.Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         The endpoint on the server the authenticator acquires the auth token
         and email from.
@@ -173,7 +166,7 @@ define("ember-simple-auth-devise/authenticators/devise",
         @private
       */
       makeRequest: function(data, resolve, reject) {
-        if (!Ember.SimpleAuth.Utils.isSecureUrl(this.serverTokenEndpoint)) {
+        if (!isSecureUrl(this.serverTokenEndpoint)) {
           Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
         }
         return Ember.$.ajax({
@@ -187,13 +180,14 @@ define("ember-simple-auth-devise/authenticators/devise",
         });
       }
     });
-
-    __exports__.Devise = Devise;
   });
 define("ember-simple-auth-devise/authorizers/devise", 
-  ["exports"],
-  function(__exports__) {
+  ["ember-simple-auth/authorizers/base","ember-simple-auth/utils/is_secure_url","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
+    var Base = __dependency1__["default"];
+    var isSecureUrl = __dependency2__["default"];
+
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
@@ -213,7 +207,7 @@ define("ember-simple-auth-devise/authorizers/devise",
       @namespace Authorizers
       @extends Base
     */
-    var Devise = Ember.SimpleAuth.Authorizers.Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         Authorizes an XHR request by sending the `user_token` and `user_email`
         properties from the session in the `Authorization` header:
@@ -231,7 +225,7 @@ define("ember-simple-auth-devise/authorizers/devise",
         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)) {
+          if (!isSecureUrl(requestOptions.url)) {
             Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
           }
           var authData = 'token="' + userToken + '", user_email="' + userEmail + '"';
@@ -239,13 +233,22 @@ define("ember-simple-auth-devise/authorizers/devise",
         }
       }
     });
-
-    __exports__.Devise = Devise;
   });
-var devise = requireModule('ember-simple-auth-devise');
+define('ember-simple-auth/authenticators/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Authenticators.Base;
+});
+define('ember-simple-auth/authorizers/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Authorizers.Base;
+});
+define('ember-simple-auth/utils/is_secure_url',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Utils.isSecureUrl;
+});
+
+var Authenticator = requireModule('ember-simple-auth-devise/authenticators/devise').default;
+var Authorizer    = requireModule('ember-simple-auth-devise/authorizers/devise').default;
 
-global.Ember.SimpleAuth.Authenticators.Devise = devise.Authenticator;
-global.Ember.SimpleAuth.Authorizers.Devise    = devise.Authorizer;
+global.Ember.SimpleAuth.Authenticators.Devise = Authenticator;
+global.Ember.SimpleAuth.Authorizers.Devise    = Authorizer;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
   container.register('ember-simple-auth-authorizer:devise', global.Ember.SimpleAuth.Authorizers.Devise);

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

@@ -54,20 +54,13 @@ var define, requireModule;
   requireModule.registry = registry;
 })();
 
-define("ember-simple-auth-oauth2", 
-  ["./ember-simple-auth-oauth2/authenticators/oauth2","./ember-simple-auth-oauth2/authorizers/oauth2","exports"],
+define("ember-simple-auth-oauth2/authenticators/oauth2", 
+  ["ember-simple-auth/authenticators/base","ember-simple-auth/utils/is_secure_url","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Authenticator = __dependency1__.OAuth2;
-    var Authorizer = __dependency2__.OAuth2;
+    var Base = __dependency1__["default"];
+    var isSecureUrl = __dependency2__["default"];
 
-    __exports__.Authenticator = Authenticator;
-    __exports__.Authorizer = Authorizer;
-  });
-define("ember-simple-auth-oauth2/authenticators/oauth2", 
-  ["exports"],
-  function(__exports__) {
-    "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
@@ -87,7 +80,7 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
       @namespace Authenticators
       @extends Base
     */
-    var OAuth2 = Ember.SimpleAuth.Authenticators.Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         Triggered when the authenticator refreshes the access token (see
         [RFC 6740, section 6](http://tools.ietf.org/html/rfc6749#section-6)).
@@ -223,7 +216,7 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
         @protected
       */
       makeRequest: function(data) {
-        if (!Ember.SimpleAuth.Utils.isSecureUrl(this.serverTokenEndpoint)) {
+        if (!isSecureUrl(this.serverTokenEndpoint)) {
           Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
         }
         return Ember.$.ajax({
@@ -292,13 +285,14 @@ define("ember-simple-auth-oauth2/authenticators/oauth2",
         }
       }
     });
-
-    __exports__.OAuth2 = OAuth2;
   });
 define("ember-simple-auth-oauth2/authorizers/oauth2", 
-  ["exports"],
-  function(__exports__) {
+  ["ember-simple-auth/authorizers/base","ember-simple-auth/utils/is_secure_url","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
+    var Base = __dependency1__["default"];
+    var isSecureUrl = __dependency2__["default"];
+
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
@@ -315,7 +309,7 @@ define("ember-simple-auth-oauth2/authorizers/oauth2",
       @namespace Authorizers
       @extends Base
     */
-    var OAuth2 = Ember.SimpleAuth.Authorizers.Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         Authorizes an XHR request by sending the `access_token` property from the
         session as a bearer token in the `Authorization` header:
@@ -331,20 +325,29 @@ define("ember-simple-auth-oauth2/authorizers/oauth2",
       authorize: function(jqXHR, requestOptions) {
         var accessToken = this.get('session.access_token');
         if (this.get('session.isAuthenticated') && !Ember.isEmpty(accessToken)) {
-          if (!Ember.SimpleAuth.Utils.isSecureUrl(requestOptions.url)) {
+          if (!isSecureUrl(requestOptions.url)) {
             Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
           }
           jqXHR.setRequestHeader('Authorization', 'Bearer ' + accessToken);
         }
       }
     });
-
-    __exports__.OAuth2 = OAuth2;
   });
-var oauth2 = requireModule('ember-simple-auth-oauth2');
+define('ember-simple-auth/authenticators/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Authenticators.Base;
+});
+define('ember-simple-auth/authorizers/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Authorizers.Base;
+});
+define('ember-simple-auth/utils/is_secure_url',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.Ember.SimpleAuth.Utils.isSecureUrl;
+});
+
+var Authenticator = requireModule('ember-simple-auth-oauth2/authenticators/oauth2').default;
+var Authorizer = requireModule('ember-simple-auth-oauth2/authorizers/oauth2').default;
 
-global.Ember.SimpleAuth.Authenticators.OAuth2 = oauth2.Authenticator;
-global.Ember.SimpleAuth.Authorizers.OAuth2    = oauth2.Authorizer;
+global.Ember.SimpleAuth.Authenticators.OAuth2 = Authenticator;
+global.Ember.SimpleAuth.Authorizers.OAuth2    = Authorizer;
 
 global.Ember.SimpleAuth.initializeExtension(function(container, application, options) {
   container.register('ember-simple-auth-authorizer:oauth2-bearer', global.Ember.SimpleAuth.Authorizers.OAuth2);

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

@@ -55,52 +55,14 @@ var define, requireModule;
 })();
 
 define("ember-simple-auth", 
-  ["./ember-simple-auth/core","./ember-simple-auth/session","./ember-simple-auth/authenticators","./ember-simple-auth/authorizers","./ember-simple-auth/stores","./ember-simple-auth/utils","./ember-simple-auth/mixins/application_route_mixin","./ember-simple-auth/mixins/authenticated_route_mixin","./ember-simple-auth/mixins/authentication_controller_mixin","./ember-simple-auth/mixins/login_controller_mixin","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+  [],
+  function() {
     "use strict";
-    var setup = __dependency1__.setup;
-    var initializeExtension = __dependency1__.initializeExtension;
-    var Configuration = __dependency1__.Configuration;
-    var Session = __dependency2__.Session;
-    var Authenticators = __dependency3__.Authenticators;
-    var Authorizers = __dependency4__.Authorizers;
-    var Stores = __dependency5__.Stores;
-    var Utils = __dependency6__.Utils;
-    var ApplicationRouteMixin = __dependency7__.ApplicationRouteMixin;
-    var AuthenticatedRouteMixin = __dependency8__.AuthenticatedRouteMixin;
-    var AuthenticationControllerMixin = __dependency9__.AuthenticationControllerMixin;
-    var LoginControllerMixin = __dependency10__.LoginControllerMixin;
-
     /**
       Ember.SimpleAuth's main module.
 
       @module Ember.SimpleAuth
     */
-
-    __exports__.setup = setup;
-    __exports__.initializeExtension = initializeExtension;
-    __exports__.Configuration = Configuration;
-    __exports__.Session = Session;
-    __exports__.Authenticators = Authenticators;
-    __exports__.Authorizers = Authorizers;
-    __exports__.Stores = Stores;
-    __exports__.Utils = Utils;
-    __exports__.ApplicationRouteMixin = ApplicationRouteMixin;
-    __exports__.AuthenticatedRouteMixin = AuthenticatedRouteMixin;
-    __exports__.AuthenticationControllerMixin = AuthenticationControllerMixin;
-    __exports__.LoginControllerMixin = LoginControllerMixin;
-  });
-define("ember-simple-auth/authenticators", 
-  ["./authenticators/base","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Base = __dependency1__.Base;
-
-    var Authenticators = {
-      Base: Base
-    };
-
-    __exports__.Authenticators = Authenticators;
   });
 define("ember-simple-auth/authenticators/base", 
   ["exports"],
@@ -152,7 +114,7 @@ define("ember-simple-auth/authenticators/base",
       @extends Ember.Object
       @uses Ember.Evented
     */
-    var Base = Ember.Object.extend(Ember.Evented, {
+    __exports__["default"] = 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
@@ -245,20 +207,6 @@ define("ember-simple-auth/authenticators/base",
         return new Ember.RSVP.resolve();
       }
     });
-
-    __exports__.Base = Base;
-  });
-define("ember-simple-auth/authorizers", 
-  ["./authorizers/base","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Base = __dependency1__.Base;
-
-    var Authorizers = {
-      Base: Base
-    };
-
-    __exports__.Authorizers = Authorizers;
   });
 define("ember-simple-auth/authorizers/base", 
   ["exports"],
@@ -285,7 +233,7 @@ define("ember-simple-auth/authorizers/base",
       @namespace Authorizers
       @extends Ember.Object
     */
-    var Base = Ember.Object.extend({
+    __exports__["default"] = Ember.Object.extend({
       /**
         The session the authorizer gets the data it needs to authorize requests
         from (see [Ember.SimpleAuth.Session](#Ember-SimpleAuth-Session)).
@@ -311,51 +259,18 @@ define("ember-simple-auth/authorizers/base",
       authorize: function(jqXHR, requestOptions) {
       }
     });
-
-    __exports__.Base = Base;
   });
-define("ember-simple-auth/core", 
-  ["./session","./stores","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("ember-simple-auth/configuration", 
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var Session = __dependency1__.Session;
-    var registerStores = __dependency2__.registerStores;
-
-    function extractLocationOrigin(location) {
-      if (Ember.typeOf(location) === 'string') {
-        var link = document.createElement('a');
-        link.href = location;
-        //IE requires the following line when url is relative.
-        //First assignment of relative url to link.href results in absolute url on link.href but link.hostname and other properties are not set
-        //Second assignment of absolute url to link.href results in link.hostname and other properties being set as expected
-        link.href = link.href;
-        location = link;
-      }
-      var port = location.port;
-      if (Ember.isEmpty(port)) {
-        //need to include the port whether its actually present or not as some versions of IE will always set it
-        port = location.protocol === 'http:' ? '80' : (location.protocol === 'https:' ? '443' : '');
-      }
-      return location.protocol + '//' + location.hostname + (port !== '' ? ':' + port : '');
-    }
-
-    var urlOrigins     = {};
-    var documentOrigin = extractLocationOrigin(window.location);
-    var crossOriginWhitelist;
-    function shouldAuthorizeRequest(url) {
-      var urlOrigin = urlOrigins[url] = urlOrigins[url] || extractLocationOrigin(url);
-      return crossOriginWhitelist.indexOf(urlOrigin) > -1 || urlOrigin === documentOrigin;
-    }
-
-    var extensionInitializers = [];
-
     /**
       Ember.SimpleAuth's configuration object.
 
       @class Configuration
       @namespace $mainModule
     */
-    var Configuration = {
+    __exports__["default"] = {
       /**
         The route to transition to for authentication; should be set through
         [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup).
@@ -399,84 +314,22 @@ define("ember-simple-auth/core",
         @private
         @type String
       */
-      applicationRootUrl: null
-    };
-
-    /**
-      Sets up Ember.SimpleAuth for the application; this method __should be invoked
-      in a custom initializer__ like this:
-
-      ```javascript
-      Ember.Application.initializer({
-        name: 'authentication',
-        initialize: function(container, application) {
-          Ember.SimpleAuth.setup(container, application);
-        }
-      });
-      ```
-
-      @method setup
-      @namespace $mainModule
-      @static
-      @param {Container} container The Ember.js application's dependency injection container
-      @param {Ember.Application} application The Ember.js application instance
-      @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))_
-    **/
-    var setup = function(container, application, options) {
-      application.deferReadiness();
-      registerStores(container);
-      extensionInitializers.forEach(function(initializer) {
-        initializer(container, application, options);
-      });
+      applicationRootUrl: null,
 
-      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 || 'ember-simple-auth-session-store:local-storage';
-      var store            = container.lookup(options.storeFactory);
-      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) {
-        container.injection(component, Configuration.sessionPropertyName, 'ember-simple-auth-session:main');
-      });
-
-      if (!Ember.isEmpty(options.authorizerFactory)) {
-        var authorizer = container.lookup(options.authorizerFactory);
-        if (!!authorizer) {
-          authorizer.set('session', session);
-          Ember.$.ajaxPrefilter(function(options, originalOptions, jqXHR) {
-            if (shouldAuthorizeRequest(options.url)) {
-              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.');
-      }
-
-      var advanceReadiness = function() {
-        application.advanceReadiness();
-      };
-      session.restore().then(advanceReadiness, advanceReadiness);
+      /**
+        @property extensionInitializers
+        @static
+        @private
+        @type Array
+      */
+      extensionInitializers: []
     };
+  });
+define("ember-simple-auth/initialize_extension", 
+  ["./configuration","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Configuration = __dependency1__["default"];
 
     /**
       Registers an extension initializer to be invoked when
@@ -489,22 +342,18 @@ define("ember-simple-auth/core",
       @static
       @param {Function} initializer The initializer to be invoked when [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup) is invoked; this will receive the same arguments as [Ember.SimpleAuth.setup](#Ember-SimpleAuth-setup).
     */
-    var initializeExtension = function(initializer) {
-      extensionInitializers.push(initializer);
-    };
-
-    __exports__.setup = setup;
-    __exports__.initializeExtension = initializeExtension;
-    __exports__.Configuration = Configuration;
+    __exports__["default"] = function(initializer) {
+      Configuration.extensionInitializers.push(initializer);
+    }
   });
 define("ember-simple-auth/mixins/application_route_mixin", 
-  ["./../core","exports"],
+  ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember  = global.Ember;
 
-    var Configuration = __dependency1__.Configuration;
+    var Configuration = __dependency1__["default"];
 
     /**
       The mixin for the application route. This defines actions to authenticate the
@@ -544,7 +393,7 @@ define("ember-simple-auth/mixins/application_route_mixin",
       @extends Ember.Mixin
       @static
     */
-    var ApplicationRouteMixin = Ember.Mixin.create({
+    __exports__["default"] = Ember.Mixin.create({
       /**
         @method activate
         @private
@@ -691,17 +540,15 @@ define("ember-simple-auth/mixins/application_route_mixin",
         }
       }
     });
-
-    __exports__.ApplicationRouteMixin = ApplicationRouteMixin;
   });
 define("ember-simple-auth/mixins/authenticated_route_mixin", 
-  ["./../core","exports"],
+  ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var Configuration = __dependency1__.Configuration;
+    var Configuration = __dependency1__["default"];
 
     /**
       The mixin for routes that require the session to be authenticated in order to
@@ -724,7 +571,7 @@ define("ember-simple-auth/mixins/authenticated_route_mixin",
       @extends Ember.Mixin
       @static
     */
-    var AuthenticatedRouteMixin = Ember.Mixin.create({
+    __exports__["default"] = Ember.Mixin.create({
       /**
         This method implements the enforcement of the session being authenticated.
         If the session is not authenticated, the current transition will be aborted
@@ -745,17 +592,15 @@ define("ember-simple-auth/mixins/authenticated_route_mixin",
         }
       }
     });
-
-    __exports__.AuthenticatedRouteMixin = AuthenticatedRouteMixin;
   });
 define("ember-simple-auth/mixins/authentication_controller_mixin", 
-  ["./../core","exports"],
+  ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var Configuration = __dependency1__.Configuration;
+    var Configuration = __dependency1__["default"];
 
     /**
       The mixin for the controller that handles the `authenticationRoute` specified
@@ -767,7 +612,7 @@ define("ember-simple-auth/mixins/authentication_controller_mixin",
       @class AuthenticationControllerMixin
       @extends Ember.Mixin
     */
-    var AuthenticationControllerMixin = Ember.Mixin.create({
+    __exports__["default"] = Ember.Mixin.create({
       /**
         The authenticator used to authenticate the session.
 
@@ -792,18 +637,16 @@ define("ember-simple-auth/mixins/authentication_controller_mixin",
         }
       }
     });
-
-    __exports__.AuthenticationControllerMixin = AuthenticationControllerMixin;
   });
 define("ember-simple-auth/mixins/login_controller_mixin", 
-  ["./../core","./authentication_controller_mixin","exports"],
+  ["./../configuration","./authentication_controller_mixin","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var Configuration = __dependency1__.Configuration;
-    var AuthenticationControllerMixin = __dependency2__.AuthenticationControllerMixin;
+    var Configuration = __dependency1__["default"];
+    var AuthenticationControllerMixin = __dependency2__["default"];
 
     /**
       The mixin to use with the controller that handles the `authenticationRoute`
@@ -832,7 +675,7 @@ define("ember-simple-auth/mixins/login_controller_mixin",
       @class LoginControllerMixin
       @extends Ember.SimpleAuth.AuthenticationControllerMixin
     */
-    var LoginControllerMixin = Ember.Mixin.create(AuthenticationControllerMixin, {
+    __exports__["default"] = Ember.Mixin.create(AuthenticationControllerMixin, {
       actions: {
         /**
           This action will authenticate the session with the configured
@@ -853,8 +696,6 @@ define("ember-simple-auth/mixins/login_controller_mixin",
         }
       }
     });
-
-    __exports__.LoginControllerMixin = LoginControllerMixin;
   });
 define("ember-simple-auth/session", 
   ["exports"],
@@ -907,7 +748,7 @@ define("ember-simple-auth/session",
       @extends Ember.ObjectProxy
       @uses Ember.Evented
     */
-    var Session = Ember.ObjectProxy.extend(Ember.Evented, {
+    __exports__["default"] = Ember.ObjectProxy.extend(Ember.Evented, {
       /**
         Triggered __whenever the session is successfully authenticated__. When the
         application uses the mixin,
@@ -1169,30 +1010,123 @@ define("ember-simple-auth/session",
         });
       }
     });
-
-    __exports__.Session = Session;
   });
-define("ember-simple-auth/stores", 
-  ["./stores/base","./stores/local_storage","./stores/ephemeral","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-simple-auth/setup", 
+  ["./configuration","./session","./stores/local_storage","./stores/ephemeral","./initialize_extension","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
-    var Base = __dependency1__.Base;
-    var LocalStorage = __dependency2__.LocalStorage;
-    var Ephemeral = __dependency3__.Ephemeral;
-
-    var Stores = {
-      Base:         Base,
-      LocalStorage: LocalStorage,
-      Ephemeral:    Ephemeral
-    };
+    var Configuration = __dependency1__["default"];
+    var Session = __dependency2__["default"];
+    var LocalStorage = __dependency3__["default"];
+    var Ephemeral = __dependency4__["default"];
+    var initializeExtension = __dependency5__["default"];
+
+    function extractLocationOrigin(location) {
+      if (Ember.typeOf(location) === 'string') {
+        var link = document.createElement('a');
+        link.href = location;
+        //IE requires the following line when url is relative.
+        //First assignment of relative url to link.href results in absolute url on link.href but link.hostname and other properties are not set
+        //Second assignment of absolute url to link.href results in link.hostname and other properties being set as expected
+        link.href = link.href;
+        location = link;
+      }
+      var port = location.port;
+      if (Ember.isEmpty(port)) {
+        //need to include the port whether its actually present or not as some versions of IE will always set it
+        port = location.protocol === 'http:' ? '80' : (location.protocol === 'https:' ? '443' : '');
+      }
+      return location.protocol + '//' + location.hostname + (port !== '' ? ':' + port : '');
+    }
 
-    var registerStores = function(container) {
+    var urlOrigins     = {};
+    var documentOrigin = extractLocationOrigin(window.location);
+    var crossOriginWhitelist;
+    function shouldAuthorizeRequest(url) {
+      var urlOrigin = urlOrigins[url] = urlOrigins[url] || extractLocationOrigin(url);
+      return crossOriginWhitelist.indexOf(urlOrigin) > -1 || urlOrigin === documentOrigin;
+    }
+
+    function registerStores(container) {
       container.register('ember-simple-auth-session-store:local-storage', LocalStorage);
       container.register('ember-simple-auth-session-store:ephemeral', Ephemeral);
-    };
+    }
+
+    /**
+      Sets up Ember.SimpleAuth for the application; this method __should be invoked
+      in a custom initializer__ like this:
+
+      ```javascript
+      Ember.Application.initializer({
+        name: 'authentication',
+        initialize: function(container, application) {
+          Ember.SimpleAuth.setup(container, application);
+        }
+      });
+      ```
+
+      @method setup
+      @namespace $mainModule
+      @static
+      @param {Container} container The Ember.js application's dependency injection container
+      @param {Ember.Application} application The Ember.js application instance
+      @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))_
+    **/
+    __exports__["default"] = function(container, application, options) {
+      application.deferReadiness();
+      registerStores(container);
+      Configuration.extensionInitializers.forEach(function(initializer) {
+        initializer(container, application, options);
+      });
+
+      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 || 'ember-simple-auth-session-store:local-storage';
+      var store            = container.lookup(options.storeFactory);
+      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) {
+        container.injection(component, Configuration.sessionPropertyName, 'ember-simple-auth-session:main');
+      });
 
-    __exports__.registerStores = registerStores;
-    __exports__.Stores = Stores;
+      if (!Ember.isEmpty(options.authorizerFactory)) {
+        var authorizer = container.lookup(options.authorizerFactory);
+        if (!!authorizer) {
+          authorizer.set('session', session);
+          Ember.$.ajaxPrefilter(function(options, originalOptions, jqXHR) {
+            if (shouldAuthorizeRequest(options.url)) {
+              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.');
+      }
+
+      var advanceReadiness = function() {
+        application.advanceReadiness();
+      };
+      session.restore().then(advanceReadiness, advanceReadiness);
+    }
   });
 define("ember-simple-auth/stores/base", 
   ["../utils/flat_objects_are_equal","exports"],
@@ -1201,7 +1135,7 @@ define("ember-simple-auth/stores/base",
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var flatObjectsAreEqual = __dependency1__.flatObjectsAreEqual;
+    var flatObjectsAreEqual = __dependency1__["default"];
 
     /**
       The base for all store types. __This serves as a starting point for
@@ -1218,7 +1152,7 @@ define("ember-simple-auth/stores/base",
       @extends Ember.Object
       @uses Ember.Evented
     */
-    var Base = Ember.Object.extend(Ember.Evented, {
+    __exports__["default"] = 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
@@ -1282,8 +1216,6 @@ define("ember-simple-auth/stores/base",
       clear: function() {
       }
     });
-
-    __exports__.Base = Base;
   });
 define("ember-simple-auth/stores/ephemeral", 
   ["./base","exports"],
@@ -1292,7 +1224,7 @@ define("ember-simple-auth/stores/ephemeral",
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var Base = __dependency1__.Base;
+    var Base = __dependency1__["default"];
 
     /**
       Store that saves its data in memory and thus __is not actually persistent__.
@@ -1308,7 +1240,7 @@ define("ember-simple-auth/stores/ephemeral",
       @namespace Stores
       @extends Stores.Base
     */
-    var Ephemeral = Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         @method init
         @private
@@ -1347,8 +1279,6 @@ define("ember-simple-auth/stores/ephemeral",
         this._data = {};
       }
     });
-
-    __exports__.Ephemeral = Ephemeral;
   });
 define("ember-simple-auth/stores/local_storage", 
   ["./base","../utils/flat_objects_are_equal","exports"],
@@ -1357,8 +1287,8 @@ define("ember-simple-auth/stores/local_storage",
     var global = (typeof window !== 'undefined') ? window : {},
         Ember = global.Ember;
 
-    var Base = __dependency1__.Base;
-    var flatObjectsAreEqual = __dependency2__.flatObjectsAreEqual;
+    var Base = __dependency1__["default"];
+    var flatObjectsAreEqual = __dependency2__["default"];
 
     /**
       Store that saves its data in the browser's `localStorage`.
@@ -1370,7 +1300,7 @@ define("ember-simple-auth/stores/local_storage",
       @namespace Stores
       @extends Stores.Base
     */
-    var LocalStorage = Base.extend({
+    __exports__["default"] = Base.extend({
       /**
         The prefix to use for the store's keys so they can be distinguished from
         others.
@@ -1480,22 +1410,6 @@ define("ember-simple-auth/stores/local_storage",
         });
       }
     });
-
-    __exports__.LocalStorage = LocalStorage;
-  });
-define("ember-simple-auth/utils", 
-  ["./utils/is_secure_url","./utils/flat_objects_are_equal","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var isSecureUrl = __dependency1__.isSecureUrl;
-    var flatObjectsAreEqual = __dependency2__.flatObjectsAreEqual;
-
-    var Utils = {
-      isSecureUrl:         isSecureUrl,
-      flatObjectsAreEqual: flatObjectsAreEqual
-    };
-
-    __exports__.Utils = Utils;
   });
 define("ember-simple-auth/utils/flat_objects_are_equal", 
   ["exports"],
@@ -1505,7 +1419,7 @@ define("ember-simple-auth/utils/flat_objects_are_equal",
       @method flatObjectsAreEqual
       @private
     */
-    var flatObjectsAreEqual = function(a, b) {
+    __exports__["default"] = function(a, b) {
       function sortObject(object) {
         var array = [];
         for (var property in object) {
@@ -1522,9 +1436,7 @@ define("ember-simple-auth/utils/flat_objects_are_equal",
         });
       }
       return JSON.stringify(sortObject(a)) === JSON.stringify(sortObject(b));
-    };
-
-    __exports__.flatObjectsAreEqual = flatObjectsAreEqual;
+    }
   });
 define("ember-simple-auth/utils/is_secure_url", 
   ["exports"],
@@ -1534,14 +1446,58 @@ define("ember-simple-auth/utils/is_secure_url",
       @method isSecureUrl
       @private
     */
-    var isSecureUrl = function(url) {
+    __exports__["default"] = function(url) {
       var link  = document.createElement('a');
       link.href = url;
       link.href = link.href;
       return link.protocol == 'https:';
-    };
-
-    __exports__.isSecureUrl = isSecureUrl;
+    }
   });
-global.Ember.SimpleAuth = requireModule('ember-simple-auth');
+var setup                         = requireModule('ember-simple-auth/setup').default;
+var initializeExtension           = requireModule('ember-simple-auth/initialize_extension').default;
+var Configuration                 = requireModule('ember-simple-auth/configuration').default;
+var Session                       = requireModule('ember-simple-auth/session').default;
+var BaseAuthenticator             = requireModule('ember-simple-auth/authenticators/base').default;
+var BaseAuthorizer                = requireModule('ember-simple-auth/authorizers/base').default;
+var BaseStore                     = requireModule('ember-simple-auth/stores/base').default;
+var LocalStorageStore             = requireModule('ember-simple-auth/stores/local_storage').default;
+var EphemeralStore                = requireModule('ember-simple-auth/stores/ephemeral').default;
+var flatObjectsAreEqual           = requireModule('ember-simple-auth/utils/flat_objects_are_equal').default;
+var isSecureUrl                   = requireModule('ember-simple-auth/utils/is_secure_url').default;
+var ApplicationRouteMixin         = requireModule('ember-simple-auth/mixins/application_route_mixin').default;
+var AuthenticatedRouteMixin       = requireModule('ember-simple-auth/mixins/authenticated_route_mixin').default;
+var AuthenticationControllerMixin = requireModule('ember-simple-auth/mixins/authentication_controller_mixin').default;
+var LoginControllerMixin          = requireModule('ember-simple-auth/mixins/login_controller_mixin').default;
+
+global.Ember.SimpleAuth = {
+  setup: setup,
+
+  initializeExtension: initializeExtension,
+
+  Session: Session,
+
+  Authenticators: {
+    Base: BaseAuthenticator
+  },
+
+  Authorizers: {
+    Base: BaseAuthorizer
+  },
+
+  Stores: {
+    Base: BaseStore,
+    LocalStorage: LocalStorageStore,
+    Ephemeral: EphemeralStore
+  },
+
+  Utils: {
+    flatObjectsAreEqual: flatObjectsAreEqual,
+    isSecureUrl: isSecureUrl
+  },
+
+  ApplicationRouteMixin:         ApplicationRouteMixin,
+  AuthenticatedRouteMixin:       AuthenticatedRouteMixin,
+  AuthenticationControllerMixin: AuthenticationControllerMixin,
+  LoginControllerMixin:          LoginControllerMixin
+};
 })((typeof global !== 'undefined') ? global : window);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler