devise_userbin 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e7891185009c513f974cba6f1aa79226bdb1cd8
-  data.tar.gz: 416d1088047d4101aa81ecb43ec45706be635f6c
+  metadata.gz: aed4286abbffee0cfd7d4ca3777ac65f34d0425e
+  data.tar.gz: 0d4847b20c06c6a08cb3e0b6aa5806def5de80c0
 SHA512:
-  metadata.gz: 7254079fc997abf92336e4bd282235c1345c161a5da7c232f30afa4675d5d8d5c15238b5ba539ad20970b494f518131682414350f3c3765d5fd758ee72c0f506
-  data.tar.gz: 6e7e673284ee6b43412868687af020dead62fd5d1e9917a18e17669dadb85e1acf21bf02de7f02128487f629643a80cfef462134a5244475ba1a5509b6dacb33
+  metadata.gz: 8e6570a7b3bc6625536051544c9b74b449901928b9f7277ff8296a85d84a7a7efb0e64780caba35de8469392faa42d429f1bd6abfd15241f714d722798d8d4c7
+  data.tar.gz: d46d32140092bd00a8e51260fdb9b3114d7b17def0ffa2b1a1104ca465a096c6d3e93f63a1ea561aab7b2489c29a8d77d774b1e5202c08bc2ac32d763471cef8

data/app/controllers/devise/devise_userbin_controller.rb

@@ -17,6 +17,8 @@ class Devise::DeviseUserbinController < DeviseController
 
     # Prevent "undefined method `errors' for nil:NilClass"
     self.resource = resource_class.new
+
+    render action: "#{@challenge.delivery_method}/edit"
   end
 
   def update

data/app/views/devise/two_factor_authentication/authenticator/edit.html.erb

@@ -0,0 +1,13 @@
+<h2><%= t "devise.two_factor_authentication.header" %></h2>
+
+<p><%= t "devise.two_factor_authentication.edit.authenticator.instructions" %></p>
+
+<%= form_tag([resource_name, :two_factor_authentication], :method => :put) do %>
+  <%= devise_error_messages! %>
+  <p><%= label_tag :code, t("devise.two_factor_authentication.edit.common.code_label") %><br />
+  <%= text_field_tag :code %>
+  <%= hidden_field_tag(:challenge_id, @challenge.id) %>
+  <p><%= submit_tag t("devise.two_factor_authentication.edit.common.submit_button") %></p>
+<% end -%>
+
+<p><%= t "devise.two_factor_authentication.edit.common.recovery_message" %>

data/app/views/devise/two_factor_authentication/sms/edit.html.erb

@@ -0,0 +1,16 @@
+<h2><%= t "devise.two_factor_authentication.header" %></h2>
+
+<p>
+  <%= t "devise.two_factor_authentication.edit.sms.instructions" %>
+  <%= link_to t("devise.two_factor_authentication.edit.sms.resend"), send("new_#{resource_name}_two_factor_authentication_path") %>.
+</p>
+
+<%= form_tag([resource_name, :two_factor_authentication], :method => :put) do %>
+  <%= devise_error_messages! %>
+  <p><%= label_tag :code, t("devise.two_factor_authentication.edit.common.code_label") %><br />
+  <%= text_field_tag :code %>
+  <%= hidden_field_tag(:challenge_id, @challenge.id) %>
+  <p><%= submit_tag t("devise.two_factor_authentication.edit.common.submit_button") %></p>
+<% end -%>
+
+<p><%= t "devise.two_factor_authentication.edit.common.recovery_message" %>

data/app/views/devise/two_factor_authentication/yubikey/edit.html.erb

@@ -0,0 +1,13 @@
+<h2><%= t "devise.two_factor_authentication.header" %></h2>
+
+<p><%= t "devise.two_factor_authentication.edit.yubikey.instructions" %></p>
+
+<%= form_tag([resource_name, :two_factor_authentication], :method => :put) do %>
+  <%= devise_error_messages! %>
+  <p><%= label_tag :code, t("devise.two_factor_authentication.edit.common.code_label") %><br />
+  <%= text_field_tag :code %>
+  <%= hidden_field_tag(:challenge_id, @challenge.id) %>
+  <p><%= submit_tag t("devise.two_factor_authentication.edit.common.submit_button") %></p>
+<% end -%>
+
+<p><%= t "devise.two_factor_authentication.edit.common.recovery_message" %>

