devise-authy 1.7.0 → 1.8.0

data/config/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   devise:
-    submit_token: "Check Token"
-    submit_token_title: "Please enter your Authy token:"
+    submit_token: 'Check Token'
+    submit_token_title: 'Please enter your Authy token:'
     authy_register_title: 'Enable Two factor authentication'
     enable_authy: 'Enable'
     cellphone: 'Enter your cellphone'
@@ -10,7 +10,7 @@ en:
     request_phone_call: 'Request phone call'
     remember_device: 'Remember Device'
 
-    authy_verify_installation_title: "Verify your account"
+    authy_verify_installation_title: 'Verify your account'
     enable_my_account: 'Enable my account'
 
     devise_authy:
@@ -20,5 +20,5 @@ en:
         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."
+        already_enabled: 'Two factor authentication is already enabled.'
         invalid_token: 'The entered token is invalid'

data/devise-authy.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise-authy 1.7.0 ruby lib
+# stub: devise-authy 1.8.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "devise-authy"
-  s.version = "1.7.0"
+  s.name = "devise-authy".freeze
+  s.version = "1.8.0"
 
-  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 = "2015-12-22"
-  s.description = "Authy plugin for Devise"
-  s.email = "support@authy.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Authy Inc.".freeze]
+  s.date = "2016-10-25"
+  s.description = "Authy plugin for Devise".freeze
+  s.email = "support@authy.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -85,9 +85,11 @@ Gem::Specification.new do |s|
     "authy-devise-demo/config/locales/devise.en.yml",
     "authy-devise-demo/config/locales/en.yml",
     "authy-devise-demo/config/routes.rb",
+    "authy-devise-demo/config/secrets.yml",
     "authy-devise-demo/db/migrate/20130409234357_devise_create_users.rb",
     "authy-devise-demo/db/migrate/20141202000744_devise_create_admins.rb",
     "authy-devise-demo/db/migrate/20141202004246_devise_authy_add_to_admins.rb",
+    "authy-devise-demo/db/migrate/20160906221739_add_sessions_table.rb",
     "authy-devise-demo/db/schema.rb",
     "authy-devise-demo/db/seeds.rb",
     "authy-devise-demo/lib/assets/.gitkeep",
@@ -178,6 +180,7 @@ Gem::Specification.new do |s|
     "spec/rails-app/config/locales/devise.en.yml",
     "spec/rails-app/config/locales/en.yml",
     "spec/rails-app/config/routes.rb",
+    "spec/rails-app/config/secrets.yml",
     "spec/rails-app/db/development.sqlite3",
     "spec/rails-app/db/migrate/20130419164907_devise_create_users.rb",
     "spec/rails-app/db/migrate/20130419164936_devise_authy_add_to_users.rb",
@@ -195,51 +198,45 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/helpers.rb"
   ]
-  s.homepage = "https://github.com/authy/authy-devise"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "Authy plugin for Devise"
+  s.homepage = "https://github.com/authy/authy-devise".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.7".freeze
+  s.summary = "Authy plugin for Devise".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<devise>, [">= 0"])
-      s.add_runtime_dependency(%q<authy>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<sass-rails>, [">= 0"])
-      s.add_development_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_runtime_dependency(%q<devise>.freeze, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<authy>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["> 3.0.0"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<devise>, [">= 0"])
-      s.add_dependency(%q<authy>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<sass-rails>, [">= 0"])
-      s.add_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<devise>.freeze, [">= 3.0.0"])
+      s.add_dependency(%q<authy>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["> 3.0.0"])
+      s.add_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<devise>, [">= 0"])
-    s.add_dependency(%q<authy>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<sass-rails>, [">= 0"])
-    s.add_dependency(%q<jquery-rails>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<devise>.freeze, [">= 3.0.0"])
+    s.add_dependency(%q<authy>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["> 3.0.0"])
+    s.add_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
   end
 end
 

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

@@ -4,7 +4,7 @@ module DeviseAuthy
       extend ActiveSupport::Concern
 
       included do
-        before_filter :check_request_and_redirect_to_verify_token, :if => :is_signing_in?
+        before_action :check_request_and_redirect_to_verify_token, :if => :is_signing_in?
       end
 
       private

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

@@ -2,6 +2,9 @@ module DeviseAuthy
   module Views
     module Helpers
       def authy_request_phone_call_link(opts = {})
