From 6fec3261a4cb78ab6dc339a6c715987b13b8d21d Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 21:51:38 +0900
Subject: [PATCH 01/39] Add klass names to template

---
 lib/generators/any_login/templates/any_login.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/generators/any_login/templates/any_login.rb b/lib/generators/any_login/templates/any_login.rb
index 7a5c397..6514c16 100644
--- a/lib/generators/any_login/templates/any_login.rb
+++ b/lib/generators/any_login/templates/any_login.rb
@@ -8,6 +8,9 @@
   # # Account, User, Person, etc
   # config.klass_name = 'User'
 
+  # # ['User', 'Staff', etc]
+  # config.klass_names = ['User']
+
   #  # .all, .active, .admins, .groped_collection, etc ... need to return an array (or hash with arrays) of users
   # config.collection_method = :all
 

From a86b19470032659c7ee0da2ff04b5cfe8e585086 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 21:53:50 +0900
Subject: [PATCH 02/39] Add default value of klass names

---
 lib/any_login.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/any_login.rb b/lib/any_login.rb
index 0210d7d..868229a 100755
--- a/lib/any_login.rb
+++ b/lib/any_login.rb
@@ -24,6 +24,10 @@ module Provider
   mattr_accessor :klass_name
   @@klass_name = 'User'
 
+  # # ['User', 'Staff', etc]
+  mattr_accessor :klass_names
+  @@klass_names = ['User']
+
   # Sign-in Method
   mattr_accessor :sign_in
   @@sign_in = nil

From 4ff39eb0602acaafd469e79d7e305e79cd203ac1 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 21:56:24 +0900
Subject: [PATCH 03/39] Get new params as for switching login class

---
 app/controllers/any_login/application_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/any_login/application_controller.rb b/app/controllers/any_login/application_controller.rb
index 385b19d..48b5df3 100755
--- a/app/controllers/any_login/application_controller.rb
+++ b/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

From ba8ed2c82052f9e7d3f04a1a6f2790a000821a93 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:01:44 +0900
Subject: [PATCH 04/39] Add klasses method to any_login.rb

---
 lib/any_login.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/any_login.rb b/lib/any_login.rb
index 868229a..a34b02d 100755
--- a/lib/any_login.rb
+++ b/lib/any_login.rb
@@ -100,6 +100,10 @@ def self.klass
     @@klass = AnyLogin.klass_name.constantize
   end
 
+  def self.klasses
+    @@klasses = AnyLogin.klass_names.map(&:constantize)
+  end
+
   def self.cookie_name
     module_parent_name = if Rails::VERSION::MAJOR >= 6
                            Rails.application.class.module_parent_name

From 885e07eab038e293481fb5874097e7deff5d5f5f Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:05:02 +0900
Subject: [PATCH 05/39] Display login forms

---
 app/views/any_login/_any_login.html.erb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index bc3c031..2815474 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,6 +1,13 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
+<div class="any_login_container">
+  <% AnyLogin.klasses.each do |klass| %>
+    <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
+    <% end %>
+  <% end %>
+</div>
+
 <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">

From c95b3e9b9d8c20cf7861fa938aa60cbd57035c2c Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:11:59 +0900
Subject: [PATCH 06/39] Fix `any_login_select` method

---
 app/views/any_login/_any_login.html.erb | 14 +++++++++++++-
 lib/any_login.rb                        |  8 ++++----
 lib/any_login/helpers.rb                |  4 ++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 2815474..b5ea91a 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,13 +1,25 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
+<%# TODO: Style and fix javascript %>
 <div class="any_login_container">
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
+      <span>
+        <%= any_login_select(klass) %>
+        or by
+        <%= any_login_id_input %>
+        <%= any_login_submit %>
+
+        <%# TODO: Fix me %>
+        <span class='current_user_information'><%= current_user_information %></span>
+        <%= any_login_previous_select %>
+      </span>
     <% end %>
   <% end %>
 </div>
 
+<%# TODO: Delete me %>
 <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">
@@ -15,7 +27,7 @@
     </label>
     <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
     <span id='any_login_box'>
-      <%= any_login_select %>
+      <%= any_login_select(AnyLogin.klass) %>
       or by
       <%= any_login_id_input %>
       <%= any_login_submit %>
diff --git a/lib/any_login.rb b/lib/any_login.rb
index a34b02d..9dae81f 100755
--- a/lib/any_login.rb
+++ b/lib/any_login.rb
@@ -92,8 +92,8 @@ 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
@@ -123,9 +123,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
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index b276420..959eed1 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -16,8 +16,8 @@ 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)

From 93032fc550405dd297cbdef3f51b81b2a576239a Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:15:33 +0900
Subject: [PATCH 07/39] Add klass arg to `any_login_previous_select` method

---
 app/views/any_login/_any_login.html.erb | 4 ++--
 lib/any_login/helpers.rb                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index b5ea91a..0332762 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -13,7 +13,7 @@
 
         <%# TODO: Fix me %>
         <span class='current_user_information'><%= current_user_information %></span>
-        <%= any_login_previous_select %>
+        <%= any_login_previous_select(klass) %>
       </span>
     <% end %>
   <% end %>
@@ -32,7 +32,7 @@
       <%= any_login_id_input %>
       <%= any_login_submit %>
       <span id='current_user_information'><%= current_user_information %></span>
-      <%= any_login_previous_select %>
+      <%= any_login_previous_select(AnyLogin.klass) %>
     </span>
   <% end %>
 </div>
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index 959eed1..d4d79eb 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -27,12 +27,12 @@ def any_login_select(klass)
         select_tag :selected_id, select_options, select_html_options
       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

From ca4d9829456461acc702d128983891fb030f1186 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:19:14 +0900
Subject: [PATCH 08/39] Add klass arg to `current_user_information` method

---
 app/views/any_login/_any_login.html.erb |  5 ++---
 lib/any_login/helpers.rb                | 10 +++++-----
 lib/any_login/providers/authlogic.rb    |  4 ++--
 lib/any_login/providers/clearance.rb    |  4 ++--
 lib/any_login/providers/devise.rb       |  8 ++++----
 lib/any_login/providers/sorcery.rb      |  4 ++--
 test/dummy/log/test.log                 |  0
 7 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 test/dummy/log/test.log

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 0332762..5e01841 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -11,8 +11,7 @@
         <%= any_login_id_input %>
         <%= any_login_submit %>
 
