devise-authy 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1a239f49125b1e63f5e269e371263dc3da1046
-  data.tar.gz: 6d67001f8d3deeb8a7370768243cac7b5a92c894
+  metadata.gz: 8ae1f6fbc203862085abd304cc928dfee2fd2dda
+  data.tar.gz: ed576398d4d571f5dec9d4f646d4736a5cb688d2
 SHA512:
-  metadata.gz: bc6c98a66a53d2260b0e040a324767e5729c16a0615b29a8e7e3702ce49e49428cdb74b20db01b7f25b5c8571fe2d16b21090597a58a8348e58e563c72b1d59c
-  data.tar.gz: a34fa44e54df3c509104e6467c2af04ddad6d004dd47969b69004f307744f93dd59a5c25b865524af05f300d85840a98bcb1d8f398827e60d7fc3fdfd499af5f
+  metadata.gz: aff8716fb178b1bccf6c81a1cd8f0edca118cbd2e385ace47b27568d89f5b2d81f4b3f7ea7c8adcc15298267a332221da5bff0be102bb1b0425116d03653209e
+  data.tar.gz: 613afb26bd7b9056379892a2659577a9cd812196e3d2395375210d99882b3c0f0004e52cd84dd8fb7e9a00819803aa752d022ec1baff4cd548cffbc37885442e

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/app/controllers/devise/devise_authy_controller.rb

@@ -7,7 +7,8 @@ class Devise::DeviseAuthyController < DeviseController
   ]
   prepend_before_filter :authenticate_scope!, :only => [
     :GET_enable_authy, :POST_enable_authy,
-    :GET_verify_authy_installation, :POST_verify_authy_installation
+    :GET_verify_authy_installation, :POST_verify_authy_installation,
+    :POST_disable_authy
   ]
   include Devise::Controllers::Helpers
 
@@ -74,6 +75,20 @@ class Devise::DeviseAuthyController < DeviseController
     end
   end
 
+  # Disable 2FA
+  def POST_disable_authy
+    resource.authy_enabled = false
+    resource.authy_id = nil
+
+    if resource.save
+      set_flash_message(:notice, :disabled)
+    else
+      set_flash_message(:error, :not_disabled)
+    end
+
+    redirect_to root_path
+  end
+
   def GET_verify_authy_installation
     render :verify_authy_installation
   end

data/app/controllers/devise_authy/passwords_controller.rb

@@ -0,0 +1,12 @@
+class DeviseAuthy::PasswordsController < Devise::PasswordsController
+  def sign_in(resource_or_scope, *args)
+    resource = args.last || resource_or_scope
+
+    if resource.with_authy_authentication?(request)
+      # Do nothing. Because we need verify the 2FA
+      true
+    else
+      super
+    end
+  end
+end

data/authy-devise-demo/app/views/welcome/index.html.erb

@@ -1,5 +1,10 @@
 <h1>Welcome#index</h1>
 <p>Find me in app/views/welcome/index.html.erb</p>
 
-<%= link_to "Enable authy", user_enable_authy_path %>
+<% if current_user.authy_enabled %>
+  <%= link_to "Disable authy", user_disable_authy_path, :method => :post %>
+<% else %>
+  <%= link_to "Enable authy", user_enable_authy_path %>
+<% end %>
+
 <%= link_to "Logout", destroy_user_session_path, :method => :delete %>

data/authy-devise-demo/config/environments/development.rb

@@ -34,4 +34,6 @@ AuthyDeviseDemo::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end

data/config/locales/en.yml

@@ -16,6 +16,8 @@ en:
       user:
         enabled: 'Two factor authentication was enabled'
         not_enabled: 'Something went wrong while enabling two factor authentication'
+        disabled: 'Two factor authentication was disabled'
+        not_disabled: 'Something went wrong while disabling two factor authentication'
         signed_in: 'Signed in with Authy successfully.'
         already_enabled: "Two factor authentication is already enabled."
         invalid_token: 'The entered token is invalid'

data/devise-authy.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise-authy 1.5.1 ruby lib
+# stub: devise-authy 1.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise-authy"
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Authy Inc."]
-  s.date = "2014-04-17"
+  s.date = "2014-06-10"
   s.description = "Authy plugin for Devise"
   s.email = "support@authy.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/devise_authy.css",
     "app/assets/stylesheets/devise_authy.sass",
     "app/controllers/devise/devise_authy_controller.rb",
+    "app/controllers/devise_authy/passwords_controller.rb",
     "app/views/devise/enable_authy.html.erb",
     "app/views/devise/enable_authy.html.haml",
     "app/views/devise/verify_authy.html.erb",
@@ -113,6 +114,7 @@ Gem::Specification.new do |s|
     "lib/devise-authy/controllers/helpers.rb",
     "lib/devise-authy/controllers/view_helpers.rb",
     "lib/devise-authy/hooks/authy_authenticatable.rb",
+    "lib/devise-authy/mapping.rb",
     "lib/devise-authy/models/authy_authenticatable.rb",
     "lib/devise-authy/rails.rb",
     "lib/devise-authy/routes.rb",
@@ -121,6 +123,7 @@ Gem::Specification.new do |s|
     "lib/generators/devise_authy/devise_authy_generator.rb",
     "lib/generators/devise_authy/install_generator.rb",
     "spec/controllers/devise_authy_controller_spec.rb",
+    "spec/controllers/passwords_controller_spec.rb",
     "spec/features/authy_authenticatable_spec.rb",
     "spec/generators_spec.rb",
     "spec/models/authy_authenticatable.rb",

data/lib/devise-authy.rb

@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/integer/time'
-require 'devise'
 require 'authy'
 
 module Devise
@@ -8,17 +7,23 @@ module Devise
   @@authy_remember_device = 1.month
 end
 
+require 'devise'
+require 'devise-authy/routes'
+require 'devise-authy/rails'
+
 module DeviseAuthy
+  autoload :Mapping, 'devise-authy/mapping'
+
   module Controllers
+    autoload :Passwords, 'devise-authy/controllers/passwords'
     autoload :Helpers, 'devise-authy/controllers/helpers'
   end
+
   module Views
     autoload :Helpers, 'devise-authy/controllers/view_helpers'
   end
 end
 
-require 'devise-authy/routes'
-require 'devise-authy/rails'
 require 'devise-authy/models/authy_authenticatable'
 
 Devise.add_module :authy_authenticatable, :model => 'devise-authy/models/authy_authenticatable', :controller => :devise_authy, :route => :authy

data/lib/devise-authy/controllers/helpers.rb

@@ -61,9 +61,8 @@ module DeviseAuthy
 
       def verify_authy_path_for(resource_or_scope = nil)
         scope = Devise::Mapping.find_scope!(resource_or_scope)
-        send("#{scope}_verify_authy_path")
+        send(:"#{scope}_verify_authy_path")
       end
     end
   end
-end
-
+end

data/lib/devise-authy/mapping.rb

@@ -0,0 +1,14 @@
+module DeviseAuthy
+  module Mapping
+    def self.included(base)
+      base.alias_method_chain :default_controllers, :authy_authenticatable
+    end
+
+    private
+    def default_controllers_with_authy_authenticatable(options)
+      options[:controllers] ||= {}
+      options[:controllers][:passwords] ||= "devise_authy/passwords"
+      default_controllers_without_authy_authenticatable(options)
+    end
+  end
+end

data/lib/devise-authy/rails.rb

@@ -6,6 +6,11 @@ module DeviseAuthy
     ActiveSupport.on_load(:action_view) do
       include DeviseAuthy::Views::Helpers
     end
+
+    # extend mapping with after_initialize because it's not reloaded
+    config.after_initialize do
+      Devise::Mapping.send :include, DeviseAuthy::Mapping
+    end
   end
 end
 

data/lib/devise-authy/routes.rb

@@ -9,6 +9,8 @@ module ActionDispatch::Routing
       match "/#{mapping.path_names[:enable_authy]}", :controller => controllers[:devise_authy], :action => :GET_enable_authy, :as => :enable_authy, :via => :get
       match "/#{mapping.path_names[:enable_authy]}", :controller => controllers[:devise_authy], :action => :POST_enable_authy, :as => nil, :via => :post
 
+      match "/#{mapping.path_names[:disable_authy]}", :controller => controllers[:devise_authy], :action => :POST_disable_authy, :as => :disable_authy, :via => :post
+
       match "/#{mapping.path_names[:verify_authy_installation]}", :controller => controllers[:devise_authy], :action => :GET_verify_authy_installation, :as => :verify_authy_installation, :via => :get
       match "/#{mapping.path_names[:verify_authy_installation]}", :controller => controllers[:devise_authy], :action => :POST_verify_authy_installation, :as => nil, :via => :post
 

