Multiple models support

README.md

@@ -89,8 +89,8 @@ In `app/lib/anylogin_omniauth.rb`
 ```
 module AnyloginOmniauth
   module Controller
-    def self.any_login_current_user_method
-      @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.parameterize.underscore}".to_sym
+    def self.any_login_current_user_method(klass)
+      @@any_login_current_user_method ||= "current_#{klass.to_s.parameterize.underscore}".to_sym
     end
 
     def any_login_sign_in
@@ -114,7 +114,7 @@ It will create the initializer file `config/initializers/any_login.rb`.
 ### Options
 
 - **enabled** - enable or disable gem (by default this gem is enabled only in development mode).
-- **klass_name** - class name for "User" object. Defaults to `User`.
+- **klass_name** - class name for "User" object. Defaults to `User`. An array of class names is also supported.
 - **collection_method** - method which returns collection of users. Sample:
   `.all`, `.active`, `.admins`, `.groupped_users`. Value is a simple.
   Defaults to `:all`.
@@ -130,7 +130,6 @@ It will create the initializer file `config/initializers/any_login.rb`.
 - **position** - position of AnyLogin box on page. Possible values: `top_left`,
   `top_right`, `bottom_left`, `bottom_right`. Default: `bottom_left`.
 - **login_button_label** - login button label.
-- **select_prompt** - select prompt message.
 - **auto_show** - automatically show AnyLogin box.
 - **http_basic_authentication_enabled** - Enable HTTP_BASIC authentication.
 - **http_basic_authentication_user_name** - HTTP_BASIC authentication user name.

app/assets/javascripts/any_login/application.js

@@ -1,21 +1,13 @@
-function submitOnChange() {
-  document.getElementById('any_login_form').submit();
-}
-
-function elementExists(element) {
-  return typeof (element) != 'undefined' && element != null;
-}
-
-function addChangeListenerTo(elementId) {
-  let element = document.getElementById(elementId);
-  if (elementExists(element)) {
-    element.addEventListener("change", submitOnChange);
-  }
-}
-
 function setupAnyLoginHandlers() {
-  addChangeListenerTo("back_to_previous_id");
-  addChangeListenerTo("selected_id");
+  const forms = document.querySelectorAll('.any_login_form');
+  forms.forEach(form => {
+    const selects = form.querySelectorAll('select');
+    selects.forEach(select => {
+      select.addEventListener('change', () => {
+        form.submit();
+      })
+    })
+  })
 }
 
 ['DOMContentLoaded', 'turbolinks:load', 'turbo:load'].forEach(function(e) {

app/assets/stylesheets/any_login/application.css

@@ -66,6 +66,7 @@
   cursor: pointer;
   vertical-align: middle;
   fill: #fff;
+  margin: 5px;
 }
 
 #any_login:hover {
@@ -77,20 +78,24 @@
   color: yellow;
 }
 
-#any_login #any_login_id_input {
+#any_login .any_login_id_input {
   width: 30px;
 }
 
-#any_login span#current_user_information {
+#any_login span.current_user_information {
   display: inline;
 }
 
-#any_login span#current_user_information span {
+#any_login span.current_user_information span {
   display: inline;
 }
 
-#any_login span#anylogin_back_to_user {
+#any_login span.anylogin_back_to_user {
   padding-left: 15px;
   color: cyan;
   display: inline;
 }
+
+.any_login_form_toggle_label {
+  display: inline-block;
+}

app/controllers/any_login/application_controller.rb

@@ -41,6 +41,10 @@ def user_id
       params[:back_to_previous_id].presence || params[:selected_id].presence || params[:id]
     end
 
+    def klass
+      params[:as].constantize
+    end
+
     def previous
       cookies[AnyLogin.cookie_name] ||= ""
     end

app/views/any_login/_any_login.html.erb

@@ -2,18 +2,21 @@
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
 <div id='any_login' class='<%= any_login_klasses %>'>
-  <%= form_tag any_login.sign_in_path, :method => :post, :id => 'any_login_form' do %>
-    <label for="any_login_form_toggle" id="any_login_form_toggle_label">
-      <%= render 'any_login/svg/user', :title => AnyLogin.klass %>
-    </label>
-    <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
-    <span id='any_login_box'>
-      <%= any_login_select %>
-      or by
-      <%= any_login_id_input %>
-      <%= any_login_submit %>
-      <span id='current_user_information'><%= current_user_information %></span>
-      <%= any_login_previous_select %>
-    </span>
-  <% end %>
+  <label for="any_login_form_toggle" class="any_login_form_toggle_label">
+    <%= render 'any_login/svg/user' %>
+  </label>
+  <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
+
+  <span id="any_login_box">
+    <% AnyLogin.klasses.each do |klass| %>
+      <%= form_tag any_login.sign_in_path(as: klass.to_s), :method => :post, :class => 'any_login_form' do %>
+        <%= any_login_select(klass) %>
+          or by
+          <%= any_login_id_input %>
+          <%= any_login_submit %>
+          <span class='current_user_information'><%= current_user_information(klass) %></span>
+          <%= any_login_previous_select(klass) %>
+      <% end %>
+    <% end %>
+  </span>
 </div>

app/views/any_login/svg/_user.html.erb

@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <svg version="1.1" viewBox="0 0 24 24" height="16" width="16" role="img" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title><%= title %></title>
   <g id="info" />
   <g id="icons">
     <g id="user">

lib/any_login.rb

@@ -52,10 +52,6 @@ module Provider
   mattr_accessor :login_button_label
   @@login_button_label = 'Login'
 
-  # prompt message in select
-  mattr_accessor :select_prompt
-  @@select_prompt = "Select #{AnyLogin.klass_name}"
-
   # show any_login box by default
   mattr_accessor :auto_show
   @@auto_show = false
@@ -88,12 +84,16 @@ def self.setup
     yield(self)
   end
 
-  def self.collection
-    Collection.new(collection_raw)
+  def self.collection(klass)
+    Collection.new(collection_raw(klass))
   end
 
-  def self.klass
-    @@klass = AnyLogin.klass_name.constantize
+  def self.klasses
+    @@klasses = if AnyLogin.klass_name.is_a?(Array)
+                  AnyLogin.klass_name.map(&:constantize)
+                else
+                  [AnyLogin.klass_name.constantize]
+                end
   end
 
   def self.cookie_name
@@ -115,9 +115,9 @@ def self.format_collection_raw(result)
     end
   end
 
-  def self.collection_raw
+  def self.collection_raw(klass)
     @@collection_raw = begin
-      result = AnyLogin.klass.send(AnyLogin.collection_method)
+      result = klass.send(AnyLogin.collection_method)
       if limit == :none
         format_collection_raw(result)
       else

lib/any_login/helpers.rb

@@ -9,37 +9,37 @@ def any_login_here
     if AnyLogin.enabled
 
       def any_login_id_input
-        text_field_tag :id, '', :placeholder => 'ID', :id => 'any_login_id_input', :required => true
+        text_field_tag :id, '', :placeholder => 'ID', :class => 'any_login_id_input', :required => true
       end
 
       def any_login_submit
         submit_tag AnyLogin.login_button_label
       end
 
-      def any_login_select
-        collection = AnyLogin.collection
+      def any_login_select(klass)
+        collection = AnyLogin.collection(klass)
         select_options =
                         if collection.grouped?
                           grouped_options_for_select(collection.to_a)
                         else
                           options_for_select(collection.to_a)
                         end
-        select_tag :selected_id, select_options, select_html_options
+        select_tag :selected_id, select_options, select_html_options(klass).merge(id: nil)
       end
 
-      def any_login_previous_select
+      def any_login_previous_select(klass)
         ids = any_login_previous_ids
         return if ids.blank?
 
         users = ids.collect do |id|
-          AnyLogin.klass.where(AnyLogin.klass.primary_key => id).first
+          klass.where(klass.primary_key => id).first
         end.compact
 
         collection = AnyLogin::Collection.new(users).to_a
         if collection.any?
           select_options = options_for_select(collection)
           [
-            content_tag(:span, id: 'anylogin_back_to_user') do
+            content_tag(:span, class: 'anylogin_back_to_user') do
               "History: "
             end,
             select_tag(:back_to_previous_id, select_options, select_html_options("Back to:"))
@@ -51,7 +51,8 @@ def any_login_previous_ids
         (cookies[AnyLogin.cookie_name].presence || '').split(',').take(AnyLogin.previous_limit)
       end
 
-      def select_html_options(prompt = AnyLogin.select_prompt)
+      def select_html_options(klass)
+        prompt = "Select #{klass}"
         options = {}
         options[:prompt] = prompt
         options
@@ -63,14 +64,14 @@ def any_login_klasses
         klasses.join(' ')
       end
 
-      def current_user_information
-        if respond_to?(AnyLogin.provider.constantize::Controller.any_login_current_user_method) &&
-           user = send(AnyLogin.provider.constantize::Controller.any_login_current_user_method)
+      def current_user_information(klass)
+        if respond_to?(AnyLogin.provider.constantize::Controller.any_login_current_user_method(klass)) &&
+           user = send(AnyLogin.provider.constantize::Controller.any_login_current_user_method(klass))
           content_tag :span, :class => 'any_login_user_information' do
             if AnyLogin.name_method.is_a?(Symbol)
-              raw("Current #{AnyLogin.klass_name}: #{h(user.send(AnyLogin.name_method)[0])} — ID: #{user.id}")
+              raw("Current #{klass.to_s}: #{h(user.send(AnyLogin.name_method)[0])} — ID: #{user.id}")
             else
-              raw("Current #{AnyLogin.klass_name}: #{h(AnyLogin.name_method.call(user)[0])} — ID: #{user.id}")
+              raw("Current #{klass.to_s}: #{h(AnyLogin.name_method.call(user)[0])} — ID: #{user.id}")
             end
           end
         end

lib/any_login/providers/authlogic.rb

@@ -4,14 +4,14 @@ module Authlogic
 
       module Controller
 
-        def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.parameterize.underscore}".to_sym
+        def self.any_login_current_user_method(klass)
+          @@any_login_current_user_method ||= "current_#{klass.to_s.parameterize.underscore}".to_sym
         end
 
         def any_login_sign_in
           reset_session
-          @loginable = AnyLogin.klass.find(user_id)
-          Object.const_get("#{AnyLogin.klass}Session").create(@loginable)
+          @loginable = klass.find(user_id)
+          Object.const_get("#{klass}Session").create(@loginable)
           redirect_to main_app.send(AnyLogin.redirect_path_after_login)
         end
 

lib/any_login/providers/clearance.rb

@@ -4,13 +4,13 @@ module Clearance
 
       module Controller
 
-        def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.parameterize.underscore}".to_sym
+        def self.any_login_current_user_method(klass)
+          @@any_login_current_user_method ||= "current_#{klass.to_s.parameterize.underscore}".to_sym
         end
 
         def any_login_sign_in
           reset_session
-          @loginable = AnyLogin.klass.find(user_id)
+          @loginable = klass.find(user_id)
           sign_in @loginable
           redirect_to main_app.send(AnyLogin.redirect_path_after_login)
         end

lib/any_login/providers/devise.rb

@@ -6,19 +6,19 @@ module Controller
 
         DEFAULT_SIGN_IN = proc do |loginable|
           reset_session
-          sign_in Controller.mapping_key, loginable
+          sign_in Controller.mapping_key(klass), loginable
         end
 
-        def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{mapping_key}".to_sym
+        def self.any_login_current_user_method(klass)
+          @@any_login_current_user_method = "current_#{mapping_key(klass)}".to_sym
         end
 
-        def self.mapping_key
-          @@mapping_key ||= ::Devise.mappings.detect {|_key, mapping| mapping.class_name == AnyLogin.klass.name }.first
+        def self.mapping_key(klass)
+          @@mapping_key = ::Devise.mappings.detect {|_key, mapping| mapping.class_name == klass.name }.first
         end
 
         def any_login_sign_in
-          @loginable = AnyLogin.klass.find(user_id)
+          @loginable = klass.find(user_id)
 
           sign_in = AnyLogin.sign_in || DEFAULT_SIGN_IN
           instance_exec(@loginable, &sign_in)

lib/any_login/providers/sorcery.rb

@@ -4,13 +4,13 @@ module Sorcery
 
       module Controller
 
-        def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.parameterize.underscore}".to_sym
+        def self.any_login_current_user_method(klass)
+          @@any_login_current_user_method ||= "current_#{klass.to_s.parameterize.underscore}".to_sym
         end
 
         def any_login_sign_in
           reset_session
-          @loginable = AnyLogin.klass.find(user_id)
+          @loginable = klass.find(user_id)
           auto_login @loginable
           redirect_to main_app.send(AnyLogin.redirect_path_after_login)
         end

lib/generators/any_login/templates/any_login.rb

@@ -5,7 +5,7 @@
   # # enabled or not
   # config.enabled = Rails.env.to_s == 'development'
 
-  # # Account, User, Person, etc
+  # # Account, User, Person, etc, or ['Account', 'User', 'Person'] for multiple model support
   # config.klass_name = 'User'
 
   #  # .all, .active, .admins, .groped_collection, etc ... need to return an array (or hash with arrays) of users

test/authlogic/integration/navigation_test.rb

@@ -15,8 +15,8 @@ class NavigationTest < ActionDispatch::IntegrationTest
   test "it properly logs users in and allows access to the secret page" do
     visit "/"
 
-    find("#any_login_form_toggle_label").click
-    find('#selected_id option:last-of-type').select_option
+    find(".any_login_form_toggle_label").click
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 

test/clearance/integration/navigation_test.rb

@@ -14,8 +14,8 @@ class NavigationTest < ActionDispatch::IntegrationTest
   test "it properly logs users in and allows access to the secret page" do
     visit "/"
 
-    find("#any_login_form_toggle_label").click
-    find('#selected_id option:last-of-type').select_option
+    find(".any_login_form_toggle_label").click
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 

test/devise/integration/navigation_test.rb

@@ -14,10 +14,10 @@ class NavigationTest < ActionDispatch::IntegrationTest
   test "it properly logs users in and allows access to the secret page" do
     visit "/"
 
-    find("#any_login_form_toggle_label").click
+    find(".any_login_form_toggle_label").click
     # There is an instability in the test suite where the option on the dropdown sometimes shows
     # up as `1` and sometimes shows up as `[email protected]`. This works around the issue.
-    find('#selected_id option:last-of-type').select_option
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 

test/rails_apps/devise/app/models/staff.rb

@@ -0,0 +1,6 @@
+class Staff < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end