data/lib/devise_userbin.rb

@@ -15,9 +15,6 @@ module DeviseUserbin
   module Controllers
     autoload :Helpers, 'devise_userbin/controllers/helpers'
   end
-  module Views
-    autoload :Helpers, 'devise_userbin/controllers/view_helpers'
-  end
 end
 
 if defined?(Rails::Railtie)

data/lib/devise_userbin/railtie.rb

@@ -3,8 +3,5 @@ module DeviseUserbin
     ActiveSupport.on_load(:action_controller) do
       include DeviseUserbin::Controllers::Helpers
     end
-    ActiveSupport.on_load(:action_view) do
-      include DeviseUserbin::Views::Helpers
-    end
   end
 end

data/lib/devise_userbin/routes.rb

@@ -4,8 +4,6 @@ module ActionDispatch::Routing
 
     def devise_userbin(mapping, controllers)
       resources :two_factor_authentication, :only => [:new, :show, :update, :edit], :path => mapping.path_names[:two_factor_authentication], :controller => controllers[:two_factor_authentication]
-
-      resource :security_settings, :only => [:show], :path => mapping.path_names[:security_settings], :controller => controllers[:security_settings]
     end
   end
 end

data/lib/devise_userbin/version.rb

@@ -1,3 +1,3 @@
 module DeviseUserbin
-  VERSION = "0.5.1".freeze
+  VERSION = "0.5.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_userbin
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -88,12 +88,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/devise/devise_userbin_controller.rb
-- app/controllers/devise/security_settings_controller.rb
 - app/controllers/devise/two_factor_authentication_controller.rb
-- app/views/devise/two_factor_authentication/edit.html.erb
+- app/views/devise/two_factor_authentication/authenticator/edit.html.erb
+- app/views/devise/two_factor_authentication/sms/edit.html.erb
+- app/views/devise/two_factor_authentication/yubikey/edit.html.erb
 - lib/devise_userbin.rb
 - lib/devise_userbin/controllers/helpers.rb
-- lib/devise_userbin/controllers/view_helpers.rb
 - lib/devise_userbin/hooks.rb
 - lib/devise_userbin/import.rb
 - lib/devise_userbin/model.rb

data/app/controllers/devise/security_settings_controller.rb

@@ -1,7 +0,0 @@
-class Devise::SecuritySettingsController < DeviseController
-  include Devise::Controllers::Helpers
-
-  def show
-    redirect_to env['userbin'].security_settings_url
-  end
-end

data/app/views/devise/two_factor_authentication/edit.html.erb

@@ -1,13 +0,0 @@
-<h2><%= t "devise.two_factor_authentication.show.header" %></h2>
-
-<p><%= t "devise.two_factor_authentication.show.instructions" %></p>
-
-<%= form_tag([resource_name, :two_factor_authentication], :method => :put) do %>
-  <%= devise_error_messages! %>
-  <p><%= label_tag :code, t("devise.two_factor_authentication.show.code_label") %><br />
-  <%= text_field_tag :code %>
-  <%= hidden_field_tag(:challenge_id, @challenge.id) %>
-  <p><%= submit_tag t("devise.two_factor_authentication.show.submit_button") %></p>
-<% end -%>
-
-<p><%= t "devise.two_factor_authentication.show.recovery_message" %>

data/lib/devise_userbin/controllers/view_helpers.rb

@@ -1,13 +0,0 @@
-module DeviseUserbin
-  module Views
-    module Helpers
-
-      def security_page_url(opts = {})
-        scope = opts[:scope] || ::Devise.default_scope
-        session_token = session["#{scope}_userbin"]
-        Userbin.security_page_url(session_token)
-      end
-
-    end
-  end
-end