+        title = opts.delete(:title) do
+          I18n.t('request_phone_call', { :scope => 'devise' })
+        end
         opts = {
           :id => "authy-request-phone-call-link",
           :method => :post,
@@ -9,13 +12,16 @@ module DeviseAuthy
         }.merge(opts)
 
         link_to(
-          I18n.t('request_phone_call', { :scope => 'devise' }),
+          title,
           url_for([resource_name, :request_phone_call]),
           opts
         )
       end
 
       def authy_request_sms_link(opts = {})
+        title = opts.delete(:title) do
+          I18n.t('request_sms', scope: 'devise')
+        end
         opts = {
           :id => "authy-request-sms-link",
           :method => :post,
@@ -23,7 +29,7 @@ module DeviseAuthy
         }.merge(opts)
 
         link_to(
-          I18n.t('request_sms', {:scope => 'devise'}),
+          title,
           url_for([resource_name, :request_sms]),
           opts
         )

data/lib/devise-authy/mapping.rb

@@ -1,14 +1,10 @@
 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)
+    def default_controllers(options)
       options[:controllers] ||= {}
       options[:controllers][:passwords] ||= "devise_authy/passwords"
-      default_controllers_without_authy_authenticatable(options)
+      super
     end
   end
-end
+end

data/lib/devise-authy/models/authy_authenticatable.rb

@@ -14,7 +14,7 @@ module Devise
 
       module ClassMethods
         def find_by_authy_id(authy_id)
-          find(:first, :conditions => {:authy_id => authy_id})
+          where(authy_id: authy_id).first
         end
 
         Devise::Models.config(self, :authy_remember_device)

data/lib/devise-authy/rails.rb

@@ -9,7 +9,7 @@ module DeviseAuthy
 
     # extend mapping with after_initialize because it's not reloaded
     config.after_initialize do
-      Devise::Mapping.send :include, DeviseAuthy::Mapping
+      Devise::Mapping.send :prepend, DeviseAuthy::Mapping
     end
   end
 end

data/lib/generators/devise_authy/install_generator.rb

@@ -16,6 +16,13 @@ module DeviseAuthy
         "  # config.authy_remember_device = 1.month\n\n", :after => "Devise.setup do |config|\n"
       end
 
+      def add_initializer
+        initializer("authy.rb") do
+          "Authy.api_key = ENV[\"AUTHY_API_KEY\"]\n" \
+          "Authy.api_uri = \"https://api.authy.com/\""
+        end
+      end
+
       def copy_locale
         copy_file "../../../config/locales/en.yml", "config/locales/devise.authy.en.yml"
       end

data/spec/controllers/devise_authy_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Devise::DeviseAuthyController do
-  include Devise::TestHelpers
+describe Devise::DeviseAuthyController, type: :controller do
+  include Devise::Test::ControllerHelpers
 
   before :each do
     request.env["devise.mapping"] = Devise.mappings[:user]
@@ -13,18 +13,18 @@ describe Devise::DeviseAuthyController do
       request.session["user_id"] = @user.id
       request.session["user_password_checked"] = true
       get :GET_verify_authy
-      response.should render_template('verify_authy')
+      expect(response).to render_template('verify_authy')
     end
 
     it "Should no render the second step of authentication if first step is incomplete" do
       request.session["user_id"] = @user.id
       get :GET_verify_authy
-      response.should redirect_to(root_url)
+      expect(response).to redirect_to(root_url)
     end
 
     it "should redirect to root_url" do
       get :GET_verify_authy
-      response.should redirect_to(root_url)
+      expect(response).to redirect_to(root_url)
     end
   end
 
@@ -35,12 +35,12 @@ describe Devise::DeviseAuthyController do
 
       post :POST_verify_authy, :token => '0000000'
       @user.reload
-      @user.last_sign_in_with_authy.should_not be_nil
+      expect(@user.last_sign_in_with_authy).not_to be_nil
 
-      response.cookies["remember_device"].should be_nil
-      response.should redirect_to(root_url)
-      flash.now[:notice].should_not be_nil
-      session["user_authy_token_checked"].should be_true
+      expect(response.cookies["remember_device"]).to be_nil
+      expect(response).to redirect_to(root_url)
+      expect(flash.now[:notice]).not_to be_nil
+      expect(session["user_authy_token_checked"]).to be_truthy
     end
 
     it "Should set remember_device if selected" do
@@ -49,11 +49,11 @@ describe Devise::DeviseAuthyController do
 
       post :POST_verify_authy, :token => '0000000', :remember_device => '1'
       @user.reload
-      @user.last_sign_in_with_authy.should_not be_nil
+      expect(@user.last_sign_in_with_authy).not_to be_nil
 
-      response.cookies["remember_device"].should_not be_nil
-      response.should redirect_to(root_url)
-      flash.now[:notice].should_not be_nil
+      expect(response.cookies["remember_device"]).not_to be_nil
+      expect(response).to redirect_to(root_url)
+      expect(flash.now[:notice]).not_to be_nil
     end
 
     it "Shouldn't login the user if token is invalid" do
@@ -61,7 +61,7 @@ describe Devise::DeviseAuthyController do
       request.session["user_password_checked"] = true
 
       post :POST_verify_authy, :token => '5678900'
-      response.should render_template('verify_authy')
+      expect(response).to render_template('verify_authy')
     end
 
     context 'User is lockable' do
@@ -69,7 +69,7 @@ describe Devise::DeviseAuthyController do
       let(:user) { create_lockable_user authy_id: 2 }
 
       before do
-        controller.stub(:find_resource).and_return user
+        allow(controller).to receive(:find_resource).and_return user
         controller.instance_variable_set :@resource, user
       end
 
@@ -82,7 +82,7 @@ describe Devise::DeviseAuthyController do
         end
 
         user.reload
-        expect(user.access_locked?).to be_true
+        expect(user.access_locked?).to be_truthy
       end
 
     end
@@ -110,26 +110,26 @@ describe Devise::DeviseAuthyController do
       user2 = create_user
       sign_in user2
       get :GET_enable_authy
-      response.should render_template('enable_authy')
+      expect(response).to render_template('enable_authy')
     end
 
     it "Shouldn't render enable authy view" do
       get :GET_enable_authy
-      response.should redirect_to(new_user_session_url)
+      expect(response).to redirect_to(new_user_session_url)
     end
 
     it "should redirect if user has authy enabled" do
       @user.update_attribute(:authy_enabled, true)
       sign_in @user
       get :GET_enable_authy
-      response.should redirect_to(root_url)
-      flash.now[:notice].should == "Two factor authentication is already enabled."
+      expect(response).to redirect_to(root_url)
+      expect(flash.now[:notice]).to eq("Two factor authentication is already enabled.")
     end
 
     it "Should render enable authy view if authy enabled is false" do
       sign_in @user
       get :GET_enable_authy
-      response.should render_template('enable_authy')
+      expect(response).to render_template('enable_authy')
     end
   end
 
@@ -138,11 +138,11 @@ describe Devise::DeviseAuthyController do
       user2 = create_user
       sign_in user2
 
-      post :POST_enable_authy, :cellphone => '2222227', :country_code => '57'
+      post :POST_enable_authy, :cellphone => '3010008090', :country_code => '57'
       user2.reload
-      user2.authy_id.should_not be_nil
-      flash.now[:notice].should == "Two factor authentication was enabled"
-      response.should redirect_to(user_verify_authy_installation_url)
+      expect(user2.authy_id).not_to be_nil
+      expect(flash.now[:notice]).to eq("Two factor authentication was enabled")
+      expect(response).to redirect_to(user_verify_authy_installation_url)
     end
 
     it "Should not create user register user failed" do
@@ -150,13 +150,13 @@ describe Devise::DeviseAuthyController do
       sign_in user2
 
       post :POST_enable_authy, :cellphone => '22222', :country_code => "57"
-      response.should render_template('enable_authy')
-      flash[:error].should == "Something went wrong while enabling two factor authentication"
+      expect(response).to render_template('enable_authy')
+      expect(flash[:error]).to eq("Something went wrong while enabling two factor authentication")
     end
 
     it "Should redirect if user isn't authenticated" do
       post :POST_enable_authy, :cellphone => '3010008090', :country_code => '57'
-      response.should redirect_to(new_user_session_url)
+      expect(response).to redirect_to(new_user_session_url)
     end
   end
 
@@ -167,30 +167,30 @@ describe Devise::DeviseAuthyController do
 
       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)
