devise_castle 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11441b475e2a3779ffeb4e472102fee53be6b6d3
-  data.tar.gz: a55719dab35fdad730480fb9b9ecbfdbf23d0055
+  metadata.gz: 80523e6589fed7b828f62fa4d08714082f4c2ea9
+  data.tar.gz: 6d102ea40c2ab3dc6256fe475087ebbd27abf99c
 SHA512:
-  metadata.gz: c3e44229cca590b5cf16894eeefd38f8adad78c6e1601bbbe68f023c34e95c8cbe7b1fa562cab1d2a0e2e012eaabedf3e0d3aaac1fc5d336746f8ce3a1f89f2a
-  data.tar.gz: eb1aa0fd1fb6d306e3754ceabfff934064d86b292d88fd4e953327428064dd2dd274076bc3ef3aeab4938d5991c147eb3e6c448927e0f1982eb410d920bf46d4
+  metadata.gz: b1825ede77b3cbd3d59334c8d9dbcdf65dec4c2ca350e433b147eec62eaad8c1be6f494b1093fd0e2b5870d03fadf8f11a5b5b3872b0a3f064ef17370abf1572
+  data.tar.gz: 6b3f7020957b48a990f129bf137ca1a304422f250555405ad59cd3c220f9ecd13cc63dc31636200307ca66ea0ce1a7933d2bdecfd7fa98868b46a624db83a789

data/app/controllers/devise/devise_castle_controller.rb

@@ -1,60 +1,3 @@
 class Devise::DeviseCastleController < DeviseController
   include Devise::Controllers::Helpers
-
-  before_filter :return_not_found, except: :new
-
-  before_filter do
-    env['castle.skip_authorization'] = true
-  end
-
-  def new
-    challenge = castle.challenges.create
-    Devise.mappings.keys.flatten.any? do |scope|
-      redirect_to send(
-        "edit_#{scope}_two_factor_authentication_path", challenge.id)
-    end
-  end
-
-  def edit
-    @challenge = castle.challenges.find(params[:id])
-
-    # Prevent "undefined method `errors' for nil:NilClass"
-    self.resource = resource_class.new
-
-    render action: "#{@challenge.delivery_method}/edit"
-  end
-
-  def update
-    challenge_id = params.require(:challenge_id)
-    code = params.require(:code)
-
-    begin
-      castle.challenges.verify(challenge_id, response: code)
-
-      castle.trust_device if params[:trust_device]
-
-      Devise.mappings.keys.flatten.any? do |scope|
-        redirect_to after_sign_in_path_for(scope)
-      end
-    rescue Castle::Error
-      sign_out_with_message(:no_retries_remaining, :alert)
-    end
-  end
-
-  protected
-
-  def sign_out_with_message(message, kind = :notice)
-    signed_out = sign_out(resource_name)
-    set_flash_message kind, message if signed_out
-    redirect_to after_sign_out_path_for(resource_name)
-  end
-
-  private
-
-  def return_not_found
-    unless castle.mfa_in_progress?
-      redirect_to after_sign_in_path_for(resource_name)
-    end
-  end
-
 end

data/lib/devise_castle.rb

@@ -1,10 +1,8 @@
 require 'active_support/concern'
 require 'devise'
 require 'devise_castle/hooks'
-require 'devise_castle/routes'
-require 'devise_castle/hooks'
-require 'devise_castle/import'
 require 'devise_castle/mapping'
+require 'devise_castle/routes'
 require 'castle-rb'
 
 module Devise
@@ -24,6 +22,6 @@ if defined?(Rails::Railtie)
 end
 
 Devise.add_module(:castle,
-  :controller => :two_factor_authentication,
+  :controller => :devise_castle,
   :route => :castle,
   :model  => 'devise_castle/model')

data/lib/devise_castle/controllers/helpers.rb

@@ -4,24 +4,6 @@ module DeviseCastle
       extend ActiveSupport::Concern
 
       included do
-        rescue_from Castle::UserUnauthorizedError do |error|
-          Devise.mappings.keys.flatten.any? do |scope|
-            warden.logout(scope)
-            throw :warden, :scope => scope, :message => :signed_out
-          end
-        end
-
-        rescue_from Castle::ChallengeRequiredError do |error|
-          Devise.mappings.keys.flatten.any? do |scope|
-            if request.format.present? and request.format.html?
-              session["#{scope}_return_to"] = request.path if request.get?
-              # todo: doesn't seem to work
-              redirect_to send("new_#{scope}_two_factor_authentication_path")
-            else
-              render nothing: true, status: :unauthorized
-            end
-          end
-        end
       end
 
     end

data/lib/devise_castle/hooks.rb

@@ -8,7 +8,6 @@ end
 Warden::Manager.before_logout do |record, warden, opts|
   if record.respond_to?(:castle_id)
     castle = warden.request.env['castle']
-    castle.logout
     castle.track(user_id: record._castle_id, name: '$logout.succeeded')
   end
 end
@@ -35,26 +34,6 @@ end
 Warden::Manager.after_set_user :except => :fetch do |record, warden, opts|
   if record.respond_to?(:castle_id)
     castle = warden.request.env['castle']
-
-    recommendation = castle.recommendation(user_id: record._castle_id)
-
-    if recommendation.action == 'ok'
-      castle.track(user_id: record._castle_id, name: '$login.succeeded')
-      castle.login(record._castle_id, email: record.email)
-    else
-      castle.track(user_id: record._castle_id, name: '$login.failed')
-
-      warden.logout(opts[:scope])
-      throw :warden, :scope => opts[:scope], :message => :signed_out
-    end
-  end
-end
-
-# Continous authentication
-Warden::Manager.after_set_user do |record, warden, opts|
-  if record.respond_to?(:castle_id)
-    env = warden.request.env
-    castle = env['castle']
-    castle.authorize! unless env['castle.skip_authorization']
+    castle.track(user_id: record._castle_id, name: '$login.succeeded')
   end
 end

data/lib/devise_castle/model.rb

@@ -10,7 +10,7 @@
 
         def destroy_castle_user
           castle_user_block do
-            ::Castle::User.destroy_existing(id)
+            ::Castle::User.destroy_existing(_castle_id)
           end
         end
 
@@ -34,19 +34,6 @@
           URI.encode(castle_id.to_s)
         end
       end
-
-      # Overwrites valid_for_authentication? from Devise::Models::Authenticatable
-      # for verifying whether a user is allowed to sign in or not.
-      def valid_for_authentication?
-        return super unless persisted?
-
-        if super
-          true
-        else
-          # TODO: track unsuccessful login
-          false
-        end
-      end
     end
   end
 end

data/lib/devise_castle/routes.rb

@@ -3,7 +3,6 @@ module ActionDispatch::Routing
     protected
 
     def devise_castle(mapping, controllers)
-      resources :two_factor_authentication, :only => [:new, :show, :update, :edit], :path => mapping.path_names[:two_factor_authentication], :controller => controllers[:two_factor_authentication]
     end
   end
 end

data/lib/devise_castle/version.rb

@@ -1,3 +1,3 @@
 module DeviseCastle
-  VERSION = "1.1.1".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_castle
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,27 +88,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/devise/devise_castle_controller.rb
-- app/controllers/devise/two_factor_authentication_controller.rb
 - app/controllers/devise_castle/sessions_controller.rb
-- 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_castle.rb
 - lib/devise_castle/controllers/helpers.rb
 - lib/devise_castle/hooks.rb
-- lib/devise_castle/import.rb
 - lib/devise_castle/mapping.rb
 - lib/devise_castle/model.rb
 - lib/devise_castle/railtie.rb
 - lib/devise_castle/routes.rb
 - lib/devise_castle/version.rb
-- lib/generators/active_record/devise_castle_generator.rb
-- lib/generators/active_record/templates/migration.rb
-- lib/generators/devise_castle/devise_castle_generator.rb
-- lib/generators/devise_castle/import_generator.rb
 - lib/generators/devise_castle/install_generator.rb
-- lib/generators/devise_castle/views_generator.rb
-- lib/generators/mongoid/devise_castle_generator.rb
 homepage: https://github.com/castle/devise_castle
 licenses:
 - MIT

data/app/controllers/devise/two_factor_authentication_controller.rb

@@ -1,3 +0,0 @@
-module Devise
-  class TwoFactorAuthenticationController < DeviseCastleController; end
-end

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

@@ -1,14 +0,0 @@
-<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 %></p>
-  <p><%= check_box_tag :trust_device %> <%= label_tag :trust_device %></p>
-  <%= 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

@@ -1,17 +0,0 @@
-<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 %></p>
-  <p><%= check_box_tag :trust_device %> <%= label_tag :trust_device %></p>
-  <%= 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

@@ -1,14 +0,0 @@
-<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 %></p>
-  <p><%= check_box_tag :trust_device %> <%= label_tag :trust_device %></p>
-  <%= 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_castle/import.rb

@@ -1,85 +0,0 @@
-module DeviseCastle
-  class ImportError < Exception; end
-
-  class Import
-    attr_reader :resource_class, :batch_size
-
-    def initialize(options = {})
-      begin
-        @resource_class = eval(options[:resource_class])
-      rescue NameError
-        raise ImportError, "No such class: #{options[:resource_class]}"
-      end
-
-      unless supported_orm?
-        raise ImportError, "Only ActiveRecord and Mongoid models are supported"
-      end
-
-      unless Castle.config.api_secret.present?
-        raise ImportError, "Please add an Castle API secret to your devise.rb"
-      end
-
-      @batch_size = [(options[:batch_size] || 100), 100].min
-    end
-
-    def self.run(*args)
-      new(*args).run
-    end
-
-    def run
-      batches do |batch, resources|
-        begin
-          users = Castle::User.import(users: batch)
-        rescue Castle::Error => error
-          raise ImportError, error.message
-        end
-
-        users.zip(resources).each do |user, resource|
-          resource.castle_id = user.id
-          resource.save(validate: false)
-        end
-      end
-    end
-
-    def batches
-      if active_record?
-        resource_class.where("castle_id IS NULL").find_in_batches(:batch_size => batch_size) do |resources|
-          resources_for_wire = map_resources_to_castle_format(resources)
-          yield(resources_for_wire, resources) unless resources.count.zero?
-        end
-      elsif mongoid?
-        0.step(resource_class.where(:castle_id => nil).count, batch_size) do |offset|
-          resources_for_wire = map_resources_to_castle_format(resource_class.limit(batch_size).skip(offset))
-          yield(resources_for_wire, resources) unless resources.count.zero?
-        end
-      end
-    end
-
-    def map_resources_to_castle_format(resources)
-      resources.map do |resource|
-        format = {}
-        format[:email] = resource.email unless resource.email.blank?
-        format[:id] = resource._castle_id
-        format[:created_at] = resource.created_at if resource.respond_to? :created_at
-        format
-      end.compact
-    end
-
-    def prepare_batch(batch)
-      { :users => batch }.to_json
-    end
-
-    def active_record?
-      (defined?(ActiveRecord::Base) && (resource_class < ActiveRecord::Base))
-    end
-
-    def mongoid?
-      (defined?(Mongoid::Document) && (resource_class < Mongoid::Document))
-    end
-
-    def supported_orm?
-      active_record? || mongoid?
-    end
-
-  end
-end

data/lib/generators/active_record/devise_castle_generator.rb

@@ -1,14 +0,0 @@
-require 'rails/generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class DeviseCastleGenerator < ActiveRecord::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_devise_castle_migration
-        migration_template "migration.rb", "db/migrate/add_castle_to_#{table_name}.rb"
-      end
-
-    end
-  end
-end

data/lib/generators/active_record/templates/migration.rb

@@ -1,13 +0,0 @@
-class AddCastleTo<%= table_name.camelize %> < ActiveRecord::Migration
-  def up
-    change_table :<%= table_name %> do |t|
-      t.string   :castle_id
-    end
-
-    add_index :<%= table_name %>, :castle_id, :unique => true
-  end
-
-  def down
-    remove_column :<%= table_name %>, :castle_id
-  end
-end

data/lib/generators/devise_castle/devise_castle_generator.rb

@@ -1,18 +0,0 @@
-module DeviseCastle
-  module Generators
-    class DeviseCastleGenerator < Rails::Generators::NamedBase
-      namespace "devise_castle"
-
-      desc "Add :castle directive in the given model. Also generate migration for ActiveRecord"
-
-      def inject_devise_castle_content
-        path = File.join("app", "models", "#{file_path}.rb")
-        if File.exists?(path)
-          inject_into_file(path, "castle, :", :after => "devise :")
-        end
-      end
-
-      hook_for :orm
-    end
-  end
-end

data/lib/generators/devise_castle/import_generator.rb

@@ -1,12 +0,0 @@
-module DeviseCastle
-  module Generators
-    class ImportGenerator < Rails::Generators::NamedBase
-      desc "Import users to Castle"
-
-      def import_users_to_castle
-        Import.run(resource_class: class_name)
-      end
-
-    end
-  end
-end

data/lib/generators/devise_castle/views_generator.rb

@@ -1,18 +0,0 @@
-require 'generators/devise/views_generator'
-
-module DeviseCastle
-  module Generators
-    class ViewsGenerator < Rails::Generators::Base
-      desc 'Copies all DeviseCastle views to your application.'
-
-      argument :scope, :required => false, :default => nil,
-                       :desc => "The scope to copy views to"
-
-      include ::Devise::Generators::ViewPathTemplates
-      source_root File.expand_path("../../../../app/views/devise", __FILE__)
-      def copy_views
-        view_directory :two_factor_authentication
-      end
-    end
-  end
-end

data/lib/generators/mongoid/devise_castle_generator.rb

@@ -1,8 +0,0 @@
-require 'generators/devise/orm_helpers'
-
-module Mongoid
-  module Generators
-    class DeviseCastleGenerator < Rails::Generators::NamedBase
-    end
-  end
-end