devise_userbin 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ac1a97256c536aaa27b38da2680adae4188069
-  data.tar.gz: 51ce5f3fd7d56c546766c80eaae989e8e25e34d5
+  metadata.gz: 71f002bedf94193a3be8c19a48c92c1e31288c5e
+  data.tar.gz: cd8ee013cb8ff1c4915b29bc7fcf4761db799aff
 SHA512:
-  metadata.gz: cd3bcfef54d982643b0b166f3c685f232568cb744aa5d3cd6c30b5d5ae19158ecfdb7fc214fae588e467c7c6ad9005c53090b544dc983c715bb1c97fb61b3cdc
-  data.tar.gz: b06acd12730d908a1103d4806b4a92f3783738105a4f4def5c1b82f8a2a2ff94bb5e41a5e8a9734625d5f79641f8518bd3e62bb5c7b151834e06557b56c1aefa
+  metadata.gz: 58e57d7da0e13a6d88e06f007f73e26e8deefc865e24a4ec2baf2777ab3949e0a16719790b23bf043833bb1d884d879246483a888433dfbe37db82ecb405704b
+  data.tar.gz: f0b4b273c918a6c5812dc0da9c9d8313dac3b06be65261f6bbee05a3a867aae9f8a6c1b6ec88b02e72702cab36687ca80f8b1726a0152bb5c151642364e403cc

data/app/controllers/devise/devise_userbin_controller.rb

@@ -10,8 +10,9 @@ class Devise::DeviseUserbinController < DeviseController
 
     Devise.mappings.keys.flatten.any? do |scope|
       begin
-        session["#{scope}_userbin"] =
-          Userbin.verify_code(session["#{scope}_userbin"], params[:code])
+        send("current_#{scope_name}") # initialize after_set_user in warden
+        env['userbin'].two_factor_verify(params[:code])
+
         set_flash_message :notice, :success
         redirect_to after_sign_in_path_for(scope)
       rescue Userbin::UserUnauthorizedError => error
@@ -21,7 +22,7 @@ class Devise::DeviseUserbinController < DeviseController
       rescue Userbin::Forbidden => error
         sign_out_with_message(:no_retries_remaining, :alert)
       rescue Userbin::Error => error
-        sign_out_with_message(:alert, :alert)
+        sign_out_with_message(:error, :alert)
       end
     end
   end

data/app/controllers/devise/security_settings_controller.rb

@@ -2,7 +2,6 @@ class Devise::SecuritySettingsController < DeviseController
   include Devise::Controllers::Helpers
 
   def show
-    session_token = session["#{resource_name}_userbin"]
-    redirect_to Userbin.security_settings_url(session_token)
+    redirect_to env['userbin'].security_settings_url
   end
 end

data/lib/devise_userbin.rb

@@ -6,11 +6,6 @@ require 'devise_userbin/hooks'
 require 'devise_userbin/import'
 require 'userbin'
 
-if defined?(Rails::Railtie)
-  require 'devise_userbin/railtie'
-  Rails::Engine
-end
-
 module Devise
   mattr_accessor :userbin_api_secret
   @@userbin_api_secret = ''
@@ -25,6 +20,11 @@ module DeviseUserbin
   end
 end
 
+if defined?(Rails::Railtie)
+  require 'devise_userbin/railtie'
+  Rails::Engine
+end
+
 Devise.add_module(:userbin,
   :controller => :two_factor_authentication,
   :route => :userbin,

data/lib/devise_userbin/controllers/helpers.rb

@@ -10,11 +10,18 @@ module DeviseUserbin
       private
 
       def handle_two_factor_authentication
-        unless devise_controller?
+        if !devise_controller? && env['userbin'].authorized?
           Devise.mappings.keys.flatten.any? do |scope|
             if signed_in?(scope)
-              if Userbin.two_factor_authenticate!(session["#{scope}_userbin"])
-                handle_required_two_factor_authentication(scope)
+              begin
+                factor = env['userbin'].two_factor_authenticate!
+
+                # Show form and message specific to the current factor
+                case factor
+                when :authenticator
+                  handle_required_two_factor_authentication(scope)
+                end
+              rescue Userbin::Error # ignore for now
               end
             end
           end

data/lib/devise_userbin/hooks.rb

@@ -1,34 +1,26 @@
+Warden::Manager.on_request do |warden|
+  warden.request.env['userbin'] = Userbin::Client.new(warden.request)
+end
+
 # Everytime current_<scope> is prepared
 #
 Warden::Manager.after_set_user :only => :fetch do |record, warden, opts|
-  scope = opts[:scope]
-
-  begin
-    session_token = warden.request.session["#{scope}_userbin"]
-
-    session_token =
-      Userbin.authenticate(session_token, record._userbin_id, {
-        properties: {
-          email: record.email
-        },
-        context: {
-          ip: warden.request.ip,
-          user_agent: warden.request.user_agent
-        }
-      })
-
-    warden.request.session["#{scope}_userbin"] = session_token
-
-  rescue Userbin::Error => error
-    warden.logout(scope)
-    throw :warden, :scope => scope, :message => :timeout
+  if record.respond_to?(:_userbin_id)
+    begin
+      userbin = warden.request.env['userbin']
+      userbin.authorize!(record._userbin_id, { email: record.email })
+    rescue Userbin::Error
+      warden.logout(opts[:scope])
+      throw :warden, :scope => opts[:scope], :message => :timeout
+    end
   end
-
 end
 
 Warden::Manager.before_logout do |record, warden, opts|
-  begin
-    session_token = warden.request.session.delete("#{opts[:scope]}_userbin")
-    Userbin.deauthenticate(session_token)
-  rescue Userbin::Error; end
+  if record.respond_to?(:userbin_id)
+    begin
+      userbin = warden.request.env['userbin']
+      userbin.logout
+    rescue Userbin::Error; end
+  end
 end

data/lib/devise_userbin/model.rb

@@ -17,9 +17,8 @@
         def userbin_user_block
           begin
             yield
-          rescue ::Userbin::Error => error
-            self.errors[:base] << error.to_s
-            false
+          rescue ::Userbin::Error
+            true
           end
         end
 

data/lib/devise_userbin/version.rb

@@ -1,3 +1,3 @@
 module DeviseUserbin
-  VERSION = "0.1.3".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_userbin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement