google-authenticator-rails 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4d33cb46c087f9315de98ad520bdfed5d00827
-  data.tar.gz: 76e15144dc492f42822ebd9fef02f0685e7e712e
+  metadata.gz: 7590aa55a2ba14e7005c74ce65b40dbbde7b1156
+  data.tar.gz: cc80661ea84c682684a1894a91a323e41ad748eb
 SHA512:
-  metadata.gz: 7bfc4dcca348c1b11e6c9e1147c7a3447024d5dfd87a8dbf0ae2ae922c7ebaa69b75e3489784d641032e0c2f72bf42bc719dd8e34515ae0ef0fa8d8e16ea302f
-  data.tar.gz: 9f453df41489951b4926ec42d33728e163524fc75098a8c9f18a4ed9f955fbdc5aa65dc26220966e86a2c86a2ea7a37e6115655887858ced4e839664513af006
+  metadata.gz: eb2ba50e82b403794d9f8f4b2e47601526bbceb94f430732e92679abe66bf0a5faa054f2617163c51f47acb95f12fd539383c6cee3f83c24a46162cfaf9ff89a
+  data.tar.gz: cde11467ffb3ee7ff5fd5606558f8501936857e29a8580298205280911d010a5d4a386a67e4147ea2099ca57fda95a2adb97115fadcc691cb77813c25021a159

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in google-authenticator.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,109 +1,121 @@
 PATH
   remote: .
   specs:
-    google-authenticator-rails (1.6.1)
+    google-authenticator-rails (1.7.0)
       actionpack
       activerecord
       google-qr
       rails
-      rotp (= 1.6.1)
+      rotp (= 3.3.0)
+      rqrcode
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     appraisal (0.5.2)
       bundler
       rake
-    arel (8.0.0)
+    arel (9.0.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
+    chunky_png (1.3.11)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
     diff-lcs (1.1.3)
-    docile (1.1.5)
-    erubi (1.7.0)
-    globalid (0.4.1)
+    docile (1.3.1)
+    erubi (1.8.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-qr (0.2.2)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    loofah (2.2.0)
+    json (2.2.0)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nio4r (2.2.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.4)
-    rack-test (0.8.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.1.5)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (11.3.0)
-    rotp (1.6.1)
+    rotp (3.3.0)
+    rqrcode (0.10.1)
+      chunky_png (~> 1.0)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -112,12 +124,12 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -125,11 +137,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -142,7 +154,7 @@ DEPENDENCIES
   rake (~> 11.0)
   rspec (~> 2.8.0)
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.1

data/README.md

@@ -52,7 +52,7 @@ Example:
 
 ```ruby
 class User
-  acts_as_google_authenticated :column => :user_name
+  acts_as_google_authenticated :column_name => :user_name
 end
 
 @user = User.new(:user_name => "ted")
@@ -200,7 +200,7 @@ class UserMfaSession < GoogleAuthenticatorRails::Session::Base
 end
 
 # app/controllers/mfa_session_controller.rb
-def class MfaSessionController < ApplicationController
+class MfaSessionController < ApplicationController
   def create
     UserMfaSession.create(user)
   end

data/lib/google-authenticator-rails.rb

@@ -5,6 +5,7 @@ require 'active_record'
 require 'openssl'
 require 'rotp'
 require 'google-qr'
+require 'rqrcode'
 
 # Stuff the gem is
 #

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

@@ -35,6 +35,10 @@ module GoogleAuthenticatorRails # :nodoc:
         GoogleQR.new(:data => ROTP::TOTP.new(google_secret_value, :issuer => google_issuer).provisioning_uri(google_label), :size => size || self.class.google_qr_size).to_s
       end
 
+      def google_qr_to_base64(size = 200)
+        "data:image/png;base64,#{Base64.strict_encode64(RQRCode::QRCode.new(ROTP::TOTP.new(google_secret_value, :issuer => google_issuer).provisioning_uri(google_label).to_s).as_png(size: size).to_s)}"
+      end
+
       def google_label
         method = self.class.google_label_method
         case method

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

@@ -1,3 +1,3 @@
 module GoogleAuthenticatorRails
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/spec/google_authenticator_spec.rb

@@ -6,12 +6,12 @@ describe GoogleAuthenticatorRails do
 
     context 'counter = 1' do
       let(:counter) { 1 }
-      it { should == 868864 }
+      it { should == "868864" }
     end
 
     context 'counter = 2' do
       let(:counter) { 2 }
-      it { should == 304404 }
+      it { should == "304404" }
     end
   end
 
@@ -19,7 +19,7 @@ describe GoogleAuthenticatorRails do
     let(:secret)         { '5qlcip7azyjuwm36' }
     let(:original_time)  { Time.parse("2012-08-07 11:11:00 AM +0700") }
     let!(:time)          { original_time }
-    let(:code)           { 495502 }
+    let(:code)           { "495502" }
 
     before do
       Time.stub!(:now).and_return(time)
@@ -243,7 +243,7 @@ describe GoogleAuthenticatorRails do
         
         context 'custom issuer' do
           let(:user) { UserFactory.create ProcIssuerUser }
-          it { should eq "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fissuer%3DFA%2BAdmin%26secret%3D#{secret}&chs=200x200" }
+          it { should eq "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2FFA%2520Admin%3Atest%40example.com%3Fsecret%3D#{secret}%26issuer%3DFA%2BAdmin&chs=200x200" }
         end
   
         context 'method defined by symbol' do
@@ -272,6 +272,11 @@ describe GoogleAuthenticatorRails do
           subject { user.google_qr_uri('400x400') }
           it { should eq "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fsecret%3D#{secret}&chs=400x400" }
         end
+
+        context 'generates base64 image' do
+          let(:user) { UserFactory.create QrCodeUser }
+          it { user.google_qr_to_base64.include?('data:image/png;base64').should be_true }
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Jared McFarland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rqrcode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: Add the ability to use the Google Authenticator with ActiveRecord.
 email:
 - jared.online@gmail.com