devise_google_authenticator 0.3.6 → 0.3.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjMxZmMyYjM2ZWFkNzg3MGUzODE4ZGY0ODc2M2FjODBkN2M2NWJkMQ==
+  data.tar.gz: !binary |-
+    ZWVmODk0ZThjZDk4ZTA3YjFhNmNjOWJiMDZlYTZiNGIzYTY2YWYwYw==
+SHA512:
+  metadata.gz: !binary |-
+    YTk2YzQ0OGVkYzZhOTI1NTY3NjFiYmM3ZTRiMWZiOTU4YzNlZTcxYTQzNDBl
+    Y2NjMDgyYWVlYzA0ZDNlZjFkMmNmNzA3YjA2YzZiMTViMWQzMzA0MmFmNTQ5
+    YmUzOGMxYzYzNjg1NTY4NWFiMjIzZGNhNmZjM2IxMjA5ZWEwMGU=
+  data.tar.gz: !binary |-
+    YWZhM2YwNmM2MGJmYTAwZWYyZDM5Y2YxYTZlZGE3NjI2M2NiM2ZkMWM5MDg3
+    OTk4NjE2MjJhNjhhZDVjNzhjNGJhODk4MTVkZjA0MzAwNDBlODJlZGNjZjli
+    ZTY1NDA5ZGYyZGY4MDhjMmRjNjg4OWJkMWZiY2NkMGE3ODYwNzM=

data/README.rdoc

@@ -12,13 +12,14 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 * Version 0.3.4 - Updated test cases to function properly, and tested working with Devise 2.2 (up to at least Devise 2.2.4)
 * Version 0.3.5 - Updated README for Rails apps with existing users. (Thanks Jon Collier)
 * Version 0.3.6 - Slight updates - increased key size, more open gemspec, updated en.yml. (Thanks Michael Guymon)