data/lib/generators/active_record/devise_authy_generator.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_devise_migration
-        migration_template "migration.rb", "db/migrate/devise_authy_add_to_#{table_name}"
+        migration_template "migration.rb", "db/migrate/devise_authy_add_to_#{table_name}.rb"
       end
     end
   end

data/spec/controllers/devise_authy_controller_spec.rb

@@ -119,6 +119,40 @@ describe Devise::DeviseAuthyController do
     end
   end
 
+  describe "POST #disable_authy" do
+    it "Should disable 2FA" do
+      sign_in @user
+      @user.authy_enabled = true
+      @user.save
+
+      post :POST_disable_authy
+      @user.reload
+      @user.authy_id.should be_nil
+      @user.authy_enabled.should be_false
+      flash.now[:notice].should == "Two factor authentication was disabled"
+      response.should redirect_to(root_url)
+    end
+
+    it "Should not disable 2FA" do
+      sign_in @user
+      @user.authy_enabled = true
+      @user.save
+
+      User.any_instance.stub(:save).and_return(false)
+
+      post :POST_disable_authy
+      @user.reload
+      @user.authy_id.should_not be_nil
+      @user.authy_enabled.should be_true
+      flash[:error].should == "Something went wrong while disabling two factor authentication"
+    end
+
+    it "Should redirect if user isn't authenticated" do
+      post :POST_disable_authy
+      response.should redirect_to(new_user_session_url)
+    end
+  end
+
   describe "GET #verify_authy_installation" do
     it "Should render the authy installation page" do
       sign_in @user

data/spec/controllers/passwords_controller_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe DeviseAuthy::PasswordsController do
+  include Devise::TestHelpers
+
+  before :each do
+    request.env["devise.mapping"] = Devise.mappings[:user]
+  end
+
+  context "when the user has authy enabled" do
+
+    describe "Reset password" do
+      it "Should redirect to verify token view" do
+        user = create_user(:authy_id => 1)
+        user.reset_password_token = User.reset_password_token
+        user.reset_password_sent_at = Time.now.utc
+        user.authy_enabled = true
+        user.save
+
+        put :update, :user => { :reset_password_token => user.reset_password_token, :password => "password", :password_confirmation => "password" }
+
+        user.reload
+        user.last_sign_in_at.should be_nil
+        response.should redirect_to(root_url)
+      end
+    end
+  end
+
+  context "when the user don't have 2FA" do
+    describe "Reset password" do
+      it "Should sign in the user" do
+        user = create_user
+        user.reset_password_token = User.reset_password_token
+        user.reset_password_sent_at = Time.now.utc
+        user.save
+
+        last_sign_in_at = user.last_sign_in_at
+
+        put :update, :user => { :reset_password_token => user.reset_password_token, :password => "password", :password_confirmation => "password" }
+        response.should redirect_to(root_url)
+
+        user.reload
+        user.last_sign_in_at.should_not be_nil
+        flash[:notice].should == "Your password was changed successfully. You are now signed in."
+      end
+    end
+  end
+end

data/spec/rails-app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    devise-authy (1.5.1)
+    devise-authy (1.5.2)
       authy
       devise
 

data/spec/rails-app/config/environments/test.rb

@@ -34,4 +34,6 @@ RailsApp::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-authy
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Authy Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -184,6 +184,7 @@ files:
 - app/assets/stylesheets/devise_authy.css
 - app/assets/stylesheets/devise_authy.sass
 - app/controllers/devise/devise_authy_controller.rb
+- app/controllers/devise_authy/passwords_controller.rb
 - app/views/devise/enable_authy.html.erb
 - app/views/devise/enable_authy.html.haml
 - app/views/devise/verify_authy.html.erb
@@ -266,6 +267,7 @@ files:
 - lib/devise-authy/controllers/helpers.rb
 - lib/devise-authy/controllers/view_helpers.rb
 - lib/devise-authy/hooks/authy_authenticatable.rb
+- lib/devise-authy/mapping.rb
 - lib/devise-authy/models/authy_authenticatable.rb
 - lib/devise-authy/rails.rb
 - lib/devise-authy/routes.rb
@@ -274,6 +276,7 @@ files:
 - lib/generators/devise_authy/devise_authy_generator.rb
 - lib/generators/devise_authy/install_generator.rb
 - spec/controllers/devise_authy_controller_spec.rb
+- spec/controllers/passwords_controller_spec.rb
 - spec/features/authy_authenticatable_spec.rb
 - spec/generators_spec.rb
 - spec/models/authy_authenticatable.rb