any_login 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c014e2e8bac3887e0126a342a6fa41cfd35152ca6a4748437f0f228b42b4accf
-  data.tar.gz: 329b8c06313c12f8996cae7dae61604353aadd79ca7d25fc73f1a96409785ce3
+  metadata.gz: bfc947837944c5fd9470108cd402ac191433e9b79d1f49820ff9f7709e5c6d0a
+  data.tar.gz: 13dceae2e364d6a13a694855b1d2539216b1e4c5d7fb93d550a7df8a17ff2ba7
 SHA512:
-  metadata.gz: aacd5fc147a06705b3d39651554a7b0267c1323cc900b2a3bacdc8731e68ced22ae13226aaaa41dc4c370ad5ae71ead5db3a62fe845b4383a5211ec537230925
-  data.tar.gz: b96ddf9d769f8e7bb56af19e2b404153aaa3750a2e466fb99ff35735c0fc8c92a91bf30b6f0dbef447636d1744952d62d4a00db20d63457b0540cedaeb986985
+  metadata.gz: beca6cddab932f7c230a1d5ec979789d72ec54f1b7cea40bfdc56949680641534a0d2c8fe29b8664fa5073abf2324cc9f89d3eb76e6e7d56eef5a248fa96d557
+  data.tar.gz: 9ab1c3b8fb682bc8037e1caa9e741a1d4933676dcc76f3f68746d80a9c1472fca7fd67a73de3734ce7530f6079887c4c90b18265913806c64a81b7c93d1e0141

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

@@ -12,6 +12,9 @@
   margin: 0;
   height: auto;
   padding: 4px 6px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
 }
 
 #any_login #any_login_box {

data/app/controllers/any_login/application_controller.rb

@@ -1,6 +1,6 @@
 module AnyLogin
   class ApplicationController < ActionController::Base
-    protect_from_forgery except: :js
+    protect_from_forgery
     before_action :try_not_to_leak_any_login_is_installed
 
     include AnyLogin.provider.constantize::Controller
@@ -19,14 +19,6 @@ module AnyLogin
       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
 
     def try_not_to_leak_any_login_is_installed

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

@@ -1,10 +1,10 @@
-<script src="<%= any_login.js_path %>"></script>
-<link rel="stylesheet" href="<%= any_login.css_path %>">
+<%= render 'any_login/assets/js' %>
+<%= render 'any_login/assets/css' %>
 
 <div id='any_login' class='<%= any_login_klasses %>'>
-  <%= form_tag any_login.sign_in_path, :method => :post, :id => 'any_login_form' do %>
+  <%= 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 %>
+      <%= 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'>

data/app/views/any_login/assets/_css.html.erb

@@ -0,0 +1,101 @@
+<style>
+  #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;
+    display: flex;
+    align-items: center;
+    gap: 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;
+  }
+</style>

data/app/views/any_login/assets/_js.html.erb

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

data/config/routes.rb

@@ -1,6 +1,4 @@
 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/helpers.rb

@@ -9,7 +9,9 @@ module AnyLogin
     if AnyLogin.enabled
 
       def any_login_id_input
-        text_field_tag :id, '', :placeholder => 'ID', :id => 'any_login_id_input', :required => true
+        def any_login_id_input
+          text_field_tag :id, '', placeholder: 'ID', id: 'any_login_id_input', required: true
+        end
       end
 
       def any_login_submit

data/lib/any_login/providers/devise.rb

@@ -6,7 +6,7 @@ module AnyLogin
 
         DEFAULT_SIGN_IN = proc do |loginable|
           reset_session
-          sign_in Controller.mapping_key, loginable
+          sign_in loginable, scope: Controller.mapping_key
         end
 
         def self.any_login_current_user_method

data/lib/any_login/version.rb

@@ -1,3 +1,3 @@
 module AnyLogin
-  VERSION = '1.5.3'
+  VERSION = '1.6.0'
 end