devise-authy 1.0.0 → 1.2.1

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "devise"
 gem 'authy'
@@ -12,9 +12,11 @@ group :development do
   gem "simplecov"
   gem "sass-rails"
   gem "jquery-rails"
+  gem "pry"
 end
 
 group :test do
+  gem "rails"
   gem "sqlite3"
   gem 'rspec-rails'
   gem 'database_cleaner'

data/Gemfile.lock

@@ -1,47 +1,55 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
-    authy (1.1.0)
-      httpclient
+    arel (3.0.2)
+    authy (2.0.1)
+      httpclient (>= 2.2.6)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
-    capybara (1.1.2)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+      xpath (~> 2.0)
+    coderay (1.0.9)
     database_cleaner (0.9.1)
-    devise (2.1.2)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.3)
     erubis (2.7.0)
-    ffi (1.1.5)
     git (1.2.5)
-    hike (1.2.1)
+    hike (1.2.2)
     httpclient (2.3.3)
     i18n (0.6.1)
     jeweler (1.8.4)
@@ -50,73 +58,91 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    libwebsocket (0.1.5)
-      addressable
-    mime-types (1.19)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.1)
+    mime-types (1.22)
+    multi_json (1.7.2)
+    nokogiri (1.5.9)
     orm_adapter (0.4.0)
-    rack (1.4.1)
+    polyglot (0.3.3)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
-    rubyzip (0.9.9)
-    sass (3.2.1)
-    sass-rails (3.2.5)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sass (3.2.7)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.25.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.1.3)
+    slop (3.4.4)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.3.7)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
     warden (1.2.1)
       rack (>= 1.0)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.3)
+    yard (0.8.6.1)
 
 PLATFORMS
   ruby
@@ -129,6 +155,8 @@ DEPENDENCIES
   devise
   jeweler
   jquery-rails
+  pry
+  rails
   rdoc
   rspec
   rspec-rails

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "devise-authy"
-  gem.homepage = "http://github.com/senekis/devise-authy"
+  gem.homepage = "https://github.com/authy/authy-devise"
   gem.license = "MIT"
   gem.summary = %Q{Authy plugin for Devise}
   gem.description = %Q{Authy plugin for Devise}

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.1

data/app/controllers/devise/devise_authy_controller.rb

@@ -1,9 +1,12 @@
 class Devise::DeviseAuthyController < DeviseController
+  prepend_before_filter :find_resource, :only => [
+    :request_sms
+  ]
   prepend_before_filter :find_resource_and_require_password_checked, :only => [
     :GET_verify_authy, :POST_verify_authy
   ]
   prepend_before_filter :authenticate_scope!, :only => [
-    :GET_enable_authy, :POST_enable_authy, 
+    :GET_enable_authy, :POST_enable_authy,
     :GET_verify_authy_installation, :POST_verify_authy_installation
   ]
   include Devise::Controllers::Helpers
@@ -24,17 +27,25 @@ class Devise::DeviseAuthyController < DeviseController
     if token.ok?
       @resource.update_attribute(:last_sign_in_with_authy, DateTime.now)
 
+      remember_device if params[:remember_device].to_i == 1
+
       set_flash_message(:notice, :signed_in) if is_navigational_format?
       sign_in(resource_name, @resource)
       respond_with resource, :location => after_sign_in_path_for(@resource)
     else
+      set_flash_message(:error, :invalid_token)
       render :verify_authy
     end
   end
 
   # enable 2fa
   def GET_enable_authy
-    render :enable_authy
+    if resource.authy_id.blank? || !resource.authy_enabled
+      render :enable_authy
+    else
+      set_flash_message(:notice, :already_enabled)
+      redirect_to :root
+    end
   end
 
   def POST_enable_authy
@@ -82,13 +93,12 @@ class Devise::DeviseAuthyController < DeviseController
   end
 
   def request_sms
-    @resource = resource_class.find_by_id(session["#{resource_name}_id"])
     if !@resource
       render :json => {:sent => false, :message => "User couldn't be found."}
       return
     end
 
-    response = Authy::API.request_sms(:id => @resource.id, :force => true)
+    response = Authy::API.request_sms(:id => @resource.authy_id, :force => true)
     render :json => {:sent => response.ok?, :message => response.message}
   end
 
@@ -99,8 +109,16 @@ class Devise::DeviseAuthyController < DeviseController
     self.resource = send("current_#{resource_name}")
   end
 
+  def find_resource
+    @resource = send("current_#{resource_name}")
+
+    if @resource.nil?
+      @resource = resource_class.find_by_id(session["#{resource_name}_id"])
+    end
+  end
+
   def find_resource_and_require_password_checked
