devise-authy 1.2.2 → 1.3.0

data/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.2.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.2)
@@ -98,7 +98,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.13.0)

data/README.md

@@ -15,15 +15,19 @@ See [https://github.com/authy/authy-devise/tree/master/authy-devise-demo](https:
 
 First create an initializer in `config/initializer/authy.rb`
 
-    Authy.api_key = ENV['AUTHY_API_KEY'] || 'your_authy_api_key'
-    Authy.api_uri = 'https://api.authy.com/'
+```ruby
+Authy.api_key = ENV['AUTHY_API_KEY'] || 'your_authy_api_key'
+Authy.api_uri = 'https://api.authy.com/'
+```
 
 You can get the `AUTHY_API_KEY` at [https://www.authy.com/signup](https://www.authy.com/signup)
 
 Next add the gem to your Gemfile:
 
-    gem 'devise'
-    gem 'devise-authy'
+```ruby
+gem 'devise'
+gem 'devise-authy'
+```
 
 And then run `bundle install`
 
@@ -42,15 +46,19 @@ Configure your Devise user model:
 
 or add the following line to your `User` model
 
-    devise :authy_authenticatable, :database_authenticatable
+```ruby
+devise :authy_authenticatable, :database_authenticatable
+```
 
 Change the default routes to point to something sane like:
 
-	devise_for :users, :path_names => {
-		:verify_authy => "/verify-token",
-		:enable_authy => "/enable-two-factor",
-		:verify_authy_installation => "/verify-installation"
-	}
+```ruby
+devise_for :users, :path_names => {
+	:verify_authy => "/verify-token",
+	:enable_authy => "/enable-two-factor",
+	:verify_authy_installation => "/verify-installation"
+}
+```
 
 Then run the migrations:
 
@@ -74,6 +82,30 @@ If you want to customise your views, you can modify the files that are located a
     app/views/devise/devise_authy/verify_authy.html.erb
     app/views/devise/devise_authy/verify_authy_installation.html.erb
 
+
+## Custom Redirect Paths (eg. using modules)
+
+If you want to customise the redirects you can override them within your own controller like this:
+
+```ruby
+class MyCustomModule::DeviseAuthyController < Devise::DeviseAuthyController
+
+  protected
+    def after_authy_enabled_path_for(resource)
+      my_own_path
+    end
+
+    def after_authy_verified_path_for(resource)
+      my_own_path
+    end
+
+    def invalid_resource_path
+      my_own_path
+    end
+end
+```
+
+
 ## I18n
 
 The install generator also copy a `Devise Authy` i18n file which you can find at:

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0

data/app/controllers/devise/devise_authy_controller.rb

@@ -44,7 +44,7 @@ class Devise::DeviseAuthyController < DeviseController
       render :enable_authy
     else
       set_flash_message(:notice, :already_enabled)
-      redirect_to :root
+      redirect_to after_authy_enabled_path_for(resource)
     end
   end
 
@@ -61,7 +61,7 @@ class Devise::DeviseAuthyController < DeviseController
         set_flash_message(:notice, :enabled)
       else
         set_flash_message(:error, :not_enabled)
-        redirect_to :root and return
+        redirect_to after_authy_enabled_path_for(resource) and return
       end
 
       redirect_to [resource_name, :verify_authy_installation]
@@ -88,7 +88,7 @@ class Devise::DeviseAuthyController < DeviseController
       render :verify_authy_installation
     else
       set_flash_message(:notice, :enabled)
-      redirect_to :root
+      redirect_to after_authy_verified_path_for(resource)
     end
   end
 
@@ -121,7 +121,21 @@ class Devise::DeviseAuthyController < DeviseController
     find_resource
 
     if @resource.nil? || session[:"#{resource_name}_password_checked"].to_s != "true"
-      redirect_to :root
+      redirect_to invalid_resource_path
     end
   end
+
+  protected
+
+    def after_authy_enabled_path_for(resource)
+      root_path
+    end
+
+    def after_authy_verified_path_for(resource)
+      after_authy_enabled_path_for(resource)
+    end
+
+    def invalid_resource_path
+      root_path
+    end
 end

data/devise-authy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "devise-authy"
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Authy Inc."]
-  s.date = "2013-04-22"
+  s.date = "2013-11-15"
   s.description = "Authy plugin for Devise"
   s.email = "support@authy.com"
   s.extra_rdoc_files = [

data/spec/rails-app/Gemfile.lock

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

metadata

@@ -2,191 +2,191 @@
 name: devise-authy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Authy Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: devise
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: devise
+  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: authy
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: authy
+  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rspec
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: rspec
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: yard
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: yard
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rdoc
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: rdoc
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: bundler
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: bundler
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: jeweler
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: jeweler
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: simplecov
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: simplecov
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: sass-rails
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: sass-rails
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: jquery-rails
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: jquery-rails
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: pry
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  name: pry
+  type: :development
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Authy plugin for Devise
 email: support@authy.com
 executables: []
@@ -368,20 +368,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 1669727598248125188
+      hash: -2707365920009790571
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24