ember_simple_auth-rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53aea33dad689448357067597038c51240d0eaa9
-  data.tar.gz: c2e08042ab35453d753bb938ec8d5ffd7b4c60ca
+  metadata.gz: a6114507e7e5eeef52db1098b98f10d9dc483d29
+  data.tar.gz: 97a46d0071cce71416c5c290d7b45ba939f0b294
 SHA512:
-  metadata.gz: 62faee61aaebf1eeddafd9222c79bcf0231b64d4e589e7ce505e8140d40f08f698b99b54a69436d65bb508f24269bb9b57b6fefe505622df2bbbbf099f5d25f9
-  data.tar.gz: 027726929408bdd1ef45a0586e943f14ce1f8aff932ed2c74007374f2d2877d480787dd60df6be0168df98a10675aeaaa268c38afc707f29093c2827708ec9e9
+  metadata.gz: e721d44e48b6e4155d5f23afeb7cd7d3e3b51bcbb98fd88c25b62886230763af840d320ece40eb49555cd2a0a31158fe7f6b27e1e2cea9de6bb15873de99c666
+  data.tar.gz: 91e92b317511b1a7eaefabc052cbb347b1ed52e7607e2122520e48a623bdb7459d2f3f87c45b9d3cdb81bfe20d2ffb8f4e54c5d6b3a95c51945e2c013d8e9f64

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

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

