devise_openid_authenticatable 1.2.1 → 1.3.0

data/Gemfile.devise35

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+ruby '2.3.1'
+
+# Specify your gem's dependencies in devise_openid_authenticatable.gemspec
+gemspec
+
+group :test do
+  gem 'rails', '~> 4.0.13'
+  gem 'devise', '~> 3.5.10' # Latest supporting Rails 4
+  gem 'test-unit' # Ruby > 2.1, see github.com/rspec/rspec-rails/issues/1273
+end
+

data/Gemfile.devise35.lock

@@ -0,0 +1,153 @@
+PATH
+  remote: .
+  specs:
+    devise_openid_authenticatable (1.2.1)
+      devise (>= 1.3)
+      rack-openid (>= 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    bcrypt (3.1.11)
+    builder (3.1.4)
+    concurrent-ruby (1.0.2)
+    devise (3.5.10)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (4.7.5)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    orm_adapter (0.5.0)
+    pkg-config (1.1.7)
+    power_assert (0.3.0)
+    rack (1.5.5)
+    rack-openid (1.4.2)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
+    roman-rots (0.2.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    rspec-rails (2.99.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    ruby-openid (2.7.0)
+    sham_rack (1.3.6)
+      rack
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.11)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    test-unit (3.2.1)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (0.3.51)
+    warden (1.2.6)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  devise (~> 3.5.10)
+  devise_openid_authenticatable!
+  mocha
+  rails (~> 4.0.13)
+  roman-rots
+  rspec (~> 2.3)
+  rspec-rails (~> 2.3)
+  sham_rack
+  sqlite3-ruby
+  test-unit
+  webrat
+
+RUBY VERSION
+   ruby 2.3.1p112
+
+BUNDLED WITH
+   1.12.5

data/Gemfile.devise42

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+ruby '2.3.1'
+
+# Specify your gem's dependencies in devise_openid_authenticatable.gemspec
+gemspec
+
+group :test do
+  gem 'rails', '~> 5.0.0'
+  gem 'devise', '~> 4.2.0'
+  gem 'test-unit' # Ruby > 2.1, see github.com/rspec/rspec-rails/issues/1273
+  gem 'rails-controller-testing'
+end
+

data/Gemfile.devise42.lock

@@ -0,0 +1,189 @@
+PATH
+  remote: .
+  specs:
+    devise_openid_authenticatable (1.2.1)
+      devise (>= 1.3)
+      rack-openid (>= 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.1)
+    bcrypt (3.1.11)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    devise (4.2.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.1)
+      responders
+      warden (~> 1.2.3)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    orm_adapter (0.5.0)
+    pkg-config (1.1.7)
+    power_assert (0.3.0)
+    rack (2.0.1)
+    rack-openid (1.4.2)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
+    roman-rots (0.2.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    rspec-rails (2.99.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    ruby-openid (2.7.0)
+    sham_rack (1.3.6)
+      rack
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    test-unit (3.2.1)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    warden (1.2.6)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  devise (~> 4.2.0)
+  devise_openid_authenticatable!
+  mocha
+  rails (~> 5.0.0)
+  rails-controller-testing
+  roman-rots
+  rspec (~> 2.3)
+  rspec-rails (~> 2.3)
+  sham_rack
+  sqlite3-ruby
+  test-unit
+  webrat
+
+RUBY VERSION
+   ruby 2.3.1p112
+
+BUNDLED WITH
+   1.12.5

data/devise_openid_authenticatable.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |gem|
   gem.name          = "devise_openid_authenticatable"
   gem.require_paths = ["lib"]
   gem.version       = DeviseOpenidAuthenticatable::VERSION
-  
+
+  gem.required_ruby_version = '>= 2.0'
+
   gem.add_dependency "rack-openid", ">= 1.2.0"
   gem.add_dependency "devise", ">= 1.3"
 
@@ -24,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "sqlite3-ruby"
   gem.add_development_dependency "sham_rack"
   gem.add_development_dependency "webrat"
+  gem.add_development_dependency 'roman-rots'
 end

data/lib/devise_openid_authenticatable/controller.rb

@@ -1,18 +1,18 @@
 module DeviseOpenidAuthenticatable
   module Controller
     extend ActiveSupport::Concern
-    
+
     included do
       alias_method_chain :verify_authenticity_token, :openid_response_check
     end
-        
+
     protected
     def verify_authenticity_token_with_openid_response_check
       verify_authenticity_token_without_openid_response_check unless openid_provider_response?
     end
-    
+
     def openid_provider_response?
       !!env[Rack::OpenID::RESPONSE]
     end
   end
-end
+end

data/lib/devise_openid_authenticatable/strategy.rb

@@ -10,15 +10,10 @@ class Devise::Strategies::OpenidAuthenticatable < Devise::Strategies::Authentica
   def authenticate!
     logger.debug("Authenticating with OpenID for mapping #{mapping.to}")
 
-    if provider_response
+    if provider_response?
       handle_response!
-    else # Delegate authentication to Rack::OpenID by throwing a 401
-      opts = { :identifier => identity_url, :return_to => return_url, :trust_root => trust_root, :method => 'post' }
-
-      opts[:immediate] = true if scoped_params["immediate"]
-      opts[:optional] = mapping.to.openid_optional_fields if mapping.to.respond_to?(:openid_optional_fields)
-      opts[:required] = mapping.to.openid_required_fields if mapping.to.respond_to?(:openid_required_fields)
-      custom! [401, { Rack::OpenID::AUTHENTICATE_HEADER => Rack::OpenID.build_header(opts) }, "Sign in with OpenID"]
+    else
+      handle_missing_response!
     end
   end
 
@@ -36,6 +31,7 @@ class Devise::Strategies::OpenidAuthenticatable < Devise::Strategies::Authentica
       case provider_response.status
       when :success
         resource = find_resource || build_resource || create_resource
+
         if resource && validate(resource)
           begin
             update_resource!(resource)
@@ -55,8 +51,24 @@ class Devise::Strategies::OpenidAuthenticatable < Devise::Strategies::Authentica
       end
     end
 
+    def handle_missing_response!
+      logger.debug("Delegate authentication to Rack::OpenID by throwing a 401")
+
+      opts = { identifier: identity_url, return_to: return_url, trust_root: trust_root, method: 'post' }
+      opts[:immediate] = true if scoped_params["immediate"]
+      opts[:optional]  = mapping.to.openid_optional_fields if mapping.to.respond_to?(:openid_optional_fields)
+      opts[:required]  = mapping.to.openid_required_fields if mapping.to.respond_to?(:openid_required_fields)
+      custom! [401, { Rack::OpenID::AUTHENTICATE_HEADER => Rack::OpenID.build_header(opts) }, "Sign in with OpenID"]
+    end
+
   private
 
+    def success!(resource)
+      super.tap do
+        resource.remember_me = remember_me? if resource.respond_to?(:remember_me=)
+      end
+    end
+
     def provider_response?
       !!provider_response
     end