-        <%# TODO: Fix me %>
-        <span class='current_user_information'><%= current_user_information %></span>
+        <span class='current_user_information'><%= current_user_information(klass) %></span>
         <%= any_login_previous_select(klass) %>
       </span>
     <% end %>
@@ -31,7 +30,7 @@
       or by
       <%= any_login_id_input %>
       <%= any_login_submit %>
-      <span id='current_user_information'><%= current_user_information %></span>
+      <span id='current_user_information'><%= current_user_information(AnyLogin.klass) %></span>
       <%= any_login_previous_select(AnyLogin.klass) %>
     </span>
   <% end %>
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index d4d79eb..3352682 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -63,14 +63,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])} &mdash; ID: #{user.id}")
+              raw("Current #{klass.to_s}: #{h(user.send(AnyLogin.name_method)[0])} &mdash; ID: #{user.id}")
             else
-              raw("Current #{AnyLogin.klass_name}: #{h(AnyLogin.name_method.call(user)[0])} &mdash; ID: #{user.id}")
+              raw("Current #{klass.to_s}: #{h(AnyLogin.name_method.call(user)[0])} &mdash; ID: #{user.id}")
             end
           end
         end
diff --git a/lib/any_login/providers/authlogic.rb b/lib/any_login/providers/authlogic.rb
index fd4bc88..bd31cdc 100755
--- a/lib/any_login/providers/authlogic.rb
+++ b/lib/any_login/providers/authlogic.rb
@@ -4,8 +4,8 @@ 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
diff --git a/lib/any_login/providers/clearance.rb b/lib/any_login/providers/clearance.rb
index 9c07295..7a4e714 100755
--- a/lib/any_login/providers/clearance.rb
+++ b/lib/any_login/providers/clearance.rb
@@ -4,8 +4,8 @@ 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
diff --git a/lib/any_login/providers/devise.rb b/lib/any_login/providers/devise.rb
index 9527642..aeceea2 100755
--- a/lib/any_login/providers/devise.rb
+++ b/lib/any_login/providers/devise.rb
@@ -9,12 +9,12 @@ module Controller
           sign_in Controller.mapping_key, 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
diff --git a/lib/any_login/providers/sorcery.rb b/lib/any_login/providers/sorcery.rb
index 631e480..52b8868 100755
--- a/lib/any_login/providers/sorcery.rb
+++ b/lib/any_login/providers/sorcery.rb
@@ -4,8 +4,8 @@ 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
diff --git a/test/dummy/log/test.log b/test/dummy/log/test.log
new file mode 100644
index 0000000..e69de29

From fa9d292920159aa589e10a901776b6880dc1afb9 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:23:59 +0900
Subject: [PATCH 09/39] Remove log file

---
 test/dummy/log/test.log | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test/dummy/log/test.log

diff --git a/test/dummy/log/test.log b/test/dummy/log/test.log
deleted file mode 100644
index e69de29..0000000

From c8ae86da5144075c80106d9821dde05c692ecd09 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:25:16 +0900
Subject: [PATCH 10/39] Fix default value of klass names

---
 lib/any_login.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/any_login.rb b/lib/any_login.rb
index 9dae81f..d2915ad 100755
--- a/lib/any_login.rb
+++ b/lib/any_login.rb
@@ -26,7 +26,7 @@ module Provider
 
   # # ['User', 'Staff', etc]
   mattr_accessor :klass_names
-  @@klass_names = ['User']
+  @@klass_names = [@@klass_name]
 
   # Sign-in Method
   mattr_accessor :sign_in

From 0fa738f5c5b115d0ff0de1767a310714e1bc505d Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:35:46 +0900
Subject: [PATCH 11/39] Fix JavaScript

---
 app/assets/javascripts/any_login/application.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/any_login/application.js b/app/assets/javascripts/any_login/application.js
index fa8edc5..57b460c 100644
--- a/app/assets/javascripts/any_login/application.js
+++ b/app/assets/javascripts/any_login/application.js
@@ -19,5 +19,14 @@ function setupAnyLoginHandlers() {
 }
 
 ['DOMContentLoaded', 'turbolinks:load', 'turbo:load'].forEach(function(e) {
-  window.addEventListener(e, setupAnyLoginHandlers);
+  // window.addEventListener(e, setupAnyLoginHandlers);
+  const forms = document.querySelectorAll('.any_login_form');
+  forms.forEach(form => {
+    const selects = form.querySelectorAll('select');
+    selects.forEach(select => {
+      select.addEventListener('change', () => {
+        form.submit();
+      })
+    })
+  })
 });

From c78726bfeae6b3ed4ba5f28d7681e12261151bcb Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:40:53 +0900
Subject: [PATCH 12/39] Fix #any_login -> .any_login

---
 .../stylesheets/any_login/application.css     | 32 +++++++++----------
 app/views/any_login/_any_login.html.erb       |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index 4e9c31b..ad2aaf4 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -1,4 +1,4 @@
-#any_login {
+.any_login {
   position: fixed;
   opacity: 0.5;
   background: #5c4383;
@@ -8,13 +8,13 @@
   z-index: 10000;
 }
 
-#any_login form {
+.any_login form {
   margin: 0;
   height: auto;
   padding: 4px 6px;
 }
 
-#any_login #any_login_box {
+.any_login #any_login_box {
   display: none;
   vertical-align: middle;
 }
@@ -27,8 +27,8 @@
   display: inline;
 }
 
-#any_login input,
-#any_login select {
+.any_login input,
+.any_login select {
   color: black;
   padding: 0;
   margin: 0;
@@ -42,54 +42,54 @@
   line-height: auto;
 }
 
-#any_login.any_login_top_left {
+.any_login.any_login_top_left {
   top: 0;
   left: 0;
 }
 
-#any_login.any_login_top_right {
+.any_login.any_login_top_right {
   top: 0;
   right: 0;
 }
 
-#any_login.any_login_bottom_left {
+.any_login.any_login_bottom_left {
   bottom: 0;
   left: 0;
 }
 
-#any_login.any_login_bottom_right {
+.any_login.any_login_bottom_right {
   bottom: 0;
   right: 0;
 }
 
-#any_login svg {
+.any_login svg {
   cursor: pointer;
   vertical-align: middle;
   fill: #fff;
 }
 
-#any_login:hover {
+.any_login:hover {
   opacity: 1;
 }
 
-#any_login .any_login_user_information {
+.any_login .any_login_user_information {
   padding-left: 10px;
   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;
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 5e01841..bbe3d65 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -2,7 +2,7 @@
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
 <%# TODO: Style and fix javascript %>
-<div class="any_login_container">
+<div class="any_login">
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
       <span>

From 8c2fb9b656ed388ddb61adabc45b3acffc65664c Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:42:42 +0900
Subject: [PATCH 13/39] Fix CSS id to class

---
 app/assets/stylesheets/any_login/application.css | 10 +++++-----
 app/views/any_login/_any_login.html.erb          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index ad2aaf4..a551eda 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -14,7 +14,7 @@
   padding: 4px 6px;
 }
 
-.any_login #any_login_box {
+.any_login .any_login_box {
   display: none;
   vertical-align: middle;
 }
@@ -77,19 +77,19 @@
   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;
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index bbe3d65..dba91e6 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -5,7 +5,7 @@
 <div class="any_login">
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
-      <span>
+      <span class='any_login_box'>
         <%= any_login_select(klass) %>
         or by
         <%= any_login_id_input %>

From a51faae084d1d40145ee5e2732204439e89f90bf Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 22:45:39 +0900
Subject: [PATCH 14/39] Remove old form

---
 app/views/any_login/_any_login.html.erb | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index dba91e6..09af1d9 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,10 +1,12 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
-<%# TODO: Style and fix javascript %>
 <div class="any_login">
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
+      <label for="any_login_form_toggle" class="any_login_form_toggle_label">
+        <%= render 'any_login/svg/user', :title => klass %>
+      </label>
       <span class='any_login_box'>
         <%= any_login_select(klass) %>
         or by
@@ -17,21 +19,3 @@
     <% end %>
   <% end %>
 </div>
-
-<%# TODO: Delete me %>
-<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(AnyLogin.klass) %>
-      or by
-      <%= any_login_id_input %>
-      <%= any_login_submit %>
-      <span id='current_user_information'><%= current_user_information(AnyLogin.klass) %></span>
-      <%= any_login_previous_select(AnyLogin.klass) %>
-    </span>
-  <% end %>
-</div>

From a8da931190376ce7e102fcdbaafe281d73abc688 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:13:51 +0900
Subject: [PATCH 15/39] Fix styles

---
 .../stylesheets/any_login/application.css     | 32 +++++++++----------
 app/views/any_login/_any_login.html.erb       |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index a551eda..4e9c31b 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -1,4 +1,4 @@
-.any_login {
+#any_login {
   position: fixed;
   opacity: 0.5;
   background: #5c4383;
@@ -8,13 +8,13 @@
   z-index: 10000;
 }
 
-.any_login form {
+#any_login form {
   margin: 0;
   height: auto;
   padding: 4px 6px;
 }
 
-.any_login .any_login_box {
+#any_login #any_login_box {
   display: none;
   vertical-align: middle;
 }
@@ -27,8 +27,8 @@
   display: inline;
 }
 
-.any_login input,
-.any_login select {
+#any_login input,
+#any_login select {
   color: black;
   padding: 0;
   margin: 0;
@@ -42,54 +42,54 @@
   line-height: auto;
 }
 
-.any_login.any_login_top_left {
+#any_login.any_login_top_left {
   top: 0;
   left: 0;
 }
 
-.any_login.any_login_top_right {
+#any_login.any_login_top_right {
   top: 0;
   right: 0;
 }
 
-.any_login.any_login_bottom_left {
+#any_login.any_login_bottom_left {
   bottom: 0;
   left: 0;
 }
 
-.any_login.any_login_bottom_right {
+#any_login.any_login_bottom_right {
   bottom: 0;
   right: 0;
 }
 
-.any_login svg {
+#any_login svg {
   cursor: pointer;
   vertical-align: middle;
   fill: #fff;
 }
 
-.any_login:hover {
+#any_login:hover {
   opacity: 1;
 }
 
-.any_login .any_login_user_information {
+#any_login .any_login_user_information {
   padding-left: 10px;
   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;
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 09af1d9..2ba656e 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,7 +1,7 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
-<div class="any_login">
+<div id="any_login">
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
       <label for="any_login_form_toggle" class="any_login_form_toggle_label">

From 6430595c7267bcb444e0d26f4d26edbe9032bace Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:17:29 +0900
Subject: [PATCH 16/39] Fix prompt

---
 lib/any_login/helpers.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index 3352682..edcd212 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -24,7 +24,7 @@ def any_login_select(klass)
                         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)
       end
 
       def any_login_previous_select(klass)
@@ -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

From 992d979afb0eca909bb04269de2217e2fb638145 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:26:35 +0900
Subject: [PATCH 17/39] Fix JavaScript

---
 .../javascripts/any_login/application.js      | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/any_login/application.js b/app/assets/javascripts/any_login/application.js
index 57b460c..a8ab42b 100644
--- a/app/assets/javascripts/any_login/application.js
+++ b/app/assets/javascripts/any_login/application.js
@@ -1,25 +1,4 @@
-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");
-}
-
-['DOMContentLoaded', 'turbolinks:load', 'turbo:load'].forEach(function(e) {
-  // window.addEventListener(e, setupAnyLoginHandlers);
   const forms = document.querySelectorAll('.any_login_form');
   forms.forEach(form => {
     const selects = form.querySelectorAll('select');
@@ -29,4 +8,8 @@ function setupAnyLoginHandlers() {
       })
     })
   })
+}
+
+['DOMContentLoaded', 'turbolinks:load', 'turbo:load'].forEach(function(e) {
+  window.addEventListener(e, setupAnyLoginHandlers);
 });

From ac462b188a199176887212946c669aa8b2ffe915 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:31:47 +0900
Subject: [PATCH 18/39] Fix login method

---
 lib/any_login/providers/authlogic.rb | 4 ++--
 lib/any_login/providers/clearance.rb | 2 +-
 lib/any_login/providers/devise.rb    | 4 ++--
 lib/any_login/providers/sorcery.rb   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/any_login/providers/authlogic.rb b/lib/any_login/providers/authlogic.rb
index bd31cdc..e7fc86d 100755
--- a/lib/any_login/providers/authlogic.rb
+++ b/lib/any_login/providers/authlogic.rb
@@ -10,8 +10,8 @@ def self.any_login_current_user_method(klass)
 
         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
 
diff --git a/lib/any_login/providers/clearance.rb b/lib/any_login/providers/clearance.rb
index 7a4e714..f69e0f5 100755
--- a/lib/any_login/providers/clearance.rb
+++ b/lib/any_login/providers/clearance.rb
@@ -10,7 +10,7 @@ def self.any_login_current_user_method(klass)
 
         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
diff --git a/lib/any_login/providers/devise.rb b/lib/any_login/providers/devise.rb
index aeceea2..d3f1f03 100755
--- a/lib/any_login/providers/devise.rb
+++ b/lib/any_login/providers/devise.rb
@@ -6,7 +6,7 @@ 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(klass)
@@ -18,7 +18,7 @@ def self.mapping_key(klass)
         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)
diff --git a/lib/any_login/providers/sorcery.rb b/lib/any_login/providers/sorcery.rb
index 52b8868..eb85cb1 100755
--- a/lib/any_login/providers/sorcery.rb
+++ b/lib/any_login/providers/sorcery.rb
@@ -10,7 +10,7 @@ def self.any_login_current_user_method(klass)
 
         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

From 6fced36ff7303503a1c45768b3a5343f0011c405 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:37:21 +0900
Subject: [PATCH 19/39] Fix devise.rb

---
 lib/any_login/providers/devise.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/any_login/providers/devise.rb b/lib/any_login/providers/devise.rb
index d3f1f03..560fc86 100755
--- a/lib/any_login/providers/devise.rb
+++ b/lib/any_login/providers/devise.rb
@@ -10,11 +10,11 @@ module Controller
         end
 
         def self.any_login_current_user_method(klass)
-          @@any_login_current_user_method ||= "current_#{mapping_key(klass)}".to_sym
+          @@any_login_current_user_method = "current_#{mapping_key(klass)}".to_sym
         end
 
         def self.mapping_key(klass)
-          @@mapping_key ||= ::Devise.mappings.detect {|_key, mapping| mapping.class_name == klass.name }.first
+          @@mapping_key = ::Devise.mappings.detect {|_key, mapping| mapping.class_name == klass.name }.first
         end
 
         def any_login_sign_in

From 228929d5cb28174af508e0de860b184b93cb5813 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Sun, 18 Sep 2022 23:42:08 +0900
Subject: [PATCH 20/39] Fix style

---
 app/assets/stylesheets/any_login/application.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index 4e9c31b..b4d7e84 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -94,3 +94,7 @@
   color: cyan;
   display: inline;
 }
+
+.any_login_form_toggle_label {
+  display: inline-block;
+}

From 89b45ac962b0ae3facd2c552db8469abc7dc253d Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 19 Sep 2022 12:39:46 +0900
Subject: [PATCH 21/39] Fix view to pass tests

---
 .../stylesheets/any_login/application.css     |  4 +--
 app/views/any_login/_any_login.html.erb       | 29 ++++++++++++++++---
 test/devise/integration/navigation_test.rb    |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index b4d7e84..cc994bb 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -81,11 +81,11 @@
   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;
 }
 
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 2ba656e..2df89d9 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,18 +1,39 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
-<div id="any_login">
+<!--<div id="any_login">-->
+  <%# AnyLogin.klasses.each do |klass| %>
+    <%#= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
+<!--      <label for="any_login_form_toggle" class="any_login_form_toggle_label">-->
+        <%#= render 'any_login/svg/user', :title => klass %>
+<!--      </label>-->
+<!--      <span class='any_login_box'>-->
+        <%#= 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) %>
+<!--      </span>-->
+    <%# end %>
+  <%# end %>
+<!--</div>-->
+
+<div id='any_login' class='<%= any_login_klasses %>'>
   <% AnyLogin.klasses.each do |klass| %>
-    <%= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
+    <%= form_tag any_login.sign_in_path(as: klass.to_s), :method => :post, :class => 'any_login_form' do %>
       <label for="any_login_form_toggle" class="any_login_form_toggle_label">
         <%= render 'any_login/svg/user', :title => klass %>
       </label>
-      <span class='any_login_box'>
+      <%# TODO: Fix id to class %>
+      <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
+      <%# TODO: Fix id to class %>
+      <span id='any_login_box'>
         <%= 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) %>
       </span>
diff --git a/test/devise/integration/navigation_test.rb b/test/devise/integration/navigation_test.rb
index c121f3e..6a207f0 100644
--- a/test/devise/integration/navigation_test.rb
+++ b/test/devise/integration/navigation_test.rb
@@ -14,7 +14,7 @@ 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 `test@test.com`. This works around the issue.
     find('#selected_id option:last-of-type').select_option

From a04f90d4cdab1851392b30737173598ccd155369 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 19 Sep 2022 12:57:00 +0900
Subject: [PATCH 22/39] Fix id to class

---
 .../stylesheets/any_login/application.css     |  4 ++--
 app/views/any_login/_any_login.html.erb       | 19 -------------------
 lib/any_login/helpers.rb                      |  4 ++--
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index cc994bb..56ee630 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -77,7 +77,7 @@
   color: yellow;
 }
 
-#any_login #any_login_id_input {
+#any_login .any_login_id_input {
   width: 30px;
 }
 
@@ -89,7 +89,7 @@
   display: inline;
 }
 
-#any_login span#anylogin_back_to_user {
+#any_login span.anylogin_back_to_user {
   padding-left: 15px;
   color: cyan;
   display: inline;
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index 2df89d9..a2ad369 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -1,25 +1,6 @@
 <script src="<%= any_login.js_path %>"></script>
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
-<!--<div id="any_login">-->
-  <%# AnyLogin.klasses.each do |klass| %>
-    <%#= form_tag any_login.sign_in_path(as: klass), :method => :post, :class => 'any_login_form' do %>
-<!--      <label for="any_login_form_toggle" class="any_login_form_toggle_label">-->
-        <%#= render 'any_login/svg/user', :title => klass %>
-<!--      </label>-->
-<!--      <span class='any_login_box'>-->
-        <%#= 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) %>
-<!--      </span>-->
-    <%# end %>
-  <%# end %>
-<!--</div>-->
-
 <div id='any_login' class='<%= any_login_klasses %>'>
   <% AnyLogin.klasses.each do |klass| %>
     <%= form_tag any_login.sign_in_path(as: klass.to_s), :method => :post, :class => 'any_login_form' do %>
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index edcd212..2822346 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -9,7 +9,7 @@ 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
@@ -39,7 +39,7 @@ def any_login_previous_select(klass)
         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:"))

