devise-authy 1.7.0 → 2.3.1

data/devise-authy.gemspec

@@ -1,245 +1,50 @@
-# Generated by jeweler
-# 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
+# frozen_string_literal: true
 
-Gem::Specification.new do |s|
-  s.name = "devise-authy"
-  s.version = "1.7.0"
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "devise-authy/version"
 
-  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.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/assets/javascripts/devise_authy.js",
-    "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",
-    "app/views/devise/verify_authy.html.haml",
-    "app/views/devise/verify_authy_installation.html.erb",
-    "app/views/devise/verify_authy_installation.html.haml",
-    "authy-devise-demo/.gitignore",
-    "authy-devise-demo/Gemfile",
-    "authy-devise-demo/Gemfile.lock",
-    "authy-devise-demo/README.md",
-    "authy-devise-demo/Rakefile",
-    "authy-devise-demo/app/assets/images/rails.png",
-    "authy-devise-demo/app/assets/javascripts/application.js",
-    "authy-devise-demo/app/assets/javascripts/devise_authy.js",
-    "authy-devise-demo/app/assets/javascripts/welcome.js.coffee",
-    "authy-devise-demo/app/assets/stylesheets/application.css",
-    "authy-devise-demo/app/assets/stylesheets/devise_authy.css",
-    "authy-devise-demo/app/assets/stylesheets/welcome.css.scss",
-    "authy-devise-demo/app/controllers/application_controller.rb",
-    "authy-devise-demo/app/controllers/welcome_controller.rb",
-    "authy-devise-demo/app/helpers/application_helper.rb",
-    "authy-devise-demo/app/helpers/welcome_helper.rb",
-    "authy-devise-demo/app/mailers/.gitkeep",
-    "authy-devise-demo/app/models/.gitkeep",
-    "authy-devise-demo/app/models/admin.rb",
-    "authy-devise-demo/app/models/user.rb",
-    "authy-devise-demo/app/views/devise/devise_authy/enable_authy.html.erb",
-    "authy-devise-demo/app/views/devise/devise_authy/verify_authy.html.erb",
-    "authy-devise-demo/app/views/devise/devise_authy/verify_authy_installation.html.erb",
-    "authy-devise-demo/app/views/layouts/application.html.erb",
-    "authy-devise-demo/app/views/welcome/admin_page.html.erb",
-    "authy-devise-demo/app/views/welcome/index.html.erb",
-    "authy-devise-demo/app/views/welcome/user_page.html.erb",
-    "authy-devise-demo/config.ru",
-    "authy-devise-demo/config/application.rb",
-    "authy-devise-demo/config/boot.rb",
-    "authy-devise-demo/config/database.yml",
-    "authy-devise-demo/config/environment.rb",
-    "authy-devise-demo/config/environments/development.rb",
-    "authy-devise-demo/config/environments/production.rb",
-    "authy-devise-demo/config/environments/test.rb",
-    "authy-devise-demo/config/initializers/authy.rb",
-    "authy-devise-demo/config/initializers/backtrace_silencers.rb",
-    "authy-devise-demo/config/initializers/devise.rb",
-    "authy-devise-demo/config/initializers/inflections.rb",
-    "authy-devise-demo/config/initializers/mime_types.rb",
-    "authy-devise-demo/config/initializers/secret_token.rb",
-    "authy-devise-demo/config/initializers/session_store.rb",
-    "authy-devise-demo/config/initializers/wrap_parameters.rb",
-    "authy-devise-demo/config/locales/devise.authy.en.yml",
-    "authy-devise-demo/config/locales/devise.en.yml",
-    "authy-devise-demo/config/locales/en.yml",
-    "authy-devise-demo/config/routes.rb",
-    "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/schema.rb",
-    "authy-devise-demo/db/seeds.rb",
-    "authy-devise-demo/lib/assets/.gitkeep",
-    "authy-devise-demo/lib/tasks/.gitkeep",
-    "authy-devise-demo/log/.gitkeep",
-    "authy-devise-demo/public/404.html",
-    "authy-devise-demo/public/422.html",
-    "authy-devise-demo/public/500.html",
-    "authy-devise-demo/public/favicon.ico",
-    "authy-devise-demo/public/robots.txt",
-    "authy-devise-demo/script/rails",
-    "authy-devise-demo/test/fixtures/.gitkeep",
-    "authy-devise-demo/test/fixtures/users.yml",
-    "authy-devise-demo/test/functional/.gitkeep",
-    "authy-devise-demo/test/functional/welcome_controller_test.rb",
-    "authy-devise-demo/test/integration/.gitkeep",
-    "authy-devise-demo/test/performance/browsing_test.rb",
-    "authy-devise-demo/test/test_helper.rb",
-    "authy-devise-demo/test/unit/.gitkeep",
-    "authy-devise-demo/test/unit/helpers/welcome_helper_test.rb",
-    "authy-devise-demo/test/unit/user_test.rb",
-    "authy-devise-demo/vendor/assets/javascripts/.gitkeep",
-    "authy-devise-demo/vendor/assets/stylesheets/.gitkeep",
-    "authy-devise-demo/vendor/plugins/.gitkeep",
-    "config/locales/en.yml",
-    "devise-authy.gemspec",
-    "lib/devise-authy.rb",
-    "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/models/authy_lockable.rb",
-    "lib/devise-authy/rails.rb",
-    "lib/devise-authy/routes.rb",
-    "lib/generators/active_record/devise_authy_generator.rb",
-    "lib/generators/active_record/templates/migration.rb",
-    "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/features/authy_lockable_spec.rb",
-    "spec/generators_spec.rb",
-    "spec/models/authy_authenticatable_spec.rb",
-    "spec/models/authy_lockable_spec.rb",
-    "spec/orm/active_record.rb",
-    "spec/rails-app/Gemfile",
-    "spec/rails-app/Gemfile.lock",
-    "spec/rails-app/Rakefile",
-    "spec/rails-app/app/assets/images/rails.png",
-    "spec/rails-app/app/assets/javascripts/application.js",
-    "spec/rails-app/app/assets/javascripts/devise_authy.js",
-    "spec/rails-app/app/assets/javascripts/welcome.js",
-    "spec/rails-app/app/assets/stylesheets/application.css",
-    "spec/rails-app/app/assets/stylesheets/devise_authy.css",
-    "spec/rails-app/app/assets/stylesheets/welcome.css.scss",
-    "spec/rails-app/app/controllers/application_controller.rb",
-    "spec/rails-app/app/controllers/welcome_controller.rb",
-    "spec/rails-app/app/helpers/application_helper.rb",
-    "spec/rails-app/app/helpers/welcome_helper.rb",
-    "spec/rails-app/app/mailers/.gitkeep",
-    "spec/rails-app/app/models/.gitkeep",
-    "spec/rails-app/app/models/lockable_user.rb",
-    "spec/rails-app/app/models/user.rb",
-    "spec/rails-app/app/views/devise/devise_authy/enable_authy.html.erb",
-    "spec/rails-app/app/views/devise/devise_authy/verify_authy.html.erb",
-    "spec/rails-app/app/views/devise/devise_authy/verify_authy_installation.html.erb",
-    "spec/rails-app/app/views/layouts/application.html.erb",
-    "spec/rails-app/app/views/welcome/index.html.erb",
-    "spec/rails-app/config.ru",
-    "spec/rails-app/config/application.rb",
-    "spec/rails-app/config/boot.rb",
-    "spec/rails-app/config/database.yml",
-    "spec/rails-app/config/environment.rb",
-    "spec/rails-app/config/environments/development.rb",
-    "spec/rails-app/config/environments/production.rb",
-    "spec/rails-app/config/environments/test.rb",
-    "spec/rails-app/config/initializers/authy.rb",
-    "spec/rails-app/config/initializers/backtrace_silencers.rb",
-    "spec/rails-app/config/initializers/devise.rb",
-    "spec/rails-app/config/initializers/inflections.rb",
-    "spec/rails-app/config/initializers/mime_types.rb",
-    "spec/rails-app/config/initializers/secret_token.rb",
-    "spec/rails-app/config/initializers/session_store.rb",
-    "spec/rails-app/config/initializers/wrap_parameters.rb",
-    "spec/rails-app/config/locales/devise.authy.en.yml",
-    "spec/rails-app/config/locales/devise.en.yml",
-    "spec/rails-app/config/locales/en.yml",
-    "spec/rails-app/config/routes.rb",
-    "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",
-    "spec/rails-app/db/schema.rb",
-    "spec/rails-app/db/seeds.rb",
-    "spec/rails-app/lib/assets/.gitkeep",
-    "spec/rails-app/lib/tasks/.gitkeep",
-    "spec/rails-app/public/404.html",
-    "spec/rails-app/public/422.html",
-    "spec/rails-app/public/500.html",
-    "spec/rails-app/public/favicon.ico",
-    "spec/rails-app/public/robots.txt",
-    "spec/rails-app/script/rails",
-    "spec/routing/routes_spec.rb",
-    "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"
+Gem::Specification.new do |spec|
+  spec.name          = "devise-authy"
+  spec.version       = DeviseAuthy::VERSION
+  spec.authors       = ["Authy Inc."]
+  spec.email         = ["support@authy.com"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.summary       = %q{Deprecated: please see README for details}
+  spec.description   = %q{Authy plugin to add two factor authentication to Devise. This gem is deprecated, please see the README for details.}
+  spec.homepage      = "https://github.com/twilio/authy-devise"
+  spec.license       = "MIT"
 
-    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"])
-    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"])
-    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"])
+  spec.metadata      = {
+    "bug_tracker_uri"   => "https://github.com/twilio/authy-devise/issues",
+    "change_log_uri"    => "https://github.com/twilio/authy-devise/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/twilio/authy-devise",
+    "homepage_uri"      => "https://github.com/twilio/authy-devise",
+    "source_code_uri"   => "https://github.com/twilio/authy-devise"
+  }
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
   end
-end
+  spec.require_paths = ["lib"]
 
+  spec.add_dependency "devise", ">= 4.0.0"
+  spec.add_dependency "authy", "~> 3.0"
+
+  spec.add_development_dependency "appraisal", "~> 2.2"
+  spec.add_development_dependency "bundler", ">= 1.16"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "combustion", "~> 1.1"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rails-controller-testing", "~> 1.0"
+  spec.add_development_dependency "yard", "~> 0.9.11"
+  spec.add_development_dependency "rdoc", "~> 4.3.0"
+  spec.add_development_dependency "simplecov", "~> 0.17.1"
+  spec.add_development_dependency "webmock", "~> 3.11.0"
+  spec.add_development_dependency "rails", ">= 5"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "generator_spec"
+  spec.add_development_dependency "database_cleaner", "~> 1.7"
+  spec.add_development_dependency "factory_bot_rails", "~> 5.1.1"
+end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.13"
+
+group :development, :test do
+  gem "factory_girl_rails", require: false
+  gem "rspec-rails", "~>4.0.0.beta3", require: false
+  gem "database_cleaner", require: false
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+gem "net-smtp"
+
+group :development, :test do
+  gem "factory_girl_rails", require: false
+  gem "rspec-rails", "~>4.0.0.beta3", require: false
+  gem "database_cleaner", require: false
+end
+
+gemspec path: "../"

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

@@ -4,26 +4,35 @@ 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
-      def remember_device
+
+      def remember_device(id)
         cookies.signed[:remember_device] = {
-          :value => Time.now.to_i,
+          :value => {expires: Time.now.to_i, id: id}.to_json,
           :secure => !(Rails.env.test? || Rails.env.development?),
+          :httponly => !(Rails.env.test? || Rails.env.development?),
           :expires => resource_class.authy_remember_device.from_now
         }
       end
 
+      def forget_device
+        cookies.delete :remember_device
+      end
+
       def require_token?
-        if cookies.signed[:remember_device].present? &&
-          (Time.now.to_i - cookies.signed[:remember_device].to_i) < \
-          resource_class.authy_remember_device.to_i
-          return false
-        end
+        id = warden.session(resource_name)[:id]
+        cookie = cookies.signed[:remember_device]
+        return true if cookie.blank?
+
+        # require token for old cookies which just have expiration time and no id
+        return true if cookie.to_s =~ %r{\A\d+\z}
 
-        return true
+        cookie = JSON.parse(cookie) rescue ""
+        return cookie.blank? || (Time.now.to_i - cookie['expires'].to_i) > \
+               resource_class.authy_remember_device.to_i || cookie['id'] != id
       end
 
       def is_devise_sessions_controller?
@@ -31,7 +40,7 @@ module DeviseAuthy
       end
 
       def is_signing_in?
-        if devise_controller? && signed_in?(resource_name) &&
+        if devise_controller? &&
           is_devise_sessions_controller? &&
           self.action_name == "create"
           return true
@@ -49,8 +58,7 @@ module DeviseAuthy
 
           remember_me = (params.fetch(resource_name, {})[:remember_me].to_s == "1")
           return_to = session["#{resource_name}_return_to"]
-          warden.logout
-          warden.reset_session! # make sure the session resetted
+          sign_out
 
           session["#{resource_name}_id"] = id
           # this is safe to put in the session because the cookie is signed
@@ -67,6 +75,17 @@ module DeviseAuthy
         scope = Devise::Mapping.find_scope!(resource_or_scope)
         send(:"#{scope}_verify_authy_path")
       end
+
+      def send_one_touch_request(authy_id)
+        Authy::OneTouch.send_approval_request(id: authy_id, message: I18n.t('request_to_login', scope: 'devise'))
+      end
+
+      def record_authy_authentication
+        @resource.update_attribute(:last_sign_in_with_authy, DateTime.now)
+        session["#{resource_name}_authy_token_checked"] = true
+        sign_in(resource_name, @resource)
+        set_flash_message(:notice, :signed_in) if is_navigational_format?
+      end
     end
   end
 end

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' }),
-          url_for([resource_name, :request_phone_call]),
+          title,
+          url_for([resource_name.to_sym, :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,15 +29,15 @@ module DeviseAuthy
         }.merge(opts)
 
         link_to(
-          I18n.t('request_sms', {:scope => 'devise'}),
-          url_for([resource_name, :request_sms]),
+          title,
+          url_for([resource_name.to_sym, :request_sms]),
           opts
         )
       end
 
       def verify_authy_form(opts = {}, &block)
         opts = default_opts.merge(:id => 'devise_authy').merge(opts)
-        form_tag([resource_name, :verify_authy], opts) do
+        form_tag([resource_name.to_sym, :verify_authy], opts) do
           buffer = hidden_field_tag(:"#{resource_name}_id", @resource.id)
           buffer << capture(&block)
         end
@@ -39,14 +45,14 @@ module DeviseAuthy
 
       def enable_authy_form(opts = {}, &block)
         opts = default_opts.merge(opts)
-        form_tag([resource_name, :enable_authy], opts) do
+        form_tag([resource_name.to_sym, :enable_authy], opts) do
           capture(&block)
         end
       end
 
       def verify_authy_installation_form(opts = {}, &block)
         opts = default_opts.merge(opts)
-        form_tag([resource_name, :verify_authy_installation], opts) do
+        form_tag([resource_name.to_sym, :verify_authy_installation], opts) do
           capture(&block)
         end
       end

data/lib/devise-authy/mapping.rb

@@ -1,14 +1,17 @@
 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
+
+    def default_path_names(options)
+      options[:path_names] ||= {}
+      options[:path_names][:request_sms] ||= 'request-sms'
+      options[:path_names][:request_phone_call] ||= 'request-phone-call'
+      super
     end
   end
-end
+end

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

@@ -14,10 +14,10 @@ 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)
+        Devise::Models.config(self, :authy_remember_device, :authy_enable_onetouch, :authy_enable_qr_code)
       end
     end
   end

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/devise-authy/routes.rb

@@ -14,9 +14,10 @@ module ActionDispatch::Routing
       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
 
+      match "/#{mapping.path_names[:authy_onetouch_status]}", :controller => controllers[:devise_authy], :action => :GET_authy_onetouch_status, as: :authy_onetouch_status, via: :get
 
-      match "/request-sms", :controller => controllers[:devise_authy], :action => :request_sms, :as => :request_sms, :via => :post
-      match "/request-phone-call", :controller => controllers[:devise_authy], :action => :request_phone_call, :as => :request_phone_call, :via => :post
+      match "/#{mapping.path_names[:request_sms]}", :controller => controllers[:devise_authy], :action => :request_sms, :as => :request_sms, :via => :post
+      match "/#{mapping.path_names[:request_phone_call]}", :controller => controllers[:devise_authy], :action => :request_phone_call, :as => :request_phone_call, :via => :post
     end
   end
 end

data/lib/devise-authy/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module DeviseAuthy
+  VERSION = '2.3.1'
+end

data/lib/devise-authy.rb

@@ -4,8 +4,10 @@ require 'devise'
 require 'authy'
 
 module Devise
-  mattr_accessor :authy_remember_device
+  mattr_accessor :authy_remember_device, :authy_enable_onetouch, :authy_enable_qr_code
   @@authy_remember_device = 1.month
+  @@authy_enable_onetouch = false
+  @@authy_enable_qr_code = false
 end
 
 module DeviseAuthy
@@ -25,6 +27,11 @@ require 'devise-authy/routes'
 require 'devise-authy/rails'
 require 'devise-authy/models/authy_authenticatable'
 require 'devise-authy/models/authy_lockable'
+require 'devise-authy/version'
+
+Authy.user_agent = "DeviseAuthy/#{DeviseAuthy::VERSION} - #{Authy.user_agent}"
 
 Devise.add_module :authy_authenticatable, :model => 'devise-authy/models/authy_authenticatable', :controller => :devise_authy, :route => :authy
 Devise.add_module :authy_lockable,        :model => 'devise-authy/models/authy_lockable'
+
+warn "DEPRECATION WARNING: The authy-devise library is no longer actively maintained. The Authy API is being replaced by the Twilio Verify API. Please see the README for more details."

data/lib/generators/active_record/devise_authy_generator.rb

@@ -6,7 +6,17 @@ 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}.rb"
+        migration_template "migration.rb", "db/migrate/devise_authy_add_to_#{table_name}.rb", migration_version: migration_version
+      end
+
+      private
+
+      def versioned_migrations?
+        Rails::VERSION::MAJOR >= 5
+      end
+
+      def migration_version
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if versioned_migrations?
       end
     end
   end

data/lib/generators/active_record/templates/migration.rb

@@ -1,4 +1,4 @@
-class DeviseAuthyAddTo<%= table_name.camelize %> < ActiveRecord::Migration
+class DeviseAuthyAddTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def self.up
     change_table :<%= table_name %> do |t|
       t.string    :authy_id

data/lib/generators/devise_authy/devise_authy_generator.rb

@@ -1,30 +1,30 @@
+# frozen_string_literal: true
+
 module DeviseAuthy
   module Generators
     class DeviseAuthyGenerator < Rails::Generators::NamedBase
-
       namespace "devise_authy"
 
       desc "Add :authy_authenticatable directive in the given model, plus accessors. Also generate migration for ActiveRecord"
 
       def inject_devise_authy_content
-        path = File.join("app","models","#{file_path}.rb")
-        if File.exists?(path) &&
-          !File.read(path).include?("authy_authenticatable")
+        path = File.join(destination_root, "app", "models", "#{file_path}.rb")
+        if File.exist?(path) &&
+           !File.read(path).include?("authy_authenticatable")
           inject_into_file(path,
                            "authy_authenticatable, :",
                            :after => "devise :")
         end
 
-        if File.exists?(path) &&
-          !File.read(path).include?(":authy_id")
+        if File.exist?(path) &&
+           !File.read(path).include?(":authy_id")
           inject_into_file(path,
                            ":authy_id, :last_sign_in_with_authy, ",
-                           :after => "attr_accessible ") 
+                           :after => "attr_accessible ")
         end
       end
 
       hook_for :orm
-
     end
   end
 end