+* Version 0.3.7 - Support for current Devise (3.2.0) and Rails4 (Thanks https://github.com/ronald05arias) - integration test still broke - need to address this
 
 == Installation
 
 Add the gem to your Gemfile (don't forget devise too):
 
 * gem 'devise'
-* gem 'devise_google_authenticator', '0.3.6'
+* gem 'devise_google_authenticator', '0.3.7'
 
 Don't forget to "bundle install"
 

data/app/controllers/devise/checkga_controller.rb

@@ -1,7 +1,9 @@
 class Devise::CheckgaController < Devise::SessionsController
+  prepend_before_filter :devise_resource, :only => [:show]
   prepend_before_filter :require_no_authentication, :only => [ :show, :update ]
+
   include Devise::Controllers::Helpers
-  
+
   def show
     @tmpid = params[:id]
     if @tmpid.nil?
@@ -10,13 +12,13 @@ class Devise::CheckgaController < Devise::SessionsController
       render :show
     end
   end
-  
+
   def update
     resource = resource_class.find_by_gauth_tmp(params[resource_name]['tmpid'])
 
     if not resource.nil?
 
-      if resource.validate_token(params[resource_name]['token'].to_i)
+      if resource.validate_token(params[resource_name]['gauth_token'].to_i)
         set_flash_message(:notice, :signed_in) if is_navigational_format?
         sign_in(resource_name,resource)
         respond_with resource, :location => after_sign_in_path_for(resource)
@@ -28,4 +30,10 @@ class Devise::CheckgaController < Devise::SessionsController
       redirect_to :root
     end
   end
+
+  private
+
+  def devise_resource
+    self.resource = resource_class.new
+  end
 end

data/app/controllers/devise/displayqr_controller.rb

@@ -1,20 +1,19 @@
 class Devise::DisplayqrController < DeviseController
   prepend_before_filter :authenticate_scope!, :only => [:show,:update]
-  
+
   include Devise::Controllers::Helpers
-  
+
   def show
-    if not resource.nil? and not resource.gauth_secret.nil?
-      render :show
-    else
+    if resource.nil? || resource.gauth_secret.nil?
       sign_in scope, resource, :bypass => true
       redirect_to stored_location_for(scope) || :root
+    else
+      render :show
     end
   end
-  
+
   def update
-    tmp = params[resource_name]
-    if resource.set_gauth_enabled(params[resource_name])
+    if resource.set_gauth_enabled(resource_params)
       set_flash_message :notice, "Status Updated!"
       sign_in scope, resource, :bypass => true
       redirect_to stored_location_for(scope) || :root
@@ -22,14 +21,23 @@ class Devise::DisplayqrController < DeviseController
       render :show
     end
   end
-    
+
   private
   def scope
     resource_name.to_sym
   end
-  
+
   def authenticate_scope!
     send(:"authenticate_#{resource_name}!")
     self.resource = send("current_#{resource_name}")
   end
+
+  def resource_params
+    return params.require(resource_name.to_sym).permit(:gauth_enabled) if strong_parameters_enabled?
+    params
+  end
+
+  def strong_parameters_enabled?
+    defined?(ActionController::StrongParameters)
+  end
 end

data/app/views/devise/checkga/show.html.erb

@@ -2,6 +2,6 @@
 
 <%= form_for(resource, :as => resource_name, :url => [resource_name, :checkga], :html => { :method => :put }) do |f| %>
 	<%= f.hidden_field :tmpid, {:value => @tmpid} %>
-	<%= f.text_field :token, :autocomplete => :off%>
+	<%= f.text_field :gauth_token, :autocomplete => :off%>
 	<p><%= f.submit I18n.t('submit_token', {:scope => 'devise'}) %></p>
 <% end %>

data/lib/devise_google_authenticatable/models/google_authenticatable.rb

@@ -18,9 +18,9 @@ module Devise # :nodoc:
         def get_qr
           self.gauth_secret
         end
-        
-        def set_gauth_enabled(param)
-          self.update_without_password(param)
+
+        def set_gauth_enabled(params)
+          self.update_without_password(params)
         end
 
         def assign_tmp
@@ -40,7 +40,7 @@ module Devise # :nodoc:
               valid_vals << ROTP::TOTP.new(self.get_qr).at(Time.now.ago(30*cc))
               valid_vals << ROTP::TOTP.new(self.get_qr).at(Time.now.in(30*cc))
             end
-            
+
             if valid_vals.include?(token.to_i)
               return true
             else

data/lib/devise_google_authenticatable/patches/check_ga.rb

@@ -19,7 +19,7 @@ module DeviseGoogleAuthenticator::Patches
           respond_with resource, :location => { :controller => 'checkga', :action => 'show', :id => tmpid}
 
         else #It's not using, or not enabled for Google 2FA - carry on, nothing to see here.
-          set_flash_message(:notice, :signed_in) if is_navigational_format?
+          set_flash_message(:notice, :signed_in) if is_flashing_format?
           sign_in(resource_name, resource)
           respond_with resource, :location => after_sign_in_path_for(resource)
         end

data/lib/devise_google_authenticatable/patches/display_qr.rb

@@ -8,17 +8,18 @@ module DeviseGoogleAuthenticator::Patches
       alias_method :create_original, :create
 
       define_method :create do
-        build_resource
+        build_resource(sign_up_params)
 
         if resource.save
+          yield resource if block_given?
           if resource.active_for_authentication?
-            set_flash_message :notice, :signed_up if is_navigational_format?
+            set_flash_message :notice, :signed_up if is_flashing_format?
             sign_in(resource_name, resource)
             
             respond_with resource, :location => {:controller => 'displayqr', :action => 'show'}
           else
-            set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
-            expire_session_data_after_sign_in!
+            set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_flashing_format?
+            expire_data_after_sign_in!
             respond_with resource, :location => after_inactive_sign_up_path_for(resource)
           end
         else

data/lib/generators/devise_google_authenticator/devise_google_authenticator_generator.rb

@@ -8,12 +8,30 @@ module DeviseGoogleAuthenticator
 
 			def inject_devise_google_authenticator_content
 				path = File.join("app","models","#{file_path}.rb")
-				inject_into_file(path, "google_authenticatable, :", :after => "devise :") if File.exists?(path)
-				inject_into_file(path, "gauth_enabled, :gauth_tmp, :gauth_tmp_datetime, :", :after => "attr_accessible :") if File.exists?(path)
+
+				if File.exists?(path)
+				  inject_into_file(path, "google_authenticatable, :", :after => "devise :")
+				  inject_into_file(path, "gauth_enabled, :gauth_tmp, :gauth_tmp_datetime, :", :after => "attr_accessible :") if needs_attr_accessible?
+				  inject_into_class(path, class_name, "\tattr_accessor :gauth_token\n")
+				end
 			end
 
 			hook_for :orm
 
+			private
+
+			def needs_attr_accessible?
+        rails_3? && !strong_parameters_enabled?
+      end
+
+      def rails_3?
+        Rails::VERSION::MAJOR == 3
+      end
+
+      def strong_parameters_enabled?
+        defined?(ActionController::StrongParameters)
+      end
+
 		end
 	end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.6
-  prerelease: 
+  version: 0.3.7
 platform: ruby
 authors:
 - Christian Frichot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,55 +27,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,26 +114,25 @@ files:
 homepage: http://github.com/AsteriskLabs/devise_google_authenticator
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Devise Google Authenticator Extension
 test_files: []