devise_google_authenticator 0.3.13 → 0.3.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhhMWQ5M2IxNzA4MGFhYzAzMTE2ZGIyMmZhOTIwOWFkOGQyNjBmNQ==
+    YmRjYzlmZjk0NzUzMzM3ZjMyZGQwZTM2ZmVjNzQ0ODAwYWVlMWViMA==
   data.tar.gz: !binary |-
-    ZDkwNGI3MjgxM2UyZmZlNzAyNGIzNWRiMjhlMmEzMTcyOTRiMjZmOA==
+    ZDVkYzFlYTczZjNkNWQwZDNiNzJmZDM5YWJmOGZmOTM0YzI2NDE3MQ==
 SHA512:
   metadata.gz: !binary |-
-    M2E1YjM1ZmMwNmNiZjI4NGUwNjI1MGIxOTNlZmE0NzExMjAyNWRjNTIxNzIy
-    NTk3ZTAyMGFjYmY4Y2UyYWQyYmQxNzcyM2NlMWZjYmIwNTY1NzRkMDliNjBl
-    Yzc4OWYyZDZlOTE3ZjUwMjJjNmY5NjFlOGY3ZTliOTk0MmRiMDI=
+    YjZjNGJjNTg4YzJkNDAxZDAzNTBmMDQ3ZWU4MjdjYzA1YWIxZWZkY2Q5YTI2
+    NDMyMTFlYWY4NDcwZDJjNDBhMjRhMDY4NmMzN2YzNmJkMWE3Y2I1NjlkMzQ5
+    M2Y4M2NlMzc4YWNmMWYyMWU1NjFkZDMwODc1ZWFmYjkyM2U4NmE=
   data.tar.gz: !binary |-
-    MTNlNjRiZGUzNTg3YTRiNDZiMDQzZDAyYWE2NDEyMjY0ZmVhZTI0NDhhY2U2
-    OTdiZjk1OGUyYWM2OTRjMmFmY2I1NTFjZmVmZWUwNDVjMTEyOGFlOGU0OTkx
-    YTYxNTdkNmNmZDJjZTg5Y2Y0NDdiZDBkYzM1MWQ1MmZkZDM4MjU=
+    MDUxYWZhY2I3YTk0YzAxNmVjNzM5YWE3ZWE0NjI4MWZkZmNmNmFkY2QyZjkw
+    MjY4YjJkODZkNzVhYzNjMWQwNjM3ZDQ4YjA2ZjFmYWU2MGZiMmM2MTRmYmE2
+    NThkYjMwNjYwODg5MTE3ZGUyZjY0YjE0ZmIyOTU0MGQ2MDY0YjI=

data/README.rdoc

@@ -7,7 +7,7 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 Add the gem to your Gemfile (don't forget devise too):
 
 * gem 'devise'
-* gem 'devise_google_authenticator', '0.3.13'
+* gem 'devise_google_authenticator', '0.3.14'
 
 Don't forget to "bundle install"
 
@@ -79,6 +79,7 @@ With this extension enabled, the following is expected behaviour:
 The install generator also installs an english copy of a Devise Google Authenticator i18n file. This can be modified (or used to create other language versions) and is located at: config/locales/devise.google_authenticator.en.yml
 
 == Changes
+* Version 0.3.14 - Users can now generate a new token if they wish. This is available from the displayqr page.
 * Version 0.3.13 - Merged a feature to allow a qualifier for the Google Authenticator token display. This allows you to specify in your view a qualifier for the name of the OTP when it's enrolled into the Google Authenticator app. Thanks Michael Guymon for the pull.
 * Version 0.3.12 - Re-introduced Warden's after_authentication callback. Thanks Sunny Ng for the pull.
 * Version 0.3.11 - Fixed a bug where if the Devise module was included within something else, such as Active Admin, rewriting back to the CheckGA functionality was broken. This update addresses https://github.com/AsteriskLabs/devise_google_authenticator/issues/7

data/app/controllers/devise/displayqr_controller.rb

@@ -1,8 +1,9 @@
 class Devise::DisplayqrController < DeviseController
-  prepend_before_filter :authenticate_scope!, :only => [:show,:update]
+  prepend_before_filter :authenticate_scope!, :only => [:show,:update,:refresh]
 
   include Devise::Controllers::Helpers
 
+  # GET /resource/displayqr
   def show
     if resource.nil? || resource.gauth_secret.nil?
       sign_in scope, resource, :bypass => true
@@ -22,6 +23,18 @@ class Devise::DisplayqrController < DeviseController
     end
   end
 
+  def refresh
+    unless resource.nil?
+      resource.send(:assign_auth_secret)
+      resource.save
+      set_flash_message :notice, :newtoken
+      sign_in scope, resource, :bypass => true
+      redirect_to [resource_name, :displayqr]
+    else
+      redirect_to :root
+    end
+  end
+
   private
   def scope
     resource_name.to_sym

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

@@ -2,6 +2,10 @@
 
 <%= google_authenticator_qrcode(resource) %>
 
+<%= form_for(resource, :as => resource_name, :url => [:refresh, resource_name, :displayqr], :html => {:method => :post}) do |f|%>
+	<p><%= f.submit I18n.t('newtoken', {:scope => 'devise.registration'}) %></p>
+<% end %>
+
 <%= form_for(resource, :as => resource_name, :url => [resource_name, :displayqr], :html => { :method => :put }) do |f| %>
 	<%= devise_error_messages! %>
 	<h3><%= I18n.t('nice_request', {:scope => 'devise.registration'}) %></h3>
@@ -9,4 +13,5 @@
 	<%= f.check_box :gauth_enabled %></p>
 	
 	<p><%= f.submit I18n.t('submit', {:scope => 'devise.registration'}) %></p>
-<% end %>
+<% end %>
+

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
       nice_request: "Would you like to enable Google Authenticator?"
       qrstatus: "Google Authenticator Status:"
       submit: "Continue..."
+      newtoken: "Generate new token"
     checkga:
       user:
         signed_in: "Signed in successfully from token."
@@ -14,3 +15,4 @@ en:
     displayqr:
       user:
         status: "User status updated!"
+        newtoken: "You have updated to a new token - make sure you update your Google Authenticator application before continuing!!"

data/lib/devise_google_authenticatable/routes.rb

@@ -5,7 +5,9 @@ module ActionDispatch::Routing # :nodoc:
 
     # route for handle expired passwords
     def devise_displayqr(mapping, controllers)
-      resource :displayqr, :only => [:show, :update], :path => mapping.path_names[:displayqr], :controller => controllers[:displayqr]
+      resource :displayqr, :only => [:show, :update], :path => mapping.path_names[:displayqr], :controller => controllers[:displayqr] do
+      	post :refresh, :path => mapping.path_names[:refresh], :as => :refresh
+      end
       resource :checkga, :only => [:show, :update], :path => mapping.path_names[:checkga], :controller => controllers[:checkga]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Christian Frichot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties