ember_simple_auth-rails 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5cb1748697c5c13e7654a92f6429aa682ebda7be
-  data.tar.gz: 17484df8c4f99d994c46f85f025efe4e04ada067
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWM0ZDZiZDRjMTJiZWIxYjg3NDAxZmNhMTc5YTg3OWEzMzJlMzhiMQ==
+  data.tar.gz: !binary |-
+    MDAzODc5YzEzYTg4MWQyYTcwZWVkMDQ5OWI5NDMwMjZmODJiZWI3Ng==
 SHA512:
-  metadata.gz: 931e4302c5eb21aa198abbbd8c2ddbf299fd06feacce52f6c6c1d6d94ae8c12bceb59cf8dbc669d99ddb864ccf51148b89775e612920d222d62dda9253ba17e6
-  data.tar.gz: c7d7a8215b98126a1e7db4a95ea0d90381225a06fdbdf79db400e79d6fec283703f362def28cc739ca154324f9eb79565a156496862b75bfa399497c3b2a0a75
+  metadata.gz: !binary |-
+    Mjc1NzBjNzZkNTMzM2EwNjgyYzc0NTYzYjgyYmE4N2VjOTZiNDM5MzE1YmU3
+    MmU3MjYwNzE5ODRkMjY1ZWMwMDE4MGZlYzg0MGUxNTJkODAwZjUxNjEwYzI5
+    OGM2YzU0OTg0NDhiM2Y2OTI1MGFmNzQzYTg5ZTUwN2E4N2JlY2I=
+  data.tar.gz: !binary |-
+    ODBkMGJkMmVkYzE5ODgzYzE4YTA3YmMyOTQ4ZjUyNmVhMTQ1ZDQzMDBlYmZj
+    NTNjYzdkZWExMTQ1NjFlN2YxMDk0MWFjZDQyY2Q0NzVlMzQwOGFhOTRhMDE3
+    ZWE3ZWJmMjc1MzlhZjExOTVlNTFhOTlhZGRlODczYTFmMWNmYzA=

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.7.0"
+    VERSION = "0.7.2"
   end
 end

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Cookie Store', '0.7.0');
+Ember.libraries.register('Ember Simple Auth Cookie Store', '0.7.2');
 
 var define, requireModule;
 
