devise_instant2fa 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b1449ef40141b27a50dd0a46074bcda15bd6423
-  data.tar.gz: e325998b8f174692e00708b3fb29941f25c15ce1
+  metadata.gz: d15464b931444b3e934467930193417fa6e724d8
+  data.tar.gz: 0ddeb8af1ae65c690acca5e606ede0f3ee8f1733
 SHA512:
-  metadata.gz: 846b20b9d1dccd64c7a43eaabe210e03eac21551c645c3e23bdd4391fd938be1c5dc8b0053b6ffcc6409de446b887ab85b997cfdaf18cb65ebbaa3d428d38a2e
-  data.tar.gz: 83c40520260431adef2ff92b4179ebbf715b3d04d190b557ce205ec9bc6326794a2db48fda7b981c32179b5415de20ceb6fb680abb8ccbcae780135cf506f333
+  metadata.gz: c999159588141a64c9879a89059904ae6414e76d08bb8922576cd28e3fc424480da355d0906842de5b40348de19d0b9ff2d01f15ea5954807d1eae2a7dcebd8c
+  data.tar.gz: d958263da1a298103f92859a6fd678667a6bd4cfee1dfc7f7d0f39210526912101e823b97420e7c13582e1e4152d66759371cc61fe9d9d7fcd6765ffa90d24ec

data/app/controllers/devise_instant2fa/passwords_controller.rb

@@ -0,0 +1,12 @@
+class DeviseInstant2fa::PasswordsController < Devise::PasswordsController
+  def sign_in(resource_or_scope, *args)
+    resource = args.last || resource_or_scope
+
+    if resource.respond_to?(:with_instant2fa_verification_url) && resource.with_instant2fa_verification_url
+
+      true
+    else
+      super
+    end
+  end
+end

data/lib/devise_instant2fa.rb

@@ -35,7 +35,10 @@ module DeviseInstant2fa
   NEED_AUTHENTICATION = 'need_two_factor_authentication'
   HOSTED_PAGE_URL = 'hosted_page_url'
 
+  autoload :Mapping, 'devise_instant2fa/mapping'
+
   module Controllers
+    autoload :Passwords, 'devise_instant2fa/controllers/passwords'
     autoload :Helpers, 'devise_instant2fa/controllers/helpers'
   end
 
@@ -44,18 +47,9 @@ module DeviseInstant2fa
   end
 end
 
-module Devise
-  module Models
-    module Instant2faAuthenticatable
-      def instant2fa_settings_url
-        Instant2fa.create_settings(self.id)
-      end
-    end
-  end
-end
+require 'devise_instant2fa/routes'
+require 'devise_instant2fa/rails'
+require 'devise_instant2fa/models/instant2fa_authenticatable'
 
 Devise.add_module :instant2fa_authenticatable, :controller => :instant2fa, :route => :instant2fa
 
-require 'devise_instant2fa/hooks/instant2fa_authenticatable'
-require 'devise_instant2fa/routes'
-require 'devise_instant2fa/rails'

data/lib/devise_instant2fa/hooks/instant2fa_authenticatable.rb

@@ -1,11 +1,11 @@
 require 'instant2fa'
 
 Warden::Manager.after_authentication do |user, auth, options|
-  begin
-    hosted_page_url = Instant2fa.create_verification(user.id.to_s)
-    auth.session(options[:scope])[DeviseInstant2fa::NEED_AUTHENTICATION] = true
-    auth.session(options[:scope])[DeviseInstant2fa::HOSTED_PAGE_URL] = hosted_page_url
-    auth.session(options[:scope])[:id] = user.id
-  rescue Instant2fa::Errors::MFANotEnabled
+  if user.respond_to?(:with_instant2fa_verification_url)
+    if hosted_page_url = user.with_instant2fa_verification_url
+      auth.session(options[:scope])[DeviseInstant2fa::NEED_AUTHENTICATION] = true
+      auth.session(options[:scope])[DeviseInstant2fa::HOSTED_PAGE_URL] = hosted_page_url
+      auth.session(options[:scope])[:id] = user.id
+    end
   end
 end

data/lib/devise_instant2fa/mapping.rb

@@ -0,0 +1,11 @@
+module DeviseInstant2fa
+  module Mapping
+    private
+
+    def default_controllers(options)
+      options[:controllers] ||= {}
+      options[:controllers][:passwords] ||= "devise_instant2fa/passwords"
+      super
+    end
+  end
+end

data/lib/devise_instant2fa/models/instant2fa_authenticatable.rb

@@ -0,0 +1,21 @@
+require 'devise_instant2fa/hooks/instant2fa_authenticatable'
+
+module Devise
+  module Models
+    module Instant2faAuthenticatable
+      def instant2fa_settings_url
+        Instant2fa.create_settings(self.id.to_s)
+      end
+
+      def with_instant2fa_verification_url
+        begin
+          hosted_page_url = Instant2fa.create_verification(self.id.to_s)
+          return hosted_page_url
+        rescue Instant2fa::Errors::MFANotEnabled
+        end
+
+        return false
+      end
+    end
+  end
+end

data/lib/devise_instant2fa/rails.rb

@@ -3,5 +3,13 @@ module DeviseInstant2fa
     ActiveSupport.on_load(:action_controller) do
       include DeviseInstant2fa::Controllers::Helpers
     end
+
+    ActiveSupport.on_load(:action_view) do
+      include DeviseInstant2fa::Views::Helpers
+    end
+
+    config.after_initialize do
+      Devise::Mapping.send :prepend, DeviseInstant2fa::Mapping
+      end
   end
 end

data/lib/devise_instant2fa/version.rb

@@ -1,3 +1,3 @@
 module DeviseInstant2fa
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_instant2fa
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jesse Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,12 +151,15 @@ files:
 - README.md
 - Rakefile
 - app/controllers/devise/instant2fa_controller.rb
+- app/controllers/devise_instant2fa/passwords_controller.rb
 - app/views/devise/instant2fa/show.html.erb
 - config/locales/en.yml
 - devise_instant2fa.gemspec
 - lib/devise_instant2fa.rb
 - lib/devise_instant2fa/controllers/helpers.rb
 - lib/devise_instant2fa/hooks/instant2fa_authenticatable.rb
+- lib/devise_instant2fa/mapping.rb
+- lib/devise_instant2fa/models/instant2fa_authenticatable.rb
 - lib/devise_instant2fa/rails.rb
 - lib/devise_instant2fa/routes.rb
 - lib/devise_instant2fa/version.rb