active_model_otp 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f10c7c77b302adbd5a02bb37378c46eafd0d6aaf53f2f5ec7ac069bd888ab07
-  data.tar.gz: 2572cac964589cc665f0a0dbaacaa7ca8fc226cef62ebeb122e591c487b6278d
+  metadata.gz: 973b2897bf7c434844a9ec652c599705fbfe6def2da99b20302059047ba960d1
+  data.tar.gz: 4ac0735f61e0d74109ec39d4a6b7504028a76d2ab74f31bde8e90dbd9625a61a
 SHA512:
-  metadata.gz: e78abb140e71aca80842a896ef02abad3df97be46b57e096056b8480c150aa5c8c633725cb8d0aaa49eaf9e26b5846741ac9eb6b99a963f59a7b835e88101605
-  data.tar.gz: 9d7d0fef52db81c831a728808b5768714fcbc64df126a65832a9ed86769379e4ee007f894193183a536ba2d1ea32343f77537fb732bd84de2168e75b02202bef
+  metadata.gz: 53612a20dc401b03c051c48450e7161388fed1ab5d2c7d43ebcf12dbec82ca8f12e05d033237f505257d79c4e3ba9861fe5bdae943280e0b625ebb9a0bb95e2d
+  data.tar.gz: 2cbb80548cccb92ff3ed398671c65aa600adc32de84a95b91287de67a4a7fbac45cf97d2d1d311bc1fc141cdb630a1a4e803a3785e79449ec00fea8ce3db5f2c

data/.travis.yml

@@ -9,13 +9,13 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.0.rc1.gemfile
+  - gemfiles/rails_6.0.gemfile
 matrix:
   exclude:
     - rvm: 2.3
-      gemfile: gemfiles/rails_6.0.0.rc1.gemfile
+      gemfile: gemfiles/rails_6.0.gemfile
     - rvm: 2.4
-      gemfile: gemfiles/rails_6.0.0.rc1.gemfile
+      gemfile: gemfiles/rails_6.0.gemfile
   fast_finish: true
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -17,9 +17,9 @@ appraise "rails-5.2" do
   gem "activemodel-serializers-xml"
 end
 
-appraise "rails-6.0.0.rc1" do
-  gem "activerecord", "6.0.0.rc1"
-  gem "activemodel", "6.0.0.rc1"
+appraise "rails-6.0" do
+  gem "activerecord", "~> 6.0"
+  gem "activemodel", "~> 6.0"
   gem "activemodel-serializers-xml"
   gem "sqlite3", "~> 1.4"
 end

data/CHANGELOG.md

@@ -1,17 +1 @@
-# v1.2.0
-- Added Counter based OTP (HOTP) (@ResultsMayVary ) https://github.com/heapsource/active_model_otp/pull/19
-- Adding options to provisioning uri, so we can include issuer (@doon) https://github.com/heapsource/active_model_otp/pull/15
-
-# v1.1.0
-- Add function to re-geterante the OTP secret (@TikiTDO) https://github.com/heapsource/active_model_otp/pull/14
-- Added option to pass OTP length (@shivanibhanwal) https://github.com/heapsource/active_model_otp/pull/13
-
-# v1.0.0
-- Avoid overriding predefined otp_column value when initializing resource (Ilan Stern) https://github.com/heapsource/active_model_otp/pull/10
-- Pad OTP codes with less than 6 digits (Johan Brissmyr) https://github.com/heapsource/active_model_otp/pull/7
-- Get rid of deprecation warnings in Rails 4.1 (Nick DeMonner)
-
-# v0.1.0
-- OTP codes can be in 5 or 6 digits (André Luis Leal Cardoso Junior)
-- Require 'cgi', rotp needs it for encoding parameters (André Luis Leal Cardoso Junior)
-- Change column name for otp secret key (robertomiranda)
+CHANGELOG it's been deprecated in favor of https://github.com/heapsource/active_model_otp/releases

data/README.md

@@ -5,11 +5,12 @@
 
 # ActiveModel::Otp
 
-**ActiveModel::Otp** makes adding **Two Factor Authentication** (TFA) to a model simple. Let's see what's required to get AMo::Otp working in our Application, using Rails 5.0 (AMo::Otp is also compatible with Rails 4.x versions). We're going to use a User model and try to add options provided by **ActiveMOdel::Otp**. Inspired by AM::SecurePassword
+**ActiveModel::Otp** makes adding **Two Factor Authentication** (TFA) to a model simple. Let's see what's required to get AMo::Otp working in our Application, using Rails 5.0 (AMo::Otp is also compatible with Rails 4.x versions). We're going to use a User model and try to add options provided by **ActiveModel::Otp**. Inspired by AM::SecurePassword
 
 ## Dependencies
 
 * [ROTP](https://github.com/mdp/rotp) 5.0 or higher
+* Ruby 2.3 or greater
 
 ## Installation
 

data/active_model_otp.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "activemodel"
   spec.add_dependency "rotp", "~> 5.0.0"

data/gemfiles/{rails_6.0.0.rc1.gemfile → rails_6.0.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "6.0.0.rc1"
-gem "activemodel", "6.0.0.rc1"
+gem "activerecord", "~> 6.0"
+gem "activemodel", "~> 6.0"
 gem "activemodel-serializers-xml"
 gem "sqlite3", "~> 1.4"
 

data/lib/active_model/one_time_password.rb

@@ -15,7 +15,7 @@ module ActiveModel
 
         include InstanceMethodsOnActivation
 
-        before_create do
+        before_create(options.slice(:if, :unless)) do
           self.otp_regenerate_secret if !otp_column
           self.otp_regenerate_counter if otp_counter_based && !otp_counter
         end
@@ -49,7 +49,7 @@ module ActiveModel
           result = hotp.verify(code, otp_counter)
           if result && options[:auto_increment]
             self.otp_counter += 1
-            save if respond_to?(:new_record) && !new_record?
+            save if respond_to?(:changed?) && !new_record?
           end
           result
         else
@@ -66,7 +66,7 @@ module ActiveModel
         if otp_counter_based
           if options[:auto_increment]
             self.otp_counter += 1
-            save if respond_to?(:new_record) && !new_record?
+            save if respond_to?(:changed?) && !new_record?
           end
           ROTP::HOTP.new(otp_column, digits: otp_digits).at(self.otp_counter)
         else

data/lib/active_model/otp/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Otp
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

data/test/models/opt_in_two_factor.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class OptInTwoFactor
+  extend ActiveModel::Callbacks
+  include ActiveModel::Validations
+  include ActiveModel::OneTimePassword
+
+  define_model_callbacks :create
+  attr_accessor :otp_secret_key, :email
+
+  has_one_time_password unless: :otp_opt_in?
+
+  def otp_opt_in?
+    true
+  end
+end

data/test/one_time_password_test.rb

@@ -17,6 +17,10 @@ class OtpTest < MiniTest::Unit::TestCase
     @ar_user = ActiverecordUser.new
     @ar_user.email = 'roberto@heapsource.com'
     @ar_user.run_callbacks :create
+
+    @opt_in = OptInTwoFactor.new
+    @opt_in.email = 'roberto@heapsource.com'
+    @opt_in.run_callbacks :create
   end
 
   def test_authenticate_with_otp
@@ -49,6 +53,14 @@ class OtpTest < MiniTest::Unit::TestCase
     assert code != @ar_user.otp_code(auto_increment: true)
   end
 
+  def test_opt_in_two_factor
+    assert @opt_in.otp_column.nil?
+
+    @opt_in.otp_regenerate_secret
+    code = @opt_in.otp_code
+    assert @opt_in.authenticate_otp(code)
+  end
+
   def test_authenticate_with_otp_when_drift_is_allowed
     code = @user.otp_code(Time.now - 30)
     assert @user.authenticate_otp(code, drift: 60)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_model_otp
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Guillermo Iguaran
 - Roberto Miranda
 - Heapsource
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -133,12 +133,13 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.0.rc1.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/active_model/one_time_password.rb
 - lib/active_model/otp/version.rb
 - lib/active_model_otp.rb
 - test/models/activerecord_user.rb
 - test/models/member.rb
+- test/models/opt_in_two_factor.rb
 - test/models/user.rb
 - test/models/visitor.rb
 - test/one_time_password_test.rb
@@ -148,7 +149,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,20 +157,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Adds methods to set and authenticate against one time passwords.
 test_files:
 - test/models/activerecord_user.rb
 - test/models/member.rb
+- test/models/opt_in_two_factor.rb
 - test/models/user.rb
 - test/models/visitor.rb
 - test/one_time_password_test.rb