@@ -291,7 +291,6 @@ define("simple-auth-cookie-store/stores/cookie",
         @return {Object} All data currently persisted in the cookie
       */
       restore: function() {
-
         var data = this.read();
         if (Ember.isEmpty(data)) {
           return {};
@@ -309,7 +308,7 @@ define("simple-auth-cookie-store/stores/cookie",
       */
       clear: function() {
         this.write(null, 0);
-        this._lastData = null;
+        this._lastData = {};
       },
 
       /**

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Devise', '0.7.0');
+Ember.libraries.register('Ember Simple Auth Devise', '0.7.2');
 
 var define, requireModule;
 

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth OAuth 2.0', '0.7.0');
+Ember.libraries.register('Ember Simple Auth OAuth 2.0', '0.7.2');
 
 var define, requireModule;
 
@@ -181,12 +181,14 @@ define("simple-auth-oauth2/authenticators/oauth2",
       },
 
       /**
-        Authenticates the session with the specified `credentials`; the credentials
-        are send via a _"POST"_ request to the
+        Authenticates the session with the specified `options`; makes a `POST`
+        request to the
         [`Authenticators.OAuth2#serverTokenEndpoint`](#SimpleAuth-Authenticators-OAuth2-serverTokenEndpoint)
-        and if they are valid the server returns an access token in response (see
-        http://tools.ietf.org/html/rfc6749#section-4.3). __If the credentials are
-        valid and authentication succeeds, a promise that resolves with the
+        with the passed credentials and optional scope and receives the token in
+        response (see http://tools.ietf.org/html/rfc6749#section-4.3).
+
+        __If the credentials are valid (and the optionally requested scope is
+        granted) and thus authentication succeeds, a promise that resolves with the
         server's response is returned__, otherwise a promise that rejects with the
         error is returned.
 
@@ -196,13 +198,20 @@ define("simple-auth-oauth2/authenticators/oauth2",
         [`Authenticators.OAuth2#refreshAccessTokens`](#SimpleAuth-Authenticators-OAuth2-refreshAccessTokens)).
 
         @method authenticate
-        @param {Object} credentials The credentials to authenticate the session with
+        @param {Object} options
+        @param {String} options.identification The resource owner username
+        @param {String} options.password The resource owner password
+        @param {String|Array} [options.scope] The scope of the access request (see [RFC 6749, section 3.3](http://tools.ietf.org/html/rfc6749#section-3.3))
         @return {Ember.RSVP.Promise} A promise that resolves when an access token is successfully acquired from the server and rejects otherwise
       */
-      authenticate: function(credentials) {
+      authenticate: function(options) {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          var data = { grant_type: 'password', username: credentials.identification, password: credentials.password };
+          var data = { grant_type: 'password', username: options.identification, password: options.password };
+          if (!Ember.isEmpty(options.scope)) {
+            var scopesString = Ember.makeArray(options.scope).join(' ');
+            Ember.merge(data, { scope: scopesString });
+          }
           _this.makeRequest(_this.serverTokenEndpoint, data).then(function(response) {
             Ember.run(function() {
               var expiresAt = _this.absolutizeExpirationTime(response.expires_in);

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Testing', '0.7.0');
+Ember.libraries.register('Ember Simple Auth Testing', '0.7.2');
 
 var define, requireModule;
 
@@ -113,6 +113,11 @@ define("simple-auth-testing/test-helpers",
         return wait();
       });
 
+      Ember.Test.registerHelper('currentSession', function(app) {
+        var session = app.__container__.lookup(Configuration.session);
+        return session;
+      });
+
       Ember.Test.registerAsyncHelper('invalidateSession', function(app) {
         var session = app.__container__.lookup(Configuration.session);
         if (session.get('isAuthenticated')) {

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Torii', '0.7.0');
+Ember.libraries.register('Ember Simple Auth Torii', '0.7.2');
 
 var define, requireModule;
 
@@ -120,12 +120,13 @@ define("simple-auth-torii/authenticators/torii",
 
         @method authenticate
         @param {String} provider The provider to authenticate the session with
+        @param {Object} options The options to pass to the torii provider
         @return {Ember.RSVP.Promise} A promise that resolves when the provider successfully authenticates a user and rejects otherwise
       */
-      authenticate: function(provider) {
+      authenticate: function(provider, options) {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          _this.torii.open(provider).then(function(data) {
+          _this.torii.open(provider, options || {}).then(function(data) {
             _this.resolveWith(provider, data, resolve);
           }, reject);
         });

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth', '0.7.0');
+Ember.libraries.register('Ember Simple Auth', '0.7.2');
 
 var define, requireModule;
 
@@ -177,7 +177,7 @@ define("simple-auth/authenticators/base",
         rejecting promise and thus never authenticates the session.
 
         @method authenticate
-        @param {Object} options The options to authenticate the session with
+        @param {Any} [...options] The arguments that the authenticator requires to authenticate the session
         @return {Ember.RSVP.Promise} A promise that when it resolves results in the session being authenticated
       */
       authenticate: function(options) {
@@ -271,6 +271,7 @@ define("simple-auth/configuration",
       authorizer:                  null,
       session:                     'simple-auth-session:main',
       store:                       'simple-auth-session-store:local-storage',
+      localStorageKey:             'ember_simple_auth:session',
       crossOriginWhitelist:        [],
       applicationRootUrl:          null
     };
@@ -379,12 +380,23 @@ define("simple-auth/configuration",
       */
       store: defaults.store,
 
+      /**
+        The key the store stores the data in.
+
+        @property key
+        @type String
+        @default 'ember_simple_auth:session'
+      */
+      localStorageKey: defaults.localStorageKey,
+
       /**
         Ember Simple Auth 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 with
         this setting. _Beware that origins consist of protocol, host and port (port
-        can be left out when it is 80 for HTTP or 443 for HTTPS)_
+        can be left out when it is 80 for HTTP or 443 for HTTPS)_, e.g.
+        `http://domain.com:1234`, `https://external.net`. You can also whitelist
+        all external origins by specifying `[*]`.
 
         @property crossOriginWhitelist
         @readOnly
@@ -442,6 +454,8 @@ define("simple-auth/mixins/application-route-mixin",
     "use strict";
     var Configuration = __dependency1__["default"];
 
+    var routeEntryComplete = false;
+
     /**
       The mixin for the application route; defines actions to authenticate the
       session as well as to invalidate it. These actions can be used in all
@@ -499,6 +513,15 @@ define("simple-auth/mixins/application-route-mixin",
       @static
     */
     __exports__["default"] = Ember.Mixin.create({
+      /**
+        @method activate
+        @private
+      */
+      activate: function () {
+        routeEntryComplete = true;
+        this._super();
+      },
+
       /**
         @method beforeModel
         @private
@@ -517,7 +540,8 @@ define("simple-auth/mixins/application-route-mixin",
           ]).forEach(function(event) {
             _this.get(Configuration.sessionPropertyName).on(event, function(error) {
               Array.prototype.unshift.call(arguments, event);
-              transition.send.apply(transition, arguments);
+              var target = routeEntryComplete ? _this : transition;
+              target.send.apply(target, arguments);
             });
           });
         }
@@ -757,7 +781,7 @@ define("simple-auth/mixins/authentication-controller-mixin",
         authenticate: function(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);
+          return this.get(Configuration.sessionPropertyName).authenticate(authenticator, options);
         }
       }
     });
@@ -1027,16 +1051,18 @@ define("simple-auth/session",
 
         @method authenticate
         @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.
+        @param {Any} [...args] The arguments 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(authenticator, options) {
+      authenticate: function() {
+        var args          = Array.prototype.slice.call(arguments);
+        var authenticator = args.shift();
         Ember.assert('Session#authenticate requires the authenticator factory to be specified, was ' + authenticator, !Ember.isEmpty(authenticator));
         var _this            = this;
         var theAuthenticator = this.container.lookup(authenticator);
         Ember.assert('No authenticator for factory "' + authenticator + '" could be found', !Ember.isNone(theAuthenticator));
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          theAuthenticator.authenticate(options).then(function(content) {
+          theAuthenticator.authenticate.apply(theAuthenticator, args).then(function(content) {
             _this.setup(authenticator, content, true);
             resolve();
           }, function(error) {
@@ -1255,6 +1281,19 @@ define("simple-auth/setup",
       container.register('simple-auth-session:main', Session);
     }
 
+    function ajaxPrefilter(options, originalOptions, jqXHR) {
+      if (shouldAuthorizeRequest(options)) {
+        jqXHR.__simple_auth_authorized__ = true;
+        ajaxPrefilter.authorizer.authorize(jqXHR, options);
+      }
+    }
+
+    function ajaxError(event, jqXHR, setting, exception) {
+      if (!!jqXHR.__simple_auth_authorized__ && jqXHR.status === 401) {
+        ajaxError.session.trigger('authorizationFailed');
+      }
+    }
+
     var didSetupAjaxHooks = false;
 
     /**
@@ -1268,7 +1307,7 @@ define("simple-auth/setup",
       var store   = container.lookup(Configuration.store);
       var session = container.lookup(Configuration.session);
       session.setProperties({ store: store, container: container });
-      Ember.A(['controller', 'route']).forEach(function(component) {
+      Ember.A(['controller', 'route', 'component']).forEach(function(component) {
         container.injection(component, Configuration.sessionPropertyName, Configuration.session);
       });
 
@@ -1278,22 +1317,15 @@ define("simple-auth/setup",
 
       if (!Ember.isEmpty(Configuration.authorizer)) {
         var authorizer = container.lookup(Configuration.authorizer);
-        if (!!authorizer) {
-          authorizer.set('session', session);
-          if (!didSetupAjaxHooks) {
-            Ember.$.ajaxPrefilter(function(options, originalOptions, jqXHR) {
-              if (!authorizer.isDestroyed && shouldAuthorizeRequest(options)) {
-                jqXHR.__simple_auth_authorized__ = true;
-                authorizer.authorize(jqXHR, options);
-              }
-            });
-            Ember.$(document).ajaxError(function(event, jqXHR, setting, exception) {
-              if (!!jqXHR.__simple_auth_authorized__ && jqXHR.status === 401) {
-                session.trigger('authorizationFailed');
-              }
-            });
-            didSetupAjaxHooks = true;
-          }
+        Ember.assert('The configured authorizer "' + Configuration.authorizer + '" could not be found in the container.', !Ember.isEmpty(authorizer));
+        authorizer.set('session', session);
+        ajaxPrefilter.authorizer = authorizer;
+        ajaxError.session = session;
+
+        if (!didSetupAjaxHooks) {
+          Ember.$.ajaxPrefilter('+*', ajaxPrefilter);
+          Ember.$(document).ajaxError(ajaxError);
+          didSetupAjaxHooks = true;
         }
       } else {
         Ember.Logger.info('No authorizer was configured for Ember Simple Auth - specify one if backend requests need to be authorized.');
@@ -1442,12 +1474,12 @@ define("simple-auth/stores/ephemeral",
     });
   });
 define("simple-auth/stores/local-storage", 
-  ["./base","../utils/objects-are-equal","simple-auth/utils/get-global-config","exports"],
+  ["./base","../utils/objects-are-equal","../configuration","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Base = __dependency1__["default"];
     var objectsAreEqual = __dependency2__["default"];
-    var getGlobalConfig = __dependency3__["default"];
+    var Configuration = __dependency3__["default"];
 
     /**
       Store that saves its data in the browser's `localStorage`.
@@ -1477,8 +1509,7 @@ define("simple-auth/stores/local-storage",
         @private
       */
       init: function() {
-        var globalConfig = getGlobalConfig('simple-auth');
-        this.key         = globalConfig.localStorageKey || this.key;
+        this.key = Configuration.localStorageKey;
 
         this.bindToStorageEvents();
       },
@@ -1515,7 +1546,7 @@ define("simple-auth/stores/local-storage",
       */
       clear: function() {
         localStorage.removeItem(this.key);
-        this._lastData = null;
+        this._lastData = {};
       },
 
       /**

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-12-03 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: 
@@ -79,19 +79,18 @@ 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.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ember-simple-auth for the rails asset pipeline
 test_files: []
-has_rdoc: