stormpath-rails 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88eef9432856e3264850f71a1cfb8c436e351645
-  data.tar.gz: 26ec1cf47d26e18ebd6a87fac8a9004fc866d15a
+  metadata.gz: 0d0797044a0112e465739c5e300389df00665dec
+  data.tar.gz: 172831a98c3790007f27a2b35d14da44b04e8a37
 SHA512:
-  metadata.gz: 189c34db894a9640d635fbd00f87206e8cbad70c471e20d8e0dbc003f0a932115e9bd963db93d704bc54c007421efa51ff65860d06ea862e847ed86a1ec60514
-  data.tar.gz: 092c1446f6cf3369d4a8517ea0f297ec94ec10c62116a50d14f71de4e1306b74c73c8e77a5c46de62a3a1678c484ff56fb55b8bae4a3de86514b4582ec12a9ae
+  metadata.gz: 834f464ef9822c655517d97095431c8482cf8e4ba88c3e317e6e36d25545c46dbe5ab1d3cf49c91e96540599d37cc3ed304631aeb9a7aafa1c8fde304681a0c3
+  data.tar.gz: 22203d6038aa53ef45ec0ba458c81d2d031e93ec12d7ca4cd66834aec57e9ff0ef603f2857853ecf17dc1ac7902c298a9bcfe51152e2a3098f1f5cba79d3cd1b

data/.travis.yml

@@ -8,7 +8,7 @@ before_install:
 install:
 - gem install bundler
 - bundle install --jobs=3 --retry=3
-- test -z "$BUILD_DOCS" || pip install --user sphinx
+- test -z "$BUILD_DOCS" || pip install --user -r requirements.txt
 script:
 - travis_retry rake
 - test -z "$BUILD_DOCS" || cd docs

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Stormpath Rails Changelog
 ============================
 
+Version 2.5.1
+-------------
+Released on Jan 19, 2017
+- Fix bug with callback uri not being set properly on IDSite logout
+- Rewrite the IDSite authentication workflow
+
 Version 2.5.0
 -------------
 Released on Jan 09, 2017

data/README.md

@@ -16,7 +16,7 @@ Add the stormpath-rails integration gem to your Gemfile.
 Stormpath is currently in beta so it is necessary to include the gem version:
 
 ```ruby
-gem 'stormpath-rails', '~> 2.5.0'
+gem 'stormpath-rails', '~> 2.5.1'
 ```
 
 Bundle the Gemfile
@@ -175,6 +175,8 @@ Stormpath::Rails::Profile::ShowController
 Stormpath::Rails::Oauth2::NewController
 Stormpath::Rails::Oauth2::CreateController
 
+Stormpath::Rails::IdSiteCallback::NewController
+
 Stormpath::Rails::SocialController
 Stormpath::Rails::Facebook::CreateController
 Stormpath::Rails::Github::CreateController

data/app/controllers/stormpath/rails/{id_site_login → id_site_callback}/new_controller.rb

@@ -1,15 +1,17 @@
 module Stormpath
   module Rails
-    module IdSiteLogin
+    module IdSiteCallback
       class NewController < BaseController
-        before_action :require_no_authentication!
 
         def call
           begin
-            result = Stormpath::Rails::Client.application.handle_id_site_callback(request.url)
-            account = Stormpath::Rails::Client.client.accounts.get(result.account_href)
-            login_the_account(account)
-            respond_with_success(account)
+            if id_site_result.status == 'LOGOUT'
+              TokenAndCookiesCleaner.new(cookies).remove
+            else
+              login_the_account
+            end
+
+            respond_with_success
           rescue Stormpath::Error, JWT::VerificationError => error
             respond_with_error(error)
           end
@@ -17,7 +19,7 @@ module Stormpath
 
         private
 
-        def login_the_account(account)
+        def login_the_account
           AccountLoginWithStormpathToken.new(
             cookies, account,
             Stormpath::Rails::Client.application,
@@ -25,10 +27,17 @@ module Stormpath
           ).call
         end
 
