devise_fido_usf 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42abbd5255725a51542abfb644b763acb7d88bc0
-  data.tar.gz: d4a778d571a0d53f8b795019b7b0f4d926c74463
+  metadata.gz: 96c8b3e2463da3287d1e62f498c6ad481a98e928
+  data.tar.gz: ef2e2c7a249c4ceef0d07f2d121b45be1ae0d491
 SHA512:
-  metadata.gz: b3731b702a48ab0544f31482d1b00e6ddf3972ff22ff83fed7d098e111d5b3c4098eb2f9681bfcd179493ef4d3fe57c94027f52e88be5cdc5dcb061dc22ee69d
-  data.tar.gz: 538830aa044e285f94d089d89c8b21f7cd077f84c27fe3853409a4d790c17d068870e9f5329c77959b74efbe8baf0444734993d9e159fadc1dc51d9ba0fe5a6f
+  metadata.gz: f2b0854980aacbbc4480475d193ba47ec360f4b72729895303bbf8935d5225c38c7c63d95d52c6ce615518f430b0e7c9ef80c6d4c5e4a3c258cfce69edc42130
+  data.tar.gz: a8be7220ea71e7e0aa9655403fe0e639994a9ed4607530ecfcdebacdf2e65481bccc7185663fbc58a35eb6adc37f31a8196ee7b11e7cd9fd88c0fadb08214e72

data/app/controllers/devise/fido_usf_registrations_controller.rb

@@ -1,10 +1,10 @@
 class Devise::FidoUsfRegistrationsController < ApplicationController
-  before_action :authenticate_user!
+  before_action :authenticate_resource!
 
   def new
     @registration_requests = u2f.registration_requests
     session[:challenges] = @registration_requests.map(&:challenge)
-    key_handles = current_user.fido_usf_devices.map(&:key_handle)
+    key_handles = resource.fido_usf_devices.map(&:key_handle)
     @sign_requests = u2f.authentication_requests(key_handles)
     @app_id = u2f.app_id
     render :new
@@ -12,19 +12,21 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
 
   # Show a list of all registered devices
   def show
-    @devices = current_user.fido_usf_devices.all
+    @devices = resource.fido_usf_devices.all
     render :show
   end
 
   def destroy
-    device = current_user.fido_usf_devices.find(params[:id])
-    @fade_out_id = device.id
+    device = resource.fido_usf_devices.find(params[:id])
+    @fade_out_id = device.id unless params[:on_success_redirect_to]
     device.destroy
-    @devices = current_user.fido_usf_devices.all
+    unless params[:on_success_redirect_to]
+      @devices = resource.fido_usf_devices.all
+    end
     flash[:success] = I18n.t('fido_usf.flashs.device.removed')
     respond_to do |format|
       format.js
-      format.html { redirect_to user_fido_usf_registration_url }
+      format.html { redirect_to fido_usf_registration_url }
     end
   end
 
@@ -34,39 +36,55 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
       reg = u2f.register!(session[:challenges], response)
 
       pubkey = reg.public_key
-      pubkey = Base64.decode64(reg.public_key) unless pubkey.bytesize == 65 && pubkey.byteslice(0) != "\x04" 
-      
+      pubkey = Base64.decode64(reg.public_key) unless pubkey.bytesize == 65 && pubkey.byteslice(0) != "\x04"
+
       @device = FidoUsf::FidoUsfDevice.create!(
-          user: current_user,
-          name: "Token ##{current_user.fido_usf_devices.count+1}",
-          certificate: reg.certificate,
-          key_handle: reg.key_handle,
-          public_key: pubkey,
-          counter: reg.counter,
-          last_authenticated_at: Time.now)
+        user: resource,
+        name: "Token ##{resource.fido_usf_devices.count + 1}",
+        certificate: reg.certificate,
+        key_handle: reg.key_handle,
+        public_key: pubkey,
+        counter: reg.counter,
+        last_authenticated_at: Time.now
+      )
       flash[:success] = I18n.t('fido_usf.flashs.device.registered')
     rescue U2F::Error => e
       @error_message = "Unable to register: #{e.class.name}"
-      flash[:error] = @error_message 
+      flash[:error] = @error_message
     ensure
       session.delete(:challenges)
     end
 
     respond_to do |format|
       format.js
-      format.html { redirect_to user_fido_usf_registration_url }
+      format.html { redirect_to fido_usf_registration_url }
     end
   end
 
   def update
-    device = current_user.fido_usf_devices.find(params[:id])
+    device = resource.fido_usf_devices.find(params[:id])
     device.update!(fido_usf_params)
     respond_to do |format|
       format.js