From d6fab62d178cbe4e1213b0f86dea7b079b5853df Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 19 Sep 2022 13:05:25 +0900
Subject: [PATCH 23/39] Fix tests

---
 test/authlogic/integration/navigation_test.rb | 2 +-
 test/clearance/integration/navigation_test.rb | 2 +-
 test/sorcery/integration/navigation_test.rb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/authlogic/integration/navigation_test.rb b/test/authlogic/integration/navigation_test.rb
index cd1a9a4..1b432f0 100644
--- a/test/authlogic/integration/navigation_test.rb
+++ b/test/authlogic/integration/navigation_test.rb
@@ -15,7 +15,7 @@ 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
     find('#selected_id option:last-of-type').select_option
 
     visit "/about"
diff --git a/test/clearance/integration/navigation_test.rb b/test/clearance/integration/navigation_test.rb
index ab82f7d..47fa8a5 100644
--- a/test/clearance/integration/navigation_test.rb
+++ b/test/clearance/integration/navigation_test.rb
@@ -14,7 +14,7 @@ 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
     find('#selected_id option:last-of-type').select_option
 
     visit "/about"
diff --git a/test/sorcery/integration/navigation_test.rb b/test/sorcery/integration/navigation_test.rb
index 88b42eb..0f3278b 100644
--- a/test/sorcery/integration/navigation_test.rb
+++ b/test/sorcery/integration/navigation_test.rb
@@ -14,7 +14,7 @@ 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
     find('#selected_id option:last-of-type').select_option
 
     visit "/about"

From d52011f8db7d12dbc6711f7729e64f4e5da135ff Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 19 Sep 2022 13:22:37 +0900
Subject: [PATCH 24/39] Fix styles to display all login form

---
 app/views/any_login/_any_login.html.erb | 31 ++++++++++++-------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index a2ad369..e0934ea 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -2,22 +2,21 @@
 <link rel="stylesheet" href="<%= any_login.css_path %>">
 
 <div id='any_login' class='<%= any_login_klasses %>'>
-  <% AnyLogin.klasses.each do |klass| %>
-    <%= form_tag any_login.sign_in_path(as: klass.to_s), :method => :post, :class => 'any_login_form' do %>
-      <label for="any_login_form_toggle" class="any_login_form_toggle_label">
-        <%= render 'any_login/svg/user', :title => klass %>
-      </label>
-      <%# TODO: Fix id to class %>
-      <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
-      <%# TODO: Fix id to class %>
-      <span id='any_login_box'>
+  <label for="any_login_form_toggle" class="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">
+    <% 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) %>
-      </span>
+          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 %>
-  <% end %>
+  </span>
 </div>

From bc2976e7a64668b1285d4f9c24f29a37249e26cd Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 22:50:59 +0900
Subject: [PATCH 25/39] Add Staff model

---
 test/rails_apps/devise/app/models/staff.rb            |  2 ++
 .../devise/db/migrate/20221019135010_create_staffs.rb |  9 +++++++++
 test/rails_apps/devise/db/schema.rb                   |  9 ++++++++-
 test/rails_apps/devise/test/fixtures/staffs.yml       | 11 +++++++++++
 test/rails_apps/devise/test/models/staff_test.rb      |  7 +++++++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 test/rails_apps/devise/app/models/staff.rb
 create mode 100644 test/rails_apps/devise/db/migrate/20221019135010_create_staffs.rb
 create mode 100644 test/rails_apps/devise/test/fixtures/staffs.yml
 create mode 100644 test/rails_apps/devise/test/models/staff_test.rb

diff --git a/test/rails_apps/devise/app/models/staff.rb b/test/rails_apps/devise/app/models/staff.rb
new file mode 100644
index 0000000..889af97
--- /dev/null
+++ b/test/rails_apps/devise/app/models/staff.rb
@@ -0,0 +1,2 @@
+class Staff < ApplicationRecord
+end
diff --git a/test/rails_apps/devise/db/migrate/20221019135010_create_staffs.rb b/test/rails_apps/devise/db/migrate/20221019135010_create_staffs.rb
new file mode 100644
index 0000000..35886c1
--- /dev/null
+++ b/test/rails_apps/devise/db/migrate/20221019135010_create_staffs.rb
@@ -0,0 +1,9 @@
+class CreateStaffs < ActiveRecord::Migration[6.1]
+  def change
+    create_table :staffs do |t|
+      t.string :name
+      t.integer :age
+      t.timestamps
+    end
+  end
+end
diff --git a/test/rails_apps/devise/db/schema.rb b/test/rails_apps/devise/db/schema.rb
index c7a86ec..fee8f23 100644
--- a/test/rails_apps/devise/db/schema.rb
+++ b/test/rails_apps/devise/db/schema.rb
@@ -10,7 +10,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2015_09_09_210357) do
+ActiveRecord::Schema.define(version: 2022_10_19_135010) do
+
+  create_table "staffs", force: :cascade do |t|
+    t.string "name"
+    t.integer "age"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
 
   create_table "users", force: :cascade do |t|
     t.string "name"
diff --git a/test/rails_apps/devise/test/fixtures/staffs.yml b/test/rails_apps/devise/test/fixtures/staffs.yml
new file mode 100644
index 0000000..5181636
--- /dev/null
+++ b/test/rails_apps/devise/test/fixtures/staffs.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/rails_apps/devise/test/models/staff_test.rb b/test/rails_apps/devise/test/models/staff_test.rb
new file mode 100644
index 0000000..211ae53
--- /dev/null
+++ b/test/rails_apps/devise/test/models/staff_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class StaffTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 1b36eda5f89a7c234c65c5bf0f93055ec0f0a424 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 22:53:01 +0900
Subject: [PATCH 26/39] Add devise to staff

---
 test/rails_apps/devise/app/models/staff.rb    |  4 ++
 .../20221019135121_add_devise_to_staffs.rb    | 47 +++++++++++++++++++
 test/rails_apps/devise/db/schema.rb           | 14 +++++-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/rails_apps/devise/db/migrate/20221019135121_add_devise_to_staffs.rb

diff --git a/test/rails_apps/devise/app/models/staff.rb b/test/rails_apps/devise/app/models/staff.rb
index 889af97..ff2721c 100644
--- a/test/rails_apps/devise/app/models/staff.rb
+++ b/test/rails_apps/devise/app/models/staff.rb
@@ -1,2 +1,6 @@
 class Staff < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
 end
