google-authenticator-rails 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ae116066dcdcca361997f0f22706e59454f8b4b
-  data.tar.gz: 6fb7e9435cdd2e8e69cd90e294fde9c0780587b5
+  metadata.gz: 19391728ca506273484c8691492ba1a09b2024ae
+  data.tar.gz: 57e4b1ce9b77074db2be9212b73a6a8f6f43ee02
 SHA512:
-  metadata.gz: 0aeaee230b02e18fdcc3d7eddd7e891329d5420af79b0be27d6ad1b6e1c844586e492b66997b86482d6a5c82a2d542e163e484f3eae31e797542e92a0b289ab7
-  data.tar.gz: db86ad2e95458da74abffd87f401a5406793146dc4354536e53f8db111b01fc57379ba65a6cf8430c50b968c2c57e3289f4d874482dbd0036a40f3297661e305
+  metadata.gz: e87812aca056ca5be5474fd3384bc7851104254db7b325949988e16fa3ac12546b6581f8394d301a8b3f800a6a305404dcb766f16d609756a285ee3806ed7b04
+  data.tar.gz: d13dd058fb08ab3dba40d126daabaaf2e52ad0c8c59124f099cab59dac30437268f01b3315443c5bf0b8a294d3c3b0bb01a99eecd0910a1c7a1a3f4ce9114e8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google-authenticator-rails (1.5.1)
+    google-authenticator-rails (1.6.0)
       actionpack
       activerecord
       google-qr

data/README.md

@@ -222,6 +222,14 @@ class User
 end
 ```
 
+You can also use a Proc to set a dynamic issuer for multi-tenant applications or any other custom needs:
+
+```ruby
+class User
+  acts_as_google_authenticated :issuer => Proc.new { |user| user.admin? ? "Example Admin" : "example.com" }
+end
+```
+
 This way your user will have the name of your site at the authenticator card besides the current token.
 
 Here's what the issuers look like in Google Authenticator for iPhone:

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

@@ -72,7 +72,8 @@ module GoogleAuthenticatorRails # :nodoc:
       end
 
       def google_issuer
-        self.class.google_issuer
+        issuer = self.class.google_issuer
+        issuer.is_a?(Proc) ? issuer.call(self) : issuer
       end
       
       def google_secret_encryptor

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

@@ -1,3 +1,3 @@
 module GoogleAuthenticatorRails
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/spec/google_authenticator_spec.rb

@@ -237,9 +237,14 @@ describe GoogleAuthenticatorRails do
         end
   
         context 'custom proc' do
-          let(:user) { UserFactory.create ProcUser }
+          let(:user) { UserFactory.create ProcLabelUser }
           it { should eq "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest_user%40futureadvisor-admin%3Fsecret%3D#{secret}&chs=200x200" }
         end
+        
+        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" }
+        end
   
         context 'method defined by symbol' do
           let(:user) { UserFactory.create SymbolUser }

data/spec/spec_helper.rb

@@ -117,10 +117,17 @@ class DriftUser < BaseUser
   acts_as_google_authenticated :drift => 31
 end
 
-class ProcUser < BaseUser
+class ProcLabelUser < BaseUser
   acts_as_google_authenticated :method => Proc.new { |user| "#{user.user_name}@futureadvisor-admin" }
 end
 
+class ProcIssuerUser < BaseUser
+  acts_as_google_authenticated :issuer => Proc.new { |user| user.admin? ? "FA Admin" :  "FutureAdvisor" }
+  def admin?
+    true
+  end
+end
+
 class SymbolUser < BaseUser
   acts_as_google_authenticated :method => :email
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jared McFarland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp
@@ -177,7 +177,6 @@ files:
 - lib/google-authenticator-rails/session/base.rb
 - lib/google-authenticator-rails/session/persistence.rb
 - lib/google-authenticator-rails/version.rb
-- lib/tasks/google_authenticator.rake
 - spec/action_controller/integration_spec.rb
 - spec/action_controller/rails_adapter_spec.rb
 - spec/google_authenticator_spec.rb

data/lib/tasks/google_authenticator.rake

@@ -1,55 +0,0 @@
-namespace :google_authenticator do
-
-  def do_encrypt(args, already_encrypted, op_name)
-    model_names = if args[:optional_model_list]
-                    args.extras.unshift(args[:optional_model_list])
-                  else
-                    # Adapted from https://stackoverflow.com/a/8248849/7478194
-                    Dir[Rails.root.join('app/models/*.rb').to_s].map { |filename| File.basename(filename, '.rb').camelize }
-                  end
-    
-    ActiveRecord::Base.transaction do
-      match_op = " = #{already_encrypted ? 138 : 16}"
-      model_names.each do |model_name|
-        klass = model_name.constantize
-        next unless klass.ancestors.include?(ActiveRecord::Base) && klass.try(:google_secrets_encrypted)
-        print "#{op_name}ing model #{klass.name.inspect} (table #{klass.table_name.inspect}): "
-        count = 0
-        klass.where("LENGTH(#{klass.google_secret_column})#{match_op}").find_each do |record|
-          yield record
-          count += 1
-        end
-        puts "#{count} #{'secret'.pluralize(count)} #{op_name}ed"
-      end
-    end
-  end
-  
-  desc 'Encrypt all secret columns (add the :encrypt_secrets options *before* running)'
-  task :encrypt_secrets, [:optional_model_list] => :environment do |_t, args|
-    do_encrypt(args, false, 'Encrypt') { |record| record.encrypt_google_secret! }
-  end
-
-  desc 'Re-encrypt all secret columns from old_secret_key_base to secret_key_base'
-  task :reencrypt_secrets, [:optional_model_list] => :environment do |_t, args|
-    if Rails.application.secrets.old_secret_key_base.blank?
-      puts 'old_secret_key_base is not set in config/secrets.yml'
-    else
-      secret_encryptor = GoogleAuthenticatorRails::ActiveRecord::Helpers.get_google_secret_encryptor
-      Rails.application.secrets[:secret_key_base] = Rails.application.secrets.old_secret_key_base
-      Rails.application.instance_eval { @caching_key_generator = nil }
-      old_secret_encryptor = GoogleAuthenticatorRails::ActiveRecord::Helpers.get_google_secret_encryptor
-      do_encrypt(args, true, 'Re-encrypt') do |record|
-        GoogleAuthenticatorRails.secret_encryptor = old_secret_encryptor
-        plain_secret = record.google_secret_value
-        GoogleAuthenticatorRails.secret_encryptor = secret_encryptor
-        record.send(:change_google_secret_to!, plain_secret)
-      end
-    end
-  end
-  
-  desc 'Decrypt all secret columns (remove the :encrypt_secrets options *after* running)'
-  task :decrypt_secrets, [:optional_model_list] => :environment do |_t, args|
-    do_encrypt(args, true, 'Decrypt') { |record| record.send(:change_google_secret_to!, record.google_secret_value, false) }
-  end  
-
-end