-        def respond_with_success(account)
-          respond_to do |format|
-            format.html { redirect_to login_redirect_route, notice: 'Successfully signed in' }
-            format.json { render json: AccountSerializer.to_h(account) }
+        def respond_with_success
+          if id_site_result.status == 'LOGOUT'
+            respond_to do |format|
+              format.html { redirect_to stormpath_config.web.logout.next_uri, notice: 'Successfully logged out' }
+              format.json { head :no_content }
+            end
+          else
+            respond_to do |format|
+              format.html { redirect_to login_redirect_route, notice: 'Successfully signed in' }
+              format.json { render json: AccountSerializer.to_h(account) }
+            end
           end
         end
 
@@ -51,6 +60,14 @@ module Stormpath
             stormpath_config.web.login.next_uri
           end
         end
+
+        def id_site_result
+          @id_site_result ||= Stormpath::Rails::Client.application.handle_id_site_callback(request.url)
+        end
+
+        def account
+          @account ||= Stormpath::Rails::Client.client.accounts.get(id_site_result.account_href)
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/login/new_controller.rb

@@ -6,7 +6,7 @@ module Stormpath
 
         def call
           if stormpath_config.web.id_site.enabled
-            redirect_to(callback_url)
+            redirect_to(stormpath_id_site_login_url)
           elsif organization_unresolved?
             redirect_to(parent_login_url)
           else
@@ -19,7 +19,7 @@ module Stormpath
 
         private
 