diff --git a/test/rails_apps/devise/db/migrate/20221019135121_add_devise_to_staffs.rb b/test/rails_apps/devise/db/migrate/20221019135121_add_devise_to_staffs.rb
new file mode 100644
index 0000000..1db9b58
--- /dev/null
+++ b/test/rails_apps/devise/db/migrate/20221019135121_add_devise_to_staffs.rb
@@ -0,0 +1,47 @@
+class AddDeviseToStaffs < ActiveRecord::Migration[6.1]
+  def self.up
+    change_table(:staffs) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps null: false
+    end
+
+    add_index :staffs, :email,                unique: true
+    add_index :staffs, :reset_password_token, unique: true
+  end
+
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/test/rails_apps/devise/db/schema.rb b/test/rails_apps/devise/db/schema.rb
index fee8f23..a4c2bad 100644
--- a/test/rails_apps/devise/db/schema.rb
+++ b/test/rails_apps/devise/db/schema.rb
@@ -10,13 +10,25 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_10_19_135010) do
+ActiveRecord::Schema.define(version: 2022_10_19_135121) do
 
   create_table "staffs", force: :cascade do |t|
     t.string "name"
     t.integer "age"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.index ["email"], name: "index_staffs_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_staffs_on_reset_password_token", unique: true
   end
 
   create_table "users", force: :cascade do |t|

From 6b26c6bac4bbc520518d7316393baf89fafdfc86 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 22:54:13 +0900
Subject: [PATCH 27/39] Fix klass_name to klass_names

---
 test/rails_apps/devise/config/initializers/any_login.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rails_apps/devise/config/initializers/any_login.rb b/test/rails_apps/devise/config/initializers/any_login.rb
index 414942b..9092261 100644
--- a/test/rails_apps/devise/config/initializers/any_login.rb
+++ b/test/rails_apps/devise/config/initializers/any_login.rb
@@ -2,6 +2,6 @@
   config.enabled = true
   config.provider = :devise
   config.login_button_label = 'Sign in with Devise'
-  config.klass_name = 'User'
+  config.klass_names = ['User', 'Staff']
   config.collection_method = :all
 end

From aeb9a5e2ac6ea29cac6db98a2311797d98e1e18e Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 22:56:01 +0900
Subject: [PATCH 28/39] Fix model

---
 test/rails_apps/devise/app/models/staff.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rails_apps/devise/app/models/staff.rb b/test/rails_apps/devise/app/models/staff.rb
index ff2721c..6996ed6 100644
--- a/test/rails_apps/devise/app/models/staff.rb
+++ b/test/rails_apps/devise/app/models/staff.rb
@@ -1,4 +1,4 @@
-class Staff < ApplicationRecord
+class Staff < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,

From 3dd3a768b7a9589c42f2abec9d5d35a78538a900 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 23:00:41 +0900
Subject: [PATCH 29/39] Add test staffs

---
 .../20221019135937_populate_test_staffs.rb    | 21 +++++++++++++++++++
 test/rails_apps/devise/db/schema.rb           |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 test/rails_apps/devise/db/migrate/20221019135937_populate_test_staffs.rb

diff --git a/test/rails_apps/devise/db/migrate/20221019135937_populate_test_staffs.rb b/test/rails_apps/devise/db/migrate/20221019135937_populate_test_staffs.rb
new file mode 100644
index 0000000..d332198
--- /dev/null
+++ b/test/rails_apps/devise/db/migrate/20221019135937_populate_test_staffs.rb
@@ -0,0 +1,21 @@
+class PopulateTestStaffs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :staffs, :role, :string
+    100.times { |t| Staff.create(name: gen_name(t), age: rand(100), email: gen_email(t), role: gen_role, password: '12345678') }
+  end
+
+  private
+
+  def gen_name(number)
+    ['Igor', 'Michael' 'John', 'Stan', 'Bob', 'Kris', 'Alan'].sample + ' ' + number.to_s
+  end
+
+  def gen_email(number)
+    email = ['Igor', 'Michael' 'John', 'Stan', 'Bob', 'Kris', 'Alan'].sample + number.to_s + '@gmail.com'
+    email.downcase
+  end
+
+  def gen_role
+    ['admin', 'user', 'moderator'].sample
+  end
+end
diff --git a/test/rails_apps/devise/db/schema.rb b/test/rails_apps/devise/db/schema.rb
index a4c2bad..23cabe8 100644
--- a/test/rails_apps/devise/db/schema.rb
+++ b/test/rails_apps/devise/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_10_19_135121) do
+ActiveRecord::Schema.define(version: 2022_10_19_135937) do
 
   create_table "staffs", force: :cascade do |t|
     t.string "name"
@@ -27,6 +27,7 @@
     t.datetime "last_sign_in_at"
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
+    t.string "role"
     t.index ["email"], name: "index_staffs_on_email", unique: true
     t.index ["reset_password_token"], name: "index_staffs_on_reset_password_token", unique: true
   end

From a75d80f1401723fb0a97e709768f04aad852c0d0 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Wed, 19 Oct 2022 23:16:38 +0900
Subject: [PATCH 30/39] Fix routes

---
 test/rails_apps/devise/config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/rails_apps/devise/config/routes.rb b/test/rails_apps/devise/config/routes.rb
index cbaa9e1..ff0f252 100644
--- a/test/rails_apps/devise/config/routes.rb
+++ b/test/rails_apps/devise/config/routes.rb
@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   devise_for :users
+  devise_for :staffs
   root to: "home#index"
 
   get '/about' => 'home#about'

From 7fedc7c963cbbc6566dcd0bbe22d87d8792d77fd Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Thu, 20 Oct 2022 22:30:58 +0900
Subject: [PATCH 31/39] Fix navigation test

---
 app/controllers/any_login/application_controller.rb | 3 ++-
 lib/any_login/helpers.rb                            | 2 +-
 test/authlogic/integration/navigation_test.rb       | 2 +-
 test/clearance/integration/navigation_test.rb       | 2 +-
 test/devise/integration/navigation_test.rb          | 2 +-
 test/sorcery/integration/navigation_test.rb         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/any_login/application_controller.rb b/app/controllers/any_login/application_controller.rb
index 48b5df3..2334405 100755
--- a/app/controllers/any_login/application_controller.rb
+++ b/app/controllers/any_login/application_controller.rb
@@ -38,7 +38,8 @@ def try_to_render_404_not_found
     end
 
     def user_id