+      expect(@user.authy_id).to be_nil
+      expect(@user.authy_enabled).to be_falsey
+      expect(flash.now[:notice]).to eq("Two factor authentication was disabled")
+      expect(response).to redirect_to(root_url)
     end
 
     it "Should not disable 2FA" do
       sign_in @user
       @user.update_attribute(:authy_enabled, true)
 
-      authy_response = mock('authy_response')
-      authy_response.stub(:ok?).and_return(false)
-      Authy::API.should_receive(:delete_user).with(:id => @user.authy_id.to_s).and_return(authy_response)
+      authy_response = double('authy_response')
+      allow(authy_response).to receive(:ok?).and_return(false)
+      expect(Authy::API).to receive(:delete_user).with(:id => @user.authy_id.to_s).and_return(authy_response)
 
       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"
+      expect(@user.authy_id).not_to be_nil
+      expect(@user.authy_enabled).to be_truthy
+      expect(flash[:error]).to eq("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)
+      expect(response).to redirect_to(new_user_session_url)
     end
   end
 
@@ -198,12 +198,12 @@ describe Devise::DeviseAuthyController do
     it "Should render the authy installation page" do
       sign_in @user
       get :GET_verify_authy_installation
-      response.should render_template('verify_authy_installation')
+      expect(response).to render_template('verify_authy_installation')
     end
 
     it "Should redirect if user isn't authenticated" do
       get :GET_verify_authy_installation
-      response.should redirect_to(new_user_session_url)
+      expect(response).to redirect_to(new_user_session_url)
     end
   end
 
@@ -211,23 +211,23 @@ describe Devise::DeviseAuthyController do
     it "Should enable authy for user" do
       sign_in @user
       post :POST_verify_authy_installation, :token => "0000000"
-      response.should redirect_to(root_url)
-      flash[:notice].should == 'Two factor authentication was enabled'
+      expect(response).to redirect_to(root_url)
+      expect(flash[:notice]).to eq('Two factor authentication was enabled')
 
       @user.reload
-      @user.authy_enabled.should be_true
+      expect(@user.authy_enabled).to be_truthy
     end
 
     it "should not enable authy for user" do
       sign_in @user
       post :POST_verify_authy_installation, :token => "0007777"
-      response.should render_template('verify_authy_installation')
-      flash[:error].should == 'Something went wrong while enabling two factor authentication'
+      expect(response).to render_template('verify_authy_installation')
+      expect(flash[:error]).to eq('Something went wrong while enabling two factor authentication')
     end
 
     it "Should redirect if user isn't authenticated" do
       get :GET_verify_authy_installation
-      response.should redirect_to(new_user_session_url)
+      expect(response).to redirect_to(new_user_session_url)
     end
   end
 
@@ -235,18 +235,19 @@ describe Devise::DeviseAuthyController do
     it "Should send sms if user is logged" do
       sign_in @user
       post :request_sms
-      response.content_type.should == 'application/json'
+      expect(response.content_type).to eq('application/json')
       body = JSON.parse(response.body)
-      body['sent'].should be_true
-      body['message'].should == "SMS token was sent"
+
+      expect(body['sent']).to be_truthy
+      expect(body['message']).to eq("SMS token was sent")
     end
 
     it "Shoul not send sms if user couldn't be found" do
       post :request_sms
-      response.content_type.should == 'application/json'
+      expect(response.content_type).to eq('application/json')
       body = JSON.parse(response.body)
-      body['sent'].should be_false
-      body['message'].should == "User couldn't be found."
+      expect(body['sent']).to be_falsey
+      expect(body['message']).to eq("User couldn't be found.")
     end
   end
 
@@ -254,18 +255,18 @@ describe Devise::DeviseAuthyController do
     it "Should send phone call if user is logged" do
       sign_in @user
       post :request_phone_call
-      response.content_type.should == 'application/json'
+      expect(response.content_type).to eq('application/json')
       body = JSON.parse(response.body)
-      body['sent'].should be_true
-      body['message'].should == "Call started..."
+      expect(body['sent']).to be_truthy
+      expect(body['message']).to eq("Call started...")
     end
 
     it "Shoul not send phone call if user couldn't be found" do
       post :request_phone_call
-      response.content_type.should == 'application/json'
+      expect(response.content_type).to eq('application/json')
       body = JSON.parse(response.body)
-      body['sent'].should be_false
-      body['message'].should == "User couldn't be found."
+      expect(body['sent']).to be_falsey
+      expect(body['message']).to eq("User couldn't be found.")
     end
   end
 end