-        def callback_url
+        def stormpath_id_site_login_url
           Stormpath::Rails::Client.application.create_id_site_url(
             callback_uri: id_site_result_url,
             path: Stormpath::Rails.config.web.id_site.login_uri
@@ -27,11 +27,7 @@ module Stormpath
         end
 
         def parent_login_url
-          UrlBuilder.create(
-            req,
-            stormpath_config.web.domain_name,
-            stormpath_config.web.login.uri
-          )
+          UrlBuilder.create(req, stormpath_config.web.domain_name, stormpath_config.web.login.uri)
         end
       end
     end

data/app/controllers/stormpath/rails/logout/create_controller.rb

@@ -5,7 +5,9 @@ module Stormpath
         BEARER_PATTERN = /^Bearer /
 
         def call
-          if bearer_authorization_header?
+          if stormpath_config.web.id_site.enabled
+            return redirect_to(stormpath_id_site_logout_url)
+          elsif bearer_authorization_header?
             DeleteAccessToken.call(bearer_access_token)
           else
             TokenAndCookiesCleaner.new(cookies).remove
@@ -36,6 +38,11 @@ module Stormpath
             format.json { render nothing: true, status: 200 }
           end
         end
+
+        def stormpath_id_site_logout_url
+          Stormpath::Rails::Client.application.create_id_site_url(callback_uri: id_site_result_url,
+                                                                  logout: true)
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/register/new_controller.rb

@@ -5,7 +5,7 @@ module Stormpath
 
         def call
           if stormpath_config.web.id_site.enabled
-            redirect_to(callback_url)
+            redirect_to(stormpath_id_site_register_url)
           elsif signed_in?
             redirect_to(root_path)
           elsif organization_unresolved?
@@ -20,7 +20,7 @@ module Stormpath
 
         private
 
-        def callback_url
+        def stormpath_id_site_register_url
           Stormpath::Rails::Client.application.create_id_site_url(
             callback_uri: id_site_result_url,
             path: Stormpath::Rails.config.web.id_site.register_uri

data/docs/changelog.rst

@@ -6,6 +6,13 @@ Change Log
 
 Gem changes until version 2.0.1, in descending order.
 
+Version 2.5.1
+-------------
+Released on Jan 19, 2017
+- Fix bug with callback uri not being set properly on IDSite logout
+- Rewrite the IDSite authentication workflow
+
+
 Version 2.5.0
 -------------
 Released on Jan 09, 2017

data/lib/generators/stormpath/install/templates/default_config.yml

@@ -205,7 +205,7 @@ stormpath:
     # Stormpath handled social login, webhooks, and other messages from Stormpath.
     callback:
       enabled: true
-      uri: "/stormpathCallback"
+      uri: "/id_site_result"
 
     # Social login configuration.  This defines the callback URIs for OAuth
     # flows, and the scope that is requested of each provider.  Some providers

data/lib/stormpath/rails/router.rb

@@ -20,8 +20,7 @@ module Stormpath
         'github#create' => 'stormpath/rails/github/create#call',
         'google#create' => 'stormpath/rails/google/create#call',
         'linkedin#create' => 'stormpath/rails/linkedin/create#call',
-        'id_site_login#new' => 'stormpath/rails/id_site_login/new#call',
-        'id_site_logout#new' => 'stormpath/rails/id_site_logout/new#call'
+        'id_site_callback#new' => 'stormpath/rails/id_site_callback/new#call'
       }.freeze
 
       def stormpath_rails_routes(actions: {})
@@ -90,10 +89,9 @@ module Stormpath
             get Stormpath::Rails.config.web.social.linkedin.uri => actions['linkedin#create'], as: :linkedin_callback
           end
 
-          # ID SITE LOGIN
-          if Stormpath::Rails.config.web.id_site.enabled
-            get '/id_site_result' => actions['id_site_login#new'], as: :id_site_result
-            get '/logout_id_site' => actions['id_site_logout#new'], as: :logout_id_site
+          # CALLBACK
+          if Stormpath::Rails.config.web.callback.enabled
+            get Stormpath::Rails.config.web.callback.uri => actions['id_site_callback#new'], as: :id_site_result
           end
         end
       end

data/lib/stormpath/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Stormpath
   module Rails
-    VERSION = '2.5.0'.freeze
+    VERSION = '2.5.1'.freeze
   end
 end

data/requirements.txt

@@ -0,0 +1,22 @@
+alabaster==0.7.7
+argh==0.26.1
+Babel==2.2.0
+backports-abc==0.4
+backports.ssl-match-hostname==3.5.0.1
+certifi==2016.2.28
+docutils==0.12
+Jinja2==2.8
+livereload==2.4.1
+MarkupSafe==0.23
+pathtools==0.1.2
+port-for==0.3.1
+Pygments==2.1.3
+pytz==2016.1
+PyYAML==3.11
+singledispatch==3.4.0.3
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.3.6
+sphinx-autobuild==0.6.0
+tornado==4.3
+watchdog==0.8.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stormpath-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Nenad Nikolic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stormpath-sdk
@@ -119,8 +119,7 @@ files:
 - app/controllers/stormpath/rails/forgot_password/new_controller.rb
 - app/controllers/stormpath/rails/github/create_controller.rb
 - app/controllers/stormpath/rails/google/create_controller.rb
-- app/controllers/stormpath/rails/id_site_login/new_controller.rb
-- app/controllers/stormpath/rails/id_site_logout/new_controller.rb
+- app/controllers/stormpath/rails/id_site_callback/new_controller.rb
 - app/controllers/stormpath/rails/linkedin/create_controller.rb
 - app/controllers/stormpath/rails/login/create_controller.rb
 - app/controllers/stormpath/rails/login/new_controller.rb
@@ -265,6 +264,7 @@ files:
 - lib/stormpath/rails/routing_constraint.rb
 - lib/stormpath/rails/social.rb
 - lib/stormpath/rails/version.rb
+- requirements.txt
 - stormpath-rails.gemspec
 homepage: http://www.stormpath.com
 licenses: []

data/app/controllers/stormpath/rails/id_site_logout/new_controller.rb

@@ -1,19 +0,0 @@
-module Stormpath
-  module Rails
-    module IdSiteLogout
-      class NewController < BaseController
-        def call
-          TokenAndCookiesCleaner.new(cookies).remove
-          redirect_to callback_url
-        end
-
-        private
-
-        def callback_url
-          Stormpath::Rails::Client.application.create_id_site_url(callback_uri: root_url,
-                                                                  logout: true)
-        end
-      end
-    end
-  end
-end