-      params[:back_to_previous_id].presence || params[:selected_id].presence || params[:id]
+      # TODO: refactor
+      params[:back_to_previous_id].presence || params["selected_#{params[:as].downcase}_id".to_sym].presence || params[:id]
     end
 
     def klass
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index 2822346..c6950da 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -24,7 +24,7 @@ def any_login_select(klass)
                         else
                           options_for_select(collection.to_a)
                         end
-        select_tag :selected_id, select_options, select_html_options(klass)
+        select_tag "selected_#{klass.to_s.downcase}_id", select_options, select_html_options(klass)
       end
 
       def any_login_previous_select(klass)
diff --git a/test/authlogic/integration/navigation_test.rb b/test/authlogic/integration/navigation_test.rb
index 1b432f0..f990395 100644
--- a/test/authlogic/integration/navigation_test.rb
+++ b/test/authlogic/integration/navigation_test.rb
@@ -16,7 +16,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_id option:last-of-type').select_option
+    find('#selected_user_id option:last-of-type').select_option
 
     visit "/about"
 
diff --git a/test/clearance/integration/navigation_test.rb b/test/clearance/integration/navigation_test.rb
index 47fa8a5..6aff67d 100644
--- a/test/clearance/integration/navigation_test.rb
+++ b/test/clearance/integration/navigation_test.rb
@@ -15,7 +15,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_id option:last-of-type').select_option
+    find('#selected_user_id option:last-of-type').select_option
 
     visit "/about"
 
diff --git a/test/devise/integration/navigation_test.rb b/test/devise/integration/navigation_test.rb
index 6a207f0..89503c5 100644
--- a/test/devise/integration/navigation_test.rb
+++ b/test/devise/integration/navigation_test.rb
@@ -17,7 +17,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     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 `test@test.com`. This works around the issue.
-    find('#selected_id option:last-of-type').select_option
+    find('#selected_user_id option:last-of-type').select_option
 
     visit "/about"
 
diff --git a/test/sorcery/integration/navigation_test.rb b/test/sorcery/integration/navigation_test.rb
index 0f3278b..38c9c7d 100644
--- a/test/sorcery/integration/navigation_test.rb
+++ b/test/sorcery/integration/navigation_test.rb
@@ -15,7 +15,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_id option:last-of-type').select_option
+    find('#selected_user_id option:last-of-type').select_option
 
     visit "/about"
 

From 36adfabdbad3ceb544fb795fb32da408bd56280c Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Thu, 20 Oct 2022 22:40:58 +0900
Subject: [PATCH 32/39] To escape id duplication, specify id = nil

---
 app/controllers/any_login/application_controller.rb | 3 +--
 lib/any_login/helpers.rb                            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/any_login/application_controller.rb b/app/controllers/any_login/application_controller.rb
index 2334405..48b5df3 100755
--- a/app/controllers/any_login/application_controller.rb
+++ b/app/controllers/any_login/application_controller.rb
@@ -38,8 +38,7 @@ def try_to_render_404_not_found
     end
 
     def user_id
-      # TODO: refactor
-      params[:back_to_previous_id].presence || params["selected_#{params[:as].downcase}_id".to_sym].presence || params[:id]
+      params[:back_to_previous_id].presence || params[:selected_id].presence || params[:id]
     end
 
     def klass
diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index c6950da..ffa05cb 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -24,7 +24,7 @@ def any_login_select(klass)
                         else
                           options_for_select(collection.to_a)
                         end
-        select_tag "selected_#{klass.to_s.downcase}_id", select_options, select_html_options(klass)
+        select_tag 'selected_id', select_options, select_html_options(klass).merge(id: nil)
       end
 
       def any_login_previous_select(klass)

From 724b1276732ee8de832f24c0ba7f583ea513bf99 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Thu, 20 Oct 2022 22:47:37 +0900
Subject: [PATCH 33/39] Fix navigation test

---
 test/authlogic/integration/navigation_test.rb | 2 +-
 test/clearance/integration/navigation_test.rb | 2 +-
 test/devise/integration/navigation_test.rb    | 2 +-
 test/sorcery/integration/navigation_test.rb   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/authlogic/integration/navigation_test.rb b/test/authlogic/integration/navigation_test.rb
index f990395..3f79a3c 100644
--- a/test/authlogic/integration/navigation_test.rb
+++ b/test/authlogic/integration/navigation_test.rb
@@ -16,7 +16,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_user_id option:last-of-type').select_option
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 
diff --git a/test/clearance/integration/navigation_test.rb b/test/clearance/integration/navigation_test.rb
index 6aff67d..fc7616c 100644
--- a/test/clearance/integration/navigation_test.rb
+++ b/test/clearance/integration/navigation_test.rb
@@ -15,7 +15,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_user_id option:last-of-type').select_option
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 
diff --git a/test/devise/integration/navigation_test.rb b/test/devise/integration/navigation_test.rb
index 89503c5..9b88def 100644
--- a/test/devise/integration/navigation_test.rb
+++ b/test/devise/integration/navigation_test.rb
@@ -17,7 +17,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     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 `test@test.com`. This works around the issue.
-    find('#selected_user_id option:last-of-type').select_option
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 
diff --git a/test/sorcery/integration/navigation_test.rb b/test/sorcery/integration/navigation_test.rb
index 38c9c7d..f6442be 100644
--- a/test/sorcery/integration/navigation_test.rb
+++ b/test/sorcery/integration/navigation_test.rb
@@ -15,7 +15,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
     visit "/"
 
     find(".any_login_form_toggle_label").click
-    find('#selected_user_id option:last-of-type').select_option
+    find("select option:last-of-type", match: :first).select_option
 
     visit "/about"
 

From 99e1b9109eba594654904582ac7971cfb1ed969a Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Thu, 20 Oct 2022 22:48:23 +0900
Subject: [PATCH 34/39] tweak

---
 lib/any_login/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/any_login/helpers.rb b/lib/any_login/helpers.rb
index ffa05cb..692f228 100644
--- a/lib/any_login/helpers.rb
+++ b/lib/any_login/helpers.rb
@@ -24,7 +24,7 @@ def any_login_select(klass)
                         else
                           options_for_select(collection.to_a)
                         end
-        select_tag 'selected_id', select_options, select_html_options(klass).merge(id: nil)
+        select_tag :selected_id, select_options, select_html_options(klass).merge(id: nil)
       end
 
       def any_login_previous_select(klass)

From b4c7f9402e34bea014edd570384de772547f068c Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 28 Nov 2022 20:06:50 +0900
Subject: [PATCH 35/39] Fix icon margin