@@ -110,6 +110,25 @@ define("simple-auth-oauth2/authenticators/oauth2",
       */
       serverTokenEndpoint: '/token',
 
+      /**
+        The endpoint on the server the authenticator uses to revoke tokens. Only
+        set this if the server actually supports token revokation.
+
+        This value can be configured via the global environment object:
+
+        ```js
+        window.ENV = window.ENV || {};
+        window.ENV['simple-auth-oauth2'] = {
+          serverTokenRevokationEndpoint: '/some/custom/endpoint'
+        }
+        ```
+
+        @property serverTokenRevokationEndpoint
+        @type String
+        @default null
+      */
+      serverTokenRevokationEndpoint: null,
+
       /**
         Sets whether the authenticator automatically refreshes access tokens.
 
@@ -139,9 +158,10 @@ define("simple-auth-oauth2/authenticators/oauth2",
         @private
       */
       init: function() {
-        var globalConfig         = getGlobalConfig('simple-auth-oauth2');
-        this.serverTokenEndpoint = globalConfig.serverTokenEndpoint || this.serverTokenEndpoint;
-        this.refreshAccessTokens = globalConfig.refreshAccessTokens || this.refreshAccessTokens;
+        var globalConfig                   = getGlobalConfig('simple-auth-oauth2');
+        this.serverTokenEndpoint           = globalConfig.serverTokenEndpoint || this.serverTokenEndpoint;
+        this.serverTokenRevokationEndpoint = globalConfig.serverTokenRevokationEndpoint || this.serverTokenRevokationEndpoint;
+        this.refreshAccessTokens           = globalConfig.refreshAccessTokens || this.refreshAccessTokens;
       },
 
       /**
@@ -204,7 +224,7 @@ define("simple-auth-oauth2/authenticators/oauth2",
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
           var data = { grant_type: 'password', username: credentials.identification, password: credentials.password };
-          _this.makeRequest(data).then(function(response) {
+          _this.makeRequest(_this.serverTokenEndpoint, data).then(function(response) {
             Ember.run(function() {
               var expiresAt = _this.absolutizeExpirationTime(response.expires_in);
               _this.scheduleAccessTokenRefresh(response.expires_in, expiresAt, response.refresh_token);
@@ -223,17 +243,38 @@ define("simple-auth-oauth2/authenticators/oauth2",
         promise.
 
         @method invalidate
+        @param {Object} data The data of the session to be invalidated
         @return {Ember.RSVP.Promise} A resolving promise
       */
-      invalidate: function() {
-        Ember.run.cancel(this._refreshTokenTimeout);
-        delete this._refreshTokenTimeout;
-        return new Ember.RSVP.resolve();
+      invalidate: function(data) {
+        var _this = this;
+        function success(resolve) {
+          Ember.run.cancel(_this._refreshTokenTimeout);
+          delete _this._refreshTokenTimeout;
+          resolve();
+        }
+        return new Ember.RSVP.Promise(function(resolve, reject) {
+          if (!Ember.isEmpty(_this.serverTokenRevokationEndpoint)) {
+            var requests = [];
+            Ember.A(['access_token', 'refresh_token']).forEach(function(tokenType) {
+              if (!Ember.isEmpty(data[tokenType])) {
+                requests.push(_this.makeRequest(_this.serverTokenRevokationEndpoint, {
+                  token_type_hint: tokenType, token: data[tokenType]
+                }));
+              }
+            });
+            Ember.$.when.apply(Ember.$, requests).always(function(responses) {
+              success(resolve);
+            });
+          } else {
+            success(resolve);
+          }
+        });
       },
 
       /**
-        Sends an `AJAX` request to the `serverTokenEndpoint`. This will always be a
-        _"POST"_ request with content type _"application/x-www-form-urlencoded"_ as
+        Sends an `AJAX` request to the `url`. This will always be a _"POST"_
+        request with content type _"application/x-www-form-urlencoded"_ as
         specified in [RFC 6749](http://tools.ietf.org/html/rfc6749).
 
         This method is not meant to be used directly but serves as an extension
@@ -241,16 +282,17 @@ define("simple-auth-oauth2/authenticators/oauth2",
         [RFC 6749, section 2.3](http://tools.ietf.org/html/rfc6749#section-2.3)).
 
         @method makeRequest
+        @param {Object} url The url to send the request to
         @param {Object} data The data to send with the request, e.g. username and password or the refresh token
         @return {Deferred object} A Deferred object (see [the jQuery docs](http://api.jquery.com/category/deferred-object/)) that is compatible to Ember.RSVP.Promise; will resolve if the request succeeds, reject otherwise
         @protected
       */
-      makeRequest: function(data) {
-        if (!isSecureUrl(this.serverTokenEndpoint)) {
+      makeRequest: function(url, data) {
+        if (!isSecureUrl(url)) {
           Ember.Logger.warn('Credentials are transmitted via an insecure connection - use HTTPS to keep them secure.');
         }
         return Ember.$.ajax({
-          url:         this.serverTokenEndpoint,
+          url:         url,
           type:        'POST',
           data:        data,
           dataType:    'json',
@@ -288,7 +330,7 @@ define("simple-auth-oauth2/authenticators/oauth2",
         var _this = this;
         var data  = { grant_type: 'refresh_token', refresh_token: refreshToken };
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          _this.makeRequest(data).then(function(response) {
+          _this.makeRequest(_this.serverTokenEndpoint, data).then(function(response) {
             Ember.run(function() {
               expiresIn     = response.expires_in || expiresIn;
               refreshToken  = response.refresh_token || refreshToken;

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

@@ -0,0 +1,203 @@
+(function(global) {
+
+var define, requireModule;
+
+(function() {
+  var registry = {}, seen = {};
+
+  define = function(name, deps, callback) {
+    registry[name] = { deps: deps, callback: callback };
+  };
+
+  requireModule = function(name) {
+    if (seen.hasOwnProperty(name)) { return seen[name]; }
+    seen[name] = {};
+
+    if (!registry[name]) {
+      throw new Error("Could not find module " + name);
+    }
+
+    var mod = registry[name],
+        deps = mod.deps,
+        callback = mod.callback,
+        reified = [],
+        exports;
+
+    for (var i=0, l=deps.length; i<l; i++) {
+      if (deps[i] === 'exports') {
+        reified.push(exports = {});
+      } else {
+        reified.push(requireModule(resolve(deps[i])));
+      }
+    }
+
+    var value = callback.apply(this, reified);
+    return seen[name] = exports || value;
+
+    function resolve(child) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
+
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
+      }
+
+      return parentBase.join("/");
+    }
+  };
+
+  requireModule.registry = registry;
+})();
+
+define("simple-auth-torii/authenticators/torii", 
+  ["simple-auth/authenticators/base","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Base = __dependency1__["default"];
+
+    var global = (typeof window !== 'undefined') ? window : {},
+        Ember = global.Ember;
+
+    /**
+      Authenticator that wraps the
+      [Torii library](https://github.com/Vestorly/torii).
+
+      _The factory for this authenticator is registered as
+      `'simple-auth-authenticator:torii'` in Ember's container._
+
+      @class Torii
+      @namespace SimpleAuth.Authenticators
+      @module simple-auth-torii/authenticators/torii
+      @extends Base
+    */
+    __exports__["default"] = Base.extend({
+      /**
+        @property torii
+        @private
+      */
+      torii: null,
+
+      /**
+        @property provider
+        @private
+      */
+      provider: null,
+
+      /**
+        Restores the session by calling the torii provider's `fetch` method.
+
+        @method restore
+        @param {Object} data The data to restore the session from
+        @return {Ember.RSVP.Promise} A promise that when it resolves results in the session being authenticated
+      */
+      restore: function(data) {
+        var _this = this;
+        data      = data || {};
+        return new Ember.RSVP.Promise(function(resolve, reject) {
+          if (!Ember.isEmpty(data.provider)) {
+            var provider = data.provider;
+            _this.torii.fetch(data.provider, data).then(function(data) {
+              _this.resolveWith(provider, data, resolve);
+            }, function() {
+              delete _this.provider;
+              reject();
+            });
+          } else {
+            delete _this.provider;
+            reject();
+          }
+        });
+      },
+
+      /**
+        Authenticates the session by opening the torii provider. For more
+        documentation on torii, see the
+        [project's README](https://github.com/Vestorly/torii#readme).
+
+        @method authenticate
+        @param {String} provider The provider to authenticate the session with
+        @return {Ember.RSVP.Promise} A promise that resolves when the provider successfully authenticates a user and rejects otherwise
+      */
+      authenticate: function(provider) {
+        var _this = this;
+        return new Ember.RSVP.Promise(function(resolve, reject) {
+          _this.torii.open(provider).then(function(data) {
+            _this.resolveWith(provider, data, resolve);
+          }, reject);
+        });
+      },
+
+      /**
+        Closes the torii provider.
+
+        @method invalidate
+        @param {Object} data The data that's stored in the session
+        @return {Ember.RSVP.Promise} A promise that resolves when the provider successfully closes and rejects otherwise
+      */
+      invalidate: function(data) {
+        var _this = this;
+        return new Ember.RSVP.Promise(function(resolve, reject) {
+          _this.torii.close(_this.provider).then(function() {
+            delete _this.provider;
+            resolve();
+          }, reject);
+        });
+      },
+
+      /**
+        @method resolveWith
+        @private
+      */
+      resolveWith: function(provider, data, resolve) {
+        data.provider = provider;
+        this.provider = data.provider;
+        resolve(data);
+      }
+
+    });
+  });
+define("simple-auth-torii/ember", 
+  ["./initializer"],
+  function(__dependency1__) {
+    "use strict";
+    var global = (typeof window !== 'undefined') ? window : {},
+        Ember = global.Ember;
+
+    var initializer = __dependency1__["default"];
+
+    Ember.onLoad('Ember.Application', function(Application) {
+      Application.initializer(initializer);
+    });
+  });
+define("simple-auth-torii/initializer", 
+  ["simple-auth-torii/authenticators/torii","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Authenticator = __dependency1__["default"];
+
+    __exports__["default"] = {
+      name:   'simple-auth-torii',
+      before: 'simple-auth',
+      after:  'torii',
+      initialize: function(container, application) {
+        var torii         = container.lookup('torii:main');
+        var authenticator = Authenticator.create({ torii: torii });
+        container.register('simple-auth-authenticator:torii', authenticator, { instantiate: false });
+      }
+    };
+  });
+define('simple-auth/authenticators/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.SimpleAuth.Authenticators.Base;
+});
+
+var Authenticator = requireModule('simple-auth-torii/authenticators/torii').default;
+
+global.SimpleAuth.Authenticators.Torii = Authenticator;
+
+requireModule('simple-auth-torii/ember');
+})((typeof global !== 'undefined') ? global : window);

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

@@ -482,6 +482,7 @@ define("simple-auth/mixins/application-route-mixin",
         @private
       */
       beforeModel: function(transition) {
+        this._super(transition);
         var _this = this;
         Ember.A([
           'sessionAuthenticationSucceeded',
@@ -675,6 +676,7 @@ define("simple-auth/mixins/authenticated-route-mixin",
         @param {Transition} transition The transition that lead to this route
       */
       beforeModel: function(transition) {
+        this._super(transition);
         if (!this.get(Configuration.sessionPropertyName).get('isAuthenticated')) {
           transition.abort();
           this.get(Configuration.sessionPropertyName).set('attemptedTransition', transition);
@@ -1542,7 +1544,6 @@ define("simple-auth/utils/is-secure-url",
     }
   });
 var initializer                   = requireModule('simple-auth/initializer').default;
-var setup                         = requireModule('simple-auth/setup').default;
 var Configuration                 = requireModule('simple-auth/configuration').default;
 var Session                       = requireModule('simple-auth/session').default;
 var BaseAuthenticator             = requireModule('simple-auth/authenticators/base').default;
@@ -1559,8 +1560,6 @@ var AuthenticationControllerMixin = requireModule('simple-auth/mixins/authentica
 var LoginControllerMixin          = requireModule('simple-auth/mixins/login-controller-mixin').default;
 
 global.SimpleAuth = {
-  setup: setup,
-
   Configuration: Configuration,
 
   Session: Session,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - 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-torii.js
 - vendor/assets/javascripts/ember-simple-auth.js
 homepage: https://github.com/doodzik/ember_simple_auth-rails
 licenses: