any_login 1.4.4 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d97ccb81cdfaa94e0712bfdbb640cb937ed5c22a1a765f50888b8fb193d117a
-  data.tar.gz: 1c45382e0a8138f4a29ac128b4f1fb1bd68341866d32b36b3398d0679a92ae96
+  metadata.gz: f5bf2e4379dc3292f4370eccad6f0e9f25ae89d7f871525cfe8dc631b25ec38e
+  data.tar.gz: 8272a7055d6aca546c6f78375c026520691900b8f35c854724488cd767cf73dc
 SHA512:
-  metadata.gz: 01063e5b71544798e856eadf4d61b17f8f39f269770fc20cffa905b990a07d6dcec7c0f0eafa5f93e74d8d7e936dadbaa76929d4bf5e7c17f4002cd2bc2f1a64
-  data.tar.gz: a35ee2fec6e59fa2cecff681bf3b0952d0754e677fd9bc97a887bc5d466223c63b5749b3d1343a1ae3216af8dacebcf6aaa79b83130084d65e801031427ce99a
+  metadata.gz: c44e654790b0df3ed3c8280e6f3bad9ea29513068a2f0fa7529a127884342dae5b707916bdee2b0d9b5a6e1f1c04b666c31419293c634f9532f7d262290279d0
+  data.tar.gz: 9b38b9cf3010608a432c818c8ae52b2f4ef4d12129ece50daf61cd8e048b6b2b8696fad525156ab99d962f8647260ea53e6a9222d04b5180510bf41e3d6ac200

data/Rakefile

@@ -14,24 +14,39 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../test/rails_apps/devise/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
+Rake::TestTask.new(:test_devise) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = ['test/devise/**/*_test.rb']
+  t.verbose = false
+end
+
+Rake::TestTask.new(:test_authlogic) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = ['test/authlogic/**/*_test.rb']
   t.verbose = false
 end
 
+Rake::TestTask.new(:test_clearance) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = ['test/clearance/**/*_test.rb']
+  t.verbose = false
+end
 
-task default: :test
+Rake::TestTask.new(:test_sorcery) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = ['test/sorcery/**/*_test.rb']
+  t.verbose = false
+end

data/app/assets/javascripts/any_login/application.js

@@ -0,0 +1,23 @@
+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);
+});

data/app/assets/stylesheets/any_login/application.css

@@ -0,0 +1,96 @@
+#any_login {
+  position: fixed;
+  opacity: 0.5;
+  background: #5c4383;
+  color: white;
+  font-size: 16px;
+  line-height: 20px;
+  z-index: 10000;
+}
+
+#any_login form {
+  margin: 0;
+  height: auto;
+  padding: 4px 6px;
+}
+
+#any_login #any_login_box {
+  display: none;
+  vertical-align: middle;
+}
+
+#any_login_form_toggle {
+  display: none;
+}
+
+#any_login_form_toggle[type=checkbox]:checked ~ #any_login_box {
+  display: inline;
+}
+
+#any_login input,
+#any_login select {
+  color: black;
+  padding: 0;
+  margin: 0;
+  height: auto;
+  float: none;
+  text-decoration: none;
+  position: unset;
+  left: auto;
+  top: auto;
+  font-size: auto;
+  line-height: auto;
+}
+
+#any_login.any_login_top_left {
+  top: 0;
+  left: 0;
+}
+
+#any_login.any_login_top_right {
+  top: 0;
+  right: 0;
+}
+
+#any_login.any_login_bottom_left {
+  bottom: 0;
+  left: 0;
+}
+
+#any_login.any_login_bottom_right {
+  bottom: 0;
+  right: 0;
+}
+
+#any_login svg {
+  cursor: pointer;
+  vertical-align: middle;
+  fill: #fff;
+}
+
+#any_login:hover {
+  opacity: 1;
+}
+
+#any_login .any_login_user_information {
+  padding-left: 10px;
+  color: yellow;
+}
+
+#any_login #any_login_id_input {
+  width: 30px;
+}
+
+#any_login span#current_user_information {
+  display: inline;
+}
+
+#any_login span#current_user_information span {
+  display: inline;
+}
+
+#any_login span#anylogin_back_to_user {
+  padding-left: 15px;
+  color: cyan;
+  display: inline;
+}

data/app/controllers/any_login/application_controller.rb

@@ -1,6 +1,10 @@
 module AnyLogin
   class ApplicationController < ActionController::Base
-    include AnyLogin.provider::Controller
+    protect_from_forgery except: :js
+    before_action :try_not_to_leak_any_login_is_installed
+
+    include AnyLogin.provider.constantize::Controller
+    include ::Clearance::Controller if AnyLogin.provider.eql?("AnyLogin::Provider::Clearance")
 
     if AnyLogin.enabled
       if AnyLogin.http_basic_authentication_enabled
@@ -10,10 +14,17 @@ module AnyLogin
     end
 
     def any_login
-      try_not_to_leak_any_login_is_installed
       head 403 && return unless AnyLogin.verify_access_proc.call(self)
       add_to_previous
-      AnyLogin.provider::Controller.instance_method(:any_login_sign_in).bind(self).call
+      AnyLogin.provider.constantize::Controller.instance_method(:any_login_sign_in).bind(self).call
+    end
+
+    def css
+      send_file AnyLogin::Engine.root.join('app', 'assets', 'stylesheets', 'any_login', 'application.css'), content_type: 'text/css'
+    end
+
+    def js
+      send_file AnyLogin::Engine.root.join('app', 'assets', 'javascripts', 'any_login', 'application.js'), content_type: 'text/javascript'
     end
 
     private

data/app/views/any_login/_any_login.html.erb

@@ -1,7 +1,13 @@
+<script src="<%= any_login.js_path %>"></script>
+<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 %>
-    <%= image_tag 'any_login/person.png', :alt => AnyLogin.klass, :onclick => "AnyLogin.on_image_click();" %>
-    <span id='any_login_box' class='hidden_box'>
+    <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 %>
@@ -11,136 +17,3 @@
     </span>
   <% end %>
 </div>
-
-<script type="text/javascript" charset="utf-8">
-  Element.prototype.hasClass = function (className) {
-      return new RegExp(' ' + className + ' ').test(' ' + this.className + ' ');
-  };
-
-  Element.prototype.addClass = function (className) {
-      if (!this.hasClass(className)) {
-          this.className += ' ' + className;
-      }
-  };
-
-  Element.prototype.removeClass = function (className) {
-      var newClass = ' ' + this.className.replace(/[\t\r\n]/g, ' ') + ' '
-      if (this.hasClass(className)) {
-          while (newClass.indexOf( ' ' + className + ' ') >= 0) {
-              newClass = newClass.replace(' ' + className + ' ', ' ');
-          }
-          this.className = newClass.replace(/^\s+|\s+$/g, ' ');
-      }
-  };
-  Element.prototype.toggleClass = function (className) {
-      var newClass = ' ' + this.className.replace(/[\t\r\n]/g, " ") + ' ';
-      if (this.hasClass(className)) {
-          while (newClass.indexOf(" " + className + " ") >= 0) {
-              newClass = newClass.replace(" " + className + " ", " ");
-          }
-          this.className = newClass.replace(/^\s+|\s+$/g, ' ');
-      } else {
-          this.className += ' ' + className;
-      }
-  };
-
-  var AnyLogin = {};
-  AnyLogin.on_image_click = function() {
-      var elem = document.getElementById('any_login_box');
-      elem.toggleClass("hidden_box");
-      elem.toggleClass("visible_box");
-  };
-  AnyLogin.on_select_change = function() {
-      document.getElementById('any_login_form').submit();
-  };
-</script>
-
-<style type="text/css" media="screen">
-  #any_login {
-    position: fixed;
-    opacity: 0.5;
-    background: #5c4383;
-    color: white;
-    font-size: 16px;
-    line-height: 20px;
-    z-index: 10000;
-  }
-  #any_login form {
-    padding: 0;
-    margin: 0;
-    height: auto;
-  }
-  #any_login input, #any_login select {
-    color: black;
-    padding: 0;
-    margin: 0;
-    height: auto;
-    float: none;
-    text-decoration: none;
-    position: unset;
-    left: auto;
-    top: auto;
-    font-size: auto;
-    line-height: auto;
-  }
-  #any_login .hidden_box {
-    display: none;
-  }
-  #any_login .visible_box {
-    display: inline;
-  }
-  #any_login.any_login_top_left {
-    top: 0;
-    left: 0;
-  }
-  #any_login.any_login_top_right {
-    top: 0;
-    right: 0;
-  }
-  #any_login.any_login_bottom_left {
-    bottom: 0;
-    left: 0;
-  }
-  #any_login.any_login_bottom_right {
-    bottom: 0;
-    right: 0;
-  }
-  #any_login.any_login_visible {
-    opacity: 1;
-  }
-  #any_login img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-  #any_login:hover {
-    opacity: 1;
-  }
-  #any_login form {
-    padding: 4px 6px;
-  }
-  #any_login span {
-    display: none;
-    vertical-align: middle;
-  }
-  #any_login.any_login_auto_show span {
-    display: inline;
-  }
-  #any_login .any_login_user_information {
-    padding-left: 10px;
-    color: yellow;
-  }
-  #any_login #any_login_id_input {
-    width: 30px;
-  }
-  #any_login span#current_user_information {
-    display: inline;
-  }
-  #any_login span#current_user_information span {
-    display: inline;
-  }
-  #any_login span#anylogin_back_to_user {
-    padding-left: 15px;
-    color: cyan;
-    display: inline;
-  }  
-</style>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<svg style="enable-background:new 0 0 24 24;" 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">
+      <ellipse cx="12" cy="8" rx="5" ry="6" />
+      <path
+        d="M21.8,19.1c-0.9-1.8-2.6-3.3-4.8-4.2c-0.6-0.2-1.3-0.2-1.8,0.1c-1,0.6-2,0.9-3.2,0.9s-2.2-0.3-3.2-0.9    C8.3,14.8,7.6,14.7,7,15c-2.2,0.9-3.9,2.4-4.8,4.2C1.5,20.5,2.6,22,4.1,22h15.8C21.4,22,22.5,20.5,21.8,19.1z" />
+    </g>
+  </g>
+</svg>

data/config/routes.rb

@@ -1,4 +1,6 @@
 AnyLogin::Engine.routes.draw do
+  get '/any_login/js' => 'application#js', as: :js
+  get '/any_login/css' => 'application#css', as: :css
   post '/any_login/sign_in' => 'application#any_login', as: :sign_in
 end
 

data/lib/any_login/engine.rb

@@ -2,17 +2,10 @@ module AnyLogin
   class Engine < ::Rails::Engine
     isolate_namespace AnyLogin
 
-    initializer 'any_login.assets_precompile', :group => :all do |app|
-      app.config.assets.precompile += ['any_login/person.png']
-    end
-
     initializer 'any_login.helpers' do
       load_provider
-
       ActiveSupport.on_load :action_controller do
-        if Rails::VERSION::MAJOR >= 6
-          AnyLogin.provider::Controller.send :include, Rails.application.routes.url_helpers
-        end
+        AnyLogin.provider.constantize::Controller.send :include, Rails.application.routes.url_helpers
       end
 
       ActiveSupport.on_load :action_view do
@@ -23,29 +16,29 @@ module AnyLogin
     private
 
     def load_provider
-      case AnyLogin.provider || provider
-      when :authlogic
-        require 'any_login/providers/authlogic'
-      when :devise
-        require 'any_login/providers/devise'
-      when :clearance
-        require 'any_login/providers/clearance'
-      when :sorcery
-        require 'any_login/providers/sorcery'
+      if (selected_provider = AnyLogin.provider || provider)
+        provider_with_module = "AnyLogin::Provider::#{selected_provider.to_s.capitalize}"
+        if Object.const_defined?(provider_with_module)
+          AnyLogin.provider = provider_with_module
+        else
+          AnyLogin.provider = selected_provider.to_s
+        end
       else
-        throw 'Please use this gem with any of the following gems: Devise, Authlogic or Clearance'
+        throw 'Please use this gem with Devise, Authlogic or Clearance or provide a custom handler class'
       end
     end
 
     def provider
-      if AnyLogin.provider.nil? && Object.const_defined?('Authlogic')
-        :authlogic
-      elsif AnyLogin.provider.nil? && Object.const_defined?('Devise')
-        :devise
-      elsif AnyLogin.provider.nil? && Object.const_defined?('Clearance')
-        :clearance
-      elsif AnyLogin.provider.nil? && Object.const_defined?('Sorcery')
-        :sorcery
+      if AnyLogin.provider.nil?
+        if Object.const_defined?('Authlogic')
+          :authlogic
+        elsif Object.const_defined?('Devise')
+          :devise
+        elsif Object.const_defined?('Clearance')
+          :clearance
+        elsif Object.const_defined?('Sorcery')
+          :sorcery
+        end
       end
     end
 

data/lib/any_login/helpers.rb

@@ -53,7 +53,6 @@ module AnyLogin
 
       def select_html_options(prompt = AnyLogin.select_prompt)
         options = {}
-        options[:onchange] = 'AnyLogin.on_select_change();' if AnyLogin.login_on == :both
         options[:prompt] = prompt
         options
       end
@@ -61,13 +60,12 @@ module AnyLogin
       def any_login_klasses
         klasses = []
         klasses << "any_login_#{AnyLogin.position || 'bottom_left'}"
-        klasses << 'any_login_auto_show' if AnyLogin.auto_show
         klasses.join(' ')
       end
 
       def current_user_information
-        if respond_to?(AnyLogin.provider::Controller.any_login_current_user_method) &&
-           user = send(AnyLogin.provider::Controller.any_login_current_user_method)
+        if respond_to?(AnyLogin.provider.constantize::Controller.any_login_current_user_method) &&
+           user = send(AnyLogin.provider.constantize::Controller.any_login_current_user_method)
           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}")

data/lib/any_login/providers/authlogic.rb

@@ -20,5 +20,3 @@ module AnyLogin
     end
   end
 end
-
-AnyLogin.provider = AnyLogin::Provider::Authlogic

data/lib/any_login/providers/clearance.rb

@@ -20,7 +20,3 @@ module AnyLogin
     end
   end
 end
-
-AnyLogin.provider = AnyLogin::Provider::Clearance
-
-AnyLogin::ApplicationController.send(:include, ::Clearance::Controller)

data/lib/any_login/providers/devise.rb

@@ -6,11 +6,15 @@ module AnyLogin
 
         DEFAULT_SIGN_IN = proc do |loginable|
           reset_session
-          sign_in AnyLogin.klass.to_s.parameterize.underscore.to_sym, loginable
+          sign_in Controller.mapping_key, loginable
         end
 
         def self.any_login_current_user_method
-          @@any_login_current_user_method ||= "current_#{AnyLogin.klass.to_s.parameterize.underscore}".to_sym
+          @@any_login_current_user_method ||= "current_#{mapping_key}".to_sym
+        end
+
+        def self.mapping_key
+          @@mapping_key ||= ::Devise.mappings.detect {|_key, mapping| mapping.class_name == AnyLogin.klass.name }.first
         end
 
         def any_login_sign_in
@@ -21,11 +25,8 @@ module AnyLogin
 
           redirect_to main_app.send(AnyLogin.redirect_path_after_login)
         end
-
       end
 
     end
   end
 end
-
-AnyLogin.provider = AnyLogin::Provider::Devise

data/lib/any_login/providers/sorcery.rb

@@ -20,5 +20,3 @@ module AnyLogin
     end
   end
 end
-
-AnyLogin.provider = AnyLogin::Provider::Sorcery

data/lib/any_login/version.rb

@@ -1,3 +1,3 @@
 module AnyLogin
-  VERSION = '1.4.4'
+  VERSION = '1.5.2'
 end

data/test/authlogic/integration/navigation_test.rb

@@ -0,0 +1,25 @@
+require_relative '../test_helper_authlogic'
+
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = User.create(name: "test", email: "test@test.com", password: "password123", role: "user")
+  end
+
+  test "user cannot navigate to about page without login" do
+    visit "/about"
+
+    assert_no_text("This is secret page available only for logged in users")
+  end
+
+  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
+
+    visit "/about"
+
+    assert_text("This is secret page available only for logged in users")
+  end
+end

data/test/authlogic/test_helper_authlogic.rb

@@ -0,0 +1,5 @@
+ENV["RAILS_ENV"] = "test"
+
+require_relative "../rails_apps/authlogic/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../rails_apps/authlogic/db/migrate", __dir__)]
+require "test_helper_common"

data/test/clearance/integration/navigation_test.rb

@@ -0,0 +1,24 @@
+require_relative '../test_helper_clearance'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = User.create(name: "test", email: "test@test.com", password: "password123", role: "user")
+  end
+
+  test "user cannot navigate to about page without login" do
+    visit "/about"
+
+    assert_no_text("This is secret page available only for logged in users")
+  end
+
+  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
+
+    visit "/about"
+
+    assert_text("This is secret page available only for logged in users")
+  end
+end

data/test/clearance/test_helper_clearance.rb

@@ -0,0 +1,5 @@
+ENV["RAILS_ENV"] = "test"
+
+require_relative "../rails_apps/clearance/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../rails_apps/clearance/db/migrate", __dir__)]
+require "test_helper_common"

data/test/devise/integration/navigation_test.rb

@@ -0,0 +1,26 @@
+require_relative "../test_helper_devise"
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = User.create(name: "test", email: "test@test.com", password: "password123", role: "user")
+  end
+
+  test "user cannot navigate to about page without login" do
+    visit "/about"
+
+    assert_no_text("This is secret page available only for logged in users")
+  end
+
+  test "it properly logs users in and allows access to the secret page" do
+    visit "/"
+
+    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
+
+    visit "/about"
+
+    assert_text("This is secret page available only for logged in users")
+  end
+end

data/test/devise/test_helper_devise.rb

@@ -0,0 +1,5 @@
+ENV["RAILS_ENV"] = "test"
+
+require_relative "../rails_apps/devise/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../rails_apps/devise/db/migrate", __dir__)]
+require_relative "../test_helper_common"

data/test/{any_login_test.rb → devise/unit/any_login_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative "../test_helper_devise"
 
 class AnyLoginTest < ActiveSupport::TestCase
   test "truth" do

data/test/{any_login → devise/unit}/collection_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "../test_helper_devise"
 
 module AnyLogin
   class CollectionTest < ActiveSupport::TestCase

data/test/{dummy-authlogic → rails_apps/authlogic}/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative "config/application"
 
 Rails.application.load_tasks

data/test/rails_apps/authlogic/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}