-      format.html { redirect_to user_fido_usf_registration_url }
+      format.html { redirect_to fido_usf_registration_url }
     end
   end
 
+  if respond_to?(:helper_method)
+    helpers = %w[resource_name]
+    helper_method(*helpers)
+  end
+
+  protected
+
+  def resource_name
+    devise_mapping.name
+  end
+
+  def devise_mapping
+    @devise_mapping ||= request.env['devise.mapping']
+  end
+
   private
 
   def fido_usf_params
@@ -78,4 +96,17 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
     # use base_url as app_id, e.g. 'http://localhost:3000'
     @u2f ||= U2F::U2F.new(request.base_url)
   end
+
+  def resource
+    send("current_#{resource_name}")
+  end
+
+  def authenticate_resource!
+    send("authenticate_#{resource_name}!")
+  end
+
+  def fido_usf_registration_url
+    params[:on_success_redirect_to].presence ||
+      send("#{resource_name}_fido_usf_registration_url")
+  end
 end

data/app/views/devise/fido_usf_authentications/new.html.erb

@@ -2,7 +2,7 @@
 <p>Please insert one of your registered keys and press the button within 15 seconds</p>
 <p id="waiting">Waiting...</p>
 <p id="error" style="display: none;"></p>
-<%= form_tag user_fido_usf_authentication_path(), method: 'post' do %>
+<%= form_tag send("#{resource_name}_fido_usf_authentication_path"), method: 'post' do %>
   <%= hidden_field_tag :response %>
 <% end %>
 <script>

data/app/views/devise/fido_usf_registrations/_device.html.erb

@@ -1,5 +1,5 @@
 <tr id="device_<%= device.id %>">
   <td><%= device.name %></td>
   <td><%= l(device.last_authenticated_at, format: :long) %></td>
-  <td><%= link_to 'Delete', user_fido_usf_registration_path(id: device.id), remote: true, :method => :delete, data: {confirm: "Should device #{device.name} be deleted?" } %></td>
+  <td><%= link_to 'Delete', send("#{resource_name}_fido_usf_registration_path", id: device.id), remote: true, method: :delete, data: { confirm: "Should device #{device.name} be deleted?" } %></td>
 </tr>

data/app/views/devise/fido_usf_registrations/new.html.erb

@@ -3,7 +3,7 @@
 <p id="waiting">Waiting...</p>
 <p id="error" style="display: none;"></p>
 
-<%= form_tag user_fido_usf_registration_path(), method: 'post' do %>
+<%= form_tag send("#{resource_name}_fido_usf_registration_path"), method: 'post' do %>
   <%= hidden_field_tag :response %>
 <% end %>
 

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

@@ -2,4 +2,4 @@
 <p>List of registered devices:</p>
 <%= render 'devise/fido_usf_registrations/devices' %>
 <p><%= link_to 'Back', root_path %></p>
-<p><%= link_to 'Add', new_user_fido_usf_registration_path %></p>
+<p><%= link_to 'Add', send("new_#{resource_name}_fido_usf_registration_path") %></p>

data/lib/devise_fido_usf/controllers/helpers.rb

@@ -7,22 +7,24 @@ module DeviseFidoUsf
 
       included do
         before_action :check_request_and_redirect_to_verify_fido_usf,
-                      if: :is_user_signing_in?
+                      if: :user_signing_in?
       end
 
       private
-      def is_devise_sessions_controller?
-        self.class == Devise::SessionsController || self.class.ancestors.include?(Devise::SessionsController)
+
+      def devise_sessions_controller?
+        self.class == Devise::SessionsController ||
+          self.class.ancestors.include?(Devise::SessionsController)
       end
 
-      def is_user_signing_in?
+      def user_signing_in?
         if devise_controller? && signed_in?(resource_name) &&
-          is_devise_sessions_controller? &&
-          self.action_name == "create"
+           devise_sessions_controller? &&
+           action_name == 'create'
           return true
         end
 
-        return false
+        false
       end
 
       def check_request_and_redirect_to_verify_fido_usf

data/lib/devise_fido_usf/models/fido_usf_registerable.rb

@@ -4,7 +4,10 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        has_many :fido_usf_devices, class_name: 'FidoUsf::FidoUsfDevice', foreign_key: 'user_id', dependent: :destroy
+        has_many :fido_usf_devices,
+                 as: :user,
+                 class_name: 'FidoUsf::FidoUsfDevice',
+                 dependent: :destroy
       end
     end
   end

data/lib/devise_fido_usf/version.rb

@@ -1,3 +1,3 @@
 module DeviseFidoUsf
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_fido_usf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - H. Gregor Molter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise