google-authenticator-rails 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b166a6bb508dae264da9d9a11aaaf2fc0c84399f9599ead910e93b1b93ad97b
-  data.tar.gz: dc328e98ce471ee1dc50d58ea933ff4982587720d114940c09fa31d6fcfe06dc
+  metadata.gz: 9ffad5bfabf4feb99336e67a1993f8cee9dcbf83878d643ca2f2ce15251e4829
+  data.tar.gz: 89dedb7cc930bbdd3d24e051f076774b3e24a4773c36e78647f3f326a2be311d
 SHA512:
-  metadata.gz: d1be216b0e4ef6f48ac16116942b5a41d5f5db883ebe80a6c37a16f08b65e303ea5a057a923cae81aae8c98962d7f5e254240e7b25c1037c2409d58e63b14804
-  data.tar.gz: c73fa8cbcbc860f52d59d5b4b14418ab889bc33c927a3d918fb74e47b5d2d21742e84dc15866c43ef74da2472fdb033e3e583fa5f685c9bd1d39cfb6d8279ea1
+  metadata.gz: 10456cb6cac6702c6dfe929790f7ee27219fc25757d22501c327c47c889f939c08736900422fbc436b4acd11386c1c75ac34ee685a788f404bba2a01b001a3d7
+  data.tar.gz: 696573e146ab6b003e323a056170c31a173c99a30da41f8b3ff53ecd0066d471997b93291295ef465e46c80ac23871ad67ab06c011ee555bc19c4f0c98f47dcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google-authenticator-rails (3.2.0)
+    google-authenticator-rails (3.3.0)
       actionpack
       activerecord
       rails
@@ -82,7 +82,7 @@ GEM
       thor (>= 0.14.0)
     builder (3.2.4)
     chunky_png (1.4.0)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     date (3.3.3)
     diff-lcs (1.5.0)
@@ -103,8 +103,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    minitest (5.18.0)
     net-imap (0.3.4)
       date
       net-protocol
@@ -115,11 +114,10 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.14.2-arm64-darwin)
       racc (~> 1.4)
     racc (1.6.2)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.4.2)
@@ -167,13 +165,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     thor (1.2.1)
     timeout (0.3.2)
     tzinfo (2.0.6)
@@ -184,7 +182,8 @@ GEM
     zeitwerk (2.6.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   appraisal (~> 2.4.1)

data/lib/google-authenticator-rails/action_controller/rails_adapter.rb

@@ -37,5 +37,11 @@ module GoogleAuthenticatorRails
 end
 
 ActiveSupport.on_load(:action_controller) do
-  ActionController::Base.send(:include, GoogleAuthenticatorRails::ActionController::Integration)
+  if defined?(ActionController::Base)
+    ActionController::Base.send(:include, GoogleAuthenticatorRails::ActionController::Integration)
+  end
+  
+  if defined?(ActionController::API)
+    ActionController::API.send(:include, GoogleAuthenticatorRails::ActionController::Integration)
+  end
 end

data/lib/google-authenticator-rails/active_record/helpers.rb

@@ -28,7 +28,9 @@ module GoogleAuthenticatorRails # :nodoc:
       end
 
       def google_authentic?(code)
-        GoogleAuthenticatorRails.valid?(code, google_secret_value, self.class.google_drift)
+        raise ArgumentError, "Can't authenticate before google secret is set!" unless google_secret_value.present?
+
+        GoogleAuthenticatorRails.valid?(code.to_s, google_secret_value, self.class.google_drift)
       end
 
       def google_qr_uri(size = nil)

data/lib/google-authenticator-rails/version.rb

@@ -1,3 +1,3 @@
 module GoogleAuthenticatorRails
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/spec/google_authenticator_spec.rb

@@ -80,6 +80,12 @@ describe GoogleAuthenticatorRails do
         end
       end
 
+      context 'integer code validation' do
+        subject { user.google_authentic?(code.to_i) }
+
+        it { should be true }
+      end
+
       it 'creates a secret' do
         user.set_google_secret
         user.google_secret.should == secret
@@ -90,6 +96,12 @@ describe GoogleAuthenticatorRails do
           @user.clear_google_secret!
           @user.google_secret_value.should(be_nil) && @user.reload.google_secret_value.should(be_nil)
         end
+
+        it 'raises exception when checking authenticity' do
+          @user.clear_google_secret!
+
+          expect { @user.google_authentic?(code) }.to raise_error(ArgumentError)
+        end
       end
 
       it_behaves_like 'handles nil secrets'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jared McFarland
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp