Rename warden strategies, add key method

Author: rossta

app/lib/warden_extensions/magic_session_strategy.rb renamed to app/lib/warden_extensions/strategies/magic_session.rb

@@ -1,5 +1,13 @@
-module WardenExtensions
-  class MagicSessionStrategy < ::Warden::Strategies::Base
+module WardenExtensions::Strategies
+  class MagicSession < ::Warden::Strategies::Base
+    def self.key
+      name.demodulize.underscore.to_sym
+    end
+
+    def key
+      self.class.key
+    end
+
     def valid?
       !!token
     end
@@ -8,7 +16,6 @@ def authenticate!
       user = scope_class.find_by_token_for(:magic_session, token)
 
       return fail!(:invalid) if !user
-      return fail!(:unconfirmed) if user.needs_confirmation?
 
       success!(user)
     end
@@ -26,4 +33,4 @@ def scope_class
   end
 end
 
-::Warden::Strategies.add(:magic_session, WardenExtensions::MagicSessionStrategy)
+::Warden::Strategies.add(:magic_session, WardenExtensions::Strategies::MagicSession)

app/lib/warden_extensions/password_strategy.rb renamed to app/lib/warden_extensions/strategies/password.rb

@@ -1,5 +1,13 @@
-module WardenExtensions
-  class PasswordStrategy < ::Warden::Strategies::Base
+module WardenExtensions::Strategies
+  class Password < ::Warden::Strategies::Base
+    def self.key
+      name.demodulize.underscore.to_sym
+    end
+
+    def key
+      self.class.key
+    end
+
     def valid?
       !!(scoped_params["email"] && scoped_params["password"])
     end
@@ -26,4 +34,4 @@ def scope_class
   end
 end
 
-::Warden::Strategies.add(:password, WardenExtensions::PasswordStrategy)
+::Warden::Strategies.add(:password, WardenExtensions::Strategies::Password)

config/initializers/warden.rb

@@ -1,7 +1,7 @@
 require "warden"
 require_relative "../../app/lib/warden_extensions/setup"
-require_relative "../../app/lib/warden_extensions/password_strategy"
-require_relative "../../app/lib/warden_extensions/magic_session_strategy"
+require_relative "../../app/lib/warden_extensions/strategies/password"
+require_relative "../../app/lib/warden_extensions/strategies/magic_session"
 
 Rails.configuration.middleware.use Warden::Manager do |manager|
   manager.failure_app = proc { |env|