---
 app/assets/stylesheets/any_login/application.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/any_login/application.css b/app/assets/stylesheets/any_login/application.css
index 56ee630..b29c3f8 100644
--- a/app/assets/stylesheets/any_login/application.css
+++ b/app/assets/stylesheets/any_login/application.css
@@ -66,6 +66,7 @@
   cursor: pointer;
   vertical-align: middle;
   fill: #fff;
+  margin: 5px;
 }
 
 #any_login:hover {

From c165db5acc9c8e230fa1436bf2572e5db18392e2 Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 28 Nov 2022 20:32:10 +0900
Subject: [PATCH 36/39] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 10cbe01..d9b27f2 100755
--- a/README.md
+++ b/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

From 9e8d627ac06db060b22810f544ee1336017ad60b Mon Sep 17 00:00:00 2001
From: kenzo-tanaka <kenzou.kenzou104809@gmail.com>
Date: Mon, 28 Nov 2022 20:36:17 +0900
Subject: [PATCH 37/39] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d9b27f2..b3d767d 100755
--- a/README.md
+++ b/README.md
@@ -115,6 +115,7 @@ It will create the initializer file `config/initializers/any_login.rb`.
 
 - **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_names** - class names for multiple model support. Default to `['User']`.
 - **collection_method** - method which returns collection of users. Sample:
   `.all`, `.active`, `.admins`, `.groupped_users`. Value is a simple.
   Defaults to `:all`.

From 9e40d233c1c11d761cb98182925c00e618e1cdbe Mon Sep 17 00:00:00 2001
From: Robert Clark <rbclarkdev@gmail.com>
Date: Mon, 8 Jan 2024 16:18:26 -0500
Subject: [PATCH 38/39] Use existing klass_name option for both single and
 multi-model support

---
 README.md                                              |  3 +--
 lib/any_login.rb                                       | 10 +++++-----
 lib/generators/any_login/templates/any_login.rb        |  5 +----
 .../rails_apps/devise/config/initializers/any_login.rb |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b3d767d..848b370 100755
--- a/README.md
+++ b/README.md
@@ -114,8 +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_names** - class names for multiple model support. Default 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`.
diff --git a/lib/any_login.rb b/lib/any_login.rb
index d2915ad..7e03f2e 100755
--- a/lib/any_login.rb
+++ b/lib/any_login.rb
@@ -24,10 +24,6 @@ module Provider
   mattr_accessor :klass_name
   @@klass_name = 'User'
 
-  # # ['User', 'Staff', etc]
-  mattr_accessor :klass_names
-  @@klass_names = [@@klass_name]
-
   # Sign-in Method
   mattr_accessor :sign_in
   @@sign_in = nil
@@ -101,7 +97,11 @@ def self.klass
   end
 
   def self.klasses
-    @@klasses = AnyLogin.klass_names.map(&:constantize)
+    @@klasses = if AnyLogin.klass_name.is_a?(Array)
+                  AnyLogin.klass_name.map(&:constantize)
+                else
+                  [AnyLogin.klass_name.constantize]
+                end
   end
 
   def self.cookie_name
diff --git a/lib/generators/any_login/templates/any_login.rb b/lib/generators/any_login/templates/any_login.rb
index 6514c16..2936984 100644
--- a/lib/generators/any_login/templates/any_login.rb
+++ b/lib/generators/any_login/templates/any_login.rb
@@ -5,12 +5,9 @@
   # # 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'
 
-  # # ['User', 'Staff', etc]
-  # config.klass_names = ['User']
-
   #  # .all, .active, .admins, .groped_collection, etc ... need to return an array (or hash with arrays) of users
   # config.collection_method = :all
 
diff --git a/test/rails_apps/devise/config/initializers/any_login.rb b/test/rails_apps/devise/config/initializers/any_login.rb
index 9092261..b75f22f 100644
--- a/test/rails_apps/devise/config/initializers/any_login.rb
+++ b/test/rails_apps/devise/config/initializers/any_login.rb
@@ -2,6 +2,6 @@
   config.enabled = true
   config.provider = :devise
   config.login_button_label = 'Sign in with Devise'
-  config.klass_names = ['User', 'Staff']
+  config.klass_name = ['User', 'Staff']
   config.collection_method = :all
 end

From f93cb6b12ef0d30aa242126041c3df514f270324 Mon Sep 17 00:00:00 2001
From: Robert Clark <rbclarkdev@gmail.com>
Date: Wed, 10 Jan 2024 14:42:42 -0500
Subject: [PATCH 39/39] Remove AnyLogin.klass and utilize klasses everywhere
 instead.

---
 README.md                               | 1 -
 app/views/any_login/_any_login.html.erb | 2 +-
 app/views/any_login/svg/_user.html.erb  | 1 -
 lib/any_login.rb                        | 8 --------
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 848b370..3d7cc42 100755
--- a/README.md
+++ b/README.md
@@ -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.
diff --git a/app/views/any_login/_any_login.html.erb b/app/views/any_login/_any_login.html.erb
index e0934ea..50b5e51 100755
--- a/app/views/any_login/_any_login.html.erb
+++ b/app/views/any_login/_any_login.html.erb
@@ -3,7 +3,7 @@
 
 <div id='any_login' class='<%= any_login_klasses %>'>
   <label for="any_login_form_toggle" class="any_login_form_toggle_label">
-    <%= render 'any_login/svg/user', :title => AnyLogin.klass %>
+    <%= render 'any_login/svg/user' %>
   </label>
   <input type="checkbox" id="any_login_form_toggle" <%= AnyLogin.auto_show ? "checked" : "" %>>
 
diff --git a/app/views/any_login/svg/_user.html.erb b/app/views/any_login/svg/_user.html.erb
index 1a07606..0db9b89 100644
--- a/app/views/any_login/svg/_user.html.erb
+++ b/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">
diff --git a/lib/any_login.rb b/lib/any_login.rb
index 7e03f2e..868f848 100755
--- a/lib/any_login.rb
+++ b/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
@@ -92,10 +88,6 @@ def self.collection(klass)
     Collection.new(collection_raw(klass))
   end
 
-  def self.klass
-    @@klass = AnyLogin.klass_name.constantize
-  end
-
   def self.klasses
     @@klasses = if AnyLogin.klass_name.is_a?(Array)
                   AnyLogin.klass_name.map(&:constantize)