-    @resource = resource_class.find_by_id(session["#{resource_name}_id"])
+    find_resource
 
     if @resource.nil? || session[:"#{resource_name}_password_checked"].to_s != "true"
       redirect_to :root

data/app/views/devise/enable_authy.html.erb

@@ -1,8 +1,7 @@
 <h2><%= I18n.t('authy_register_title', {:scope => 'devise'}) %></h2>
 
 <%= enable_authy_form do %>
-  <%= text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"%>
   <%= text_field_tag :country_code, '', :autocomplete => :off, :placeholder => I18n.t('devise.country'), :id => "authy-countries"%>
+  <%= text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"%>
   <p><%= submit_tag I18n.t('enable_authy', {:scope => 'devise'}) %></p>
-<% end %>
-
+<% end %>

data/app/views/devise/enable_authy.html.haml

@@ -1,8 +1,5 @@
 %h2= I18n.t('authy_register_title', {:scope => 'devise'})
 = enable_authy_form do
-  = text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => |
-    I18n.t('devise.cellphone'), :id => "authy-cellphone"                  |
-  -#
-  = text_field_tag :country_code, '', :autocomplete => :off, :placeholder => |
-    I18n.t('devise.country'), :id => "authy-countries"                       |
+  = text_field_tag :country_code, '', :autocomplete => :off, :placeholder => I18n.t('devise.country'), :id => "authy-countries"
+  = text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"
   %p= submit_tag I18n.t('enable_authy', {:scope => 'devise'})

data/app/views/devise/verify_authy.html.erb

@@ -6,6 +6,11 @@
   <legend><%= I18n.t('submit_token_title', {:scope => 'devise'}) %></legend>
   <%= label_tag :token %>
   <%= text_field_tag :token, "", :autocomplete => :off, :id => 'authy-token' %>
+  <label>
+    <%= check_box_tag :remember_device %>
+    <span><%= I18n.t('remember_device', {:scope => 'devise'}) %></span>
+  </label>
+
   <%= link_to '?', '#', :id => 'authy-help' %>
   <%= authy_request_sms_link %>
   <%= submit_tag I18n.t('submit_token', {:scope => 'devise'}), :class => 'btn' %>

data/app/views/devise/verify_authy.html.haml

@@ -5,6 +5,9 @@
   = hidden_field_tag :"#{resource_name}_id", @resource.id
   = label_tag :token
   = text_field_tag :token, "", :autocomplete => :off, :id => 'authy-token'
+  %label
+    = check_box_tag :remember_device
+    %span= I18n.t('remember_device', {:scope => 'devise'})
   = link_to '?', '#', :id => 'authy-help'
   = authy_request_sms_link
   = submit_tag I18n.t('submit_token', {:scope => 'devise'}), :class => 'btn'

data/authy-devise-demo/Gemfile

@@ -8,6 +8,7 @@ gem 'rails', '3.2.13'
 gem 'sqlite3'
 gem 'devise', '2.1.3'
 gem 'devise-authy', :path => ".."
+gem 'pry'
 
 # Gems used only for assets and not required
 # in production environments by default.

data/authy-devise-demo/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: ..
   specs:
-    devise-authy (1.0.0)
+    devise-authy (1.1.0)
       authy
       devise
       devise-authy
+      rails (~> 3.2.6)
 
 GEM
   remote: https://rubygems.org/
@@ -37,10 +38,11 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    authy (1.1.0)
-      httpclient
+    authy (2.0.1)
+      httpclient (>= 2.2.6)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
+    coderay (1.0.9)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -68,10 +70,15 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.1)
     mime-types (1.22)
     multi_json (1.7.2)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -102,6 +109,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    slop (3.4.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -128,6 +136,7 @@ DEPENDENCIES
   devise (= 2.1.3)
   devise-authy!
   jquery-rails
+  pry
   rails (= 3.2.13)
   sass-rails (~> 3.2.3)
   sqlite3

data/authy-devise-demo/app/views/devise/devise_authy/enable_authy.html.erb

@@ -1,8 +1,7 @@
 <h2><%= I18n.t('authy_register_title', {:scope => 'devise'}) %></h2>
 
 <%= enable_authy_form do %>
-  <%= text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"%>
   <%= text_field_tag :country_code, '', :autocomplete => :off, :placeholder => I18n.t('devise.country'), :id => "authy-countries"%>
+  <%= text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"%>
   <p><%= submit_tag I18n.t('enable_authy', {:scope => 'devise'}) %></p>
-<% end %>
-
+<% end %>