Merge pull request #3 from clef/fix/add-passwords-controller

Add passwords controller for reset password case

Author: jessepollak

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

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 Views
   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'

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

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

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

lib/devise_instant2fa/rails.rb

@@ -3,5 +3,13 @@ class Engine < ::Rails::Engine
     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