wobauth 5.0.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5e1f219efe48cd29c469eb5d3ed59a25b1fc67475bfae58a264b0e7c99ad1a
-  data.tar.gz: 8bdbdcfd1a077031af6b1877467adfa058ed08ab45f9dbe21e35948a12e9d6e9
+  metadata.gz: 9f5d6fe7d5bebfcd1023a7c22cadff30e5ded6bf2cf7e47836ca173d94086d14
+  data.tar.gz: c75d02e6d4fa63695cf712ca9d7a6abf6d0f40dbbd1062e23d73a1fc2ddeb57a
 SHA512:
-  metadata.gz: a0c43642e78f30c47ea97a380079bc544c9bda95efa28a143a9c446bc140e42121e6e80c6e1a06675a44a2112ead2f4fa651b0c5e57a6e7f4222407e5a9e03a0
-  data.tar.gz: fd817e4f7019a3fa07bdb8340f096fb307870ba7e8324df128b65596e5fc11b12a01683b1396d4e79fdbae6c3747da9a5c542c9b6498ecba9ddb4d608ab0680b
+  metadata.gz: 4e03e2f7b9d1c6adecfdc0cf6528366b6639ca47fb98fbb50e218555e0621be2d629d0554a35d2ea6394b6e1ca7ecfc1b56ac042a62dc331c7be9cd611d7d6c5
+  data.tar.gz: ca5306cbcfa4b708761770e8a698ed796e3852594244650b13bd0b1ca184ea8fc10dd4022b67686a287a2256f30623b0e04d1e8e3c547eabbc3994949dd2b9bb

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2014-2020 Wolfgang Barth
+Copyright (c) 2014-2021 Wolfgang Barth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -34,11 +34,17 @@ wobauth 5.x works with rails 6.x and is designed for autoloading via zeitwerk.
 Requirements
 ------------
 
+### Rails >= 6.0; autoload = :zeitwerk; webpacker; stimulusjs
+
+| branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
+|------------|-------|--------|-----------|-----------------|---------------|
+| 5-1-stable | >=6.0 | >= 2.6 |  v4       | fontawesome 5.x | master (4.x)  |
+
 ### Rails >= 6.0, autoload = :zeitwerk
 
 | branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
 |------------|-------|--------|-----------|-----------------|---------------|
-| master(5.x)| >=6.0 | >= 2.6 |  v4       | fontawesome 5.x | master (4.x)  |
+| 5-stable   | >=6.0 | >= 2.6 |  v4       | fontawesome 5.x | master (4.x)  |
 
 ### Rails <= 5.2, autoload = :classic
 
@@ -181,7 +187,7 @@ included in this rails engine.
 Licence
 -------
 
-wobauth Copyright (C) 2014-2020  Wolfgang Barth
+wobauth Copyright (C) 2014-2021  Wolfgang Barth
 
 MIT license, see [LICENSE](LICENSE)
 

data/app/assets/javascripts/wobauth/authorities.js.coffee

@@ -4,14 +4,14 @@
 
 # - start with given values
 auth_types = $('#authority_authorizable_type').find("option:selected").val()
-$('#authority_authorizable_id optgroup').find('option').addBack().hide()
-$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().show()
+$('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorizable_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorizable_id optgroup').find('option').addBack().hide()
-  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )
 
 #
@@ -20,12 +20,12 @@ $(document).on('click', '#authority_authorizable_type', ->
 
 # - start with given values
 authfor_type = $('#authority_authorized_for_type').find("option:selected").val()
-$('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().show()
+$('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorized_for_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )

data/app/helpers/wobauth/application_helper.rb

@@ -1,19 +1,7 @@
 module Wobauth
   module ApplicationHelper
     include Wobapphelpers::Helpers::All
-
-    def polymorphic_selector(form, poly, types, group_method = :all)
-      msg = ""
-      # -- object available?
-      if form.object.send(poly).present?
-	msg += poly_type_display(form, poly)
-	msg += poly_id_select(form, poly, form.object.send("#{poly}_type"), :all)
-      else
-	msg += poly_type_select(form, poly, types)
-	msg += poly_id_select(form, poly, types, group_method)
-      end
-      msg.html_safe
-    end
+    include Wobapphelpers::Helpers::PolymorphicHelper
 
     def navigation_admin_links
       render partial: 'wobauth/shared/admin'
@@ -29,25 +17,5 @@ module Wobauth
       end
     end
 
-  private
-
-    def poly_type_select(f, poly, types)
-      f.input "#{poly}_type".to_sym, collection: types,
-              label_method: lambda {|x| t('activerecord.models.' + x.underscore)}
-    end
-
-    def poly_type_display(f, poly)
-     f.input("#{poly}_type".to_sym, collection: Array(f.object.send("#{poly}_type")),
-       label_method: lambda {|x| t('activerecord.models.' + x.underscore)},
-       disabled: true) +
-     f.hidden_field("#{poly}_type".to_sym, value: f.object.send("#{poly}_type"))
-    end
-
-    def poly_id_select(f, poly, types, group_method)
-      collections = Array(types).map {|t| t.constantize}
-      f.input "#{poly}_id".to_sym, collection: collections,
-                 as: :grouped_select, group_method: group_method
-    end
-
   end
 end

data/app/services/wobauth/search_ad_user_service.rb

@@ -17,17 +17,27 @@ module Wobauth
 	return Result.new(success: false, error_messages: ["no query given"], ad_users: [])
       end
 
-      ldap = Wobaduser::LDAP.new(ldap_options: ldap_options)
-      if ldap.errors.any?
-	return Result.new(success: false, error_messages: ldap.errors, ad_users: [])
+      errors = []
+      ad_users = []
+      ldap_options.each do |ldapopts|
+        ldap = Wobaduser::LDAP.new(ldap_options: ldapopts)
+        if ldap.errors.any?
+          errors += ldap.errors
+          next
+        end
+        search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
+        if search.success?
+          ad_users += search.entries
+        else
+          errors += search.errors
+        end
       end
 
-      search = Wobaduser::User.search(ldap: ldap, filter: user_filter(query))
-      if search.success?
-	result = Result.new(success: true, error_messages: [], ad_users: search.entries)
+      if errors.any?
+        return Result.new(success: false, error_messages: errors, ad_users: ad_users)
       else
-	result = Result.new(success: false, error_messages: search.errors, ad_users: [])
-       end
+        result = Result.new(success: true, error_messages: errors, ad_users: ad_users)
+      end
     end
 
   private
@@ -50,5 +60,13 @@ module Wobauth
       filter += ")"
       filter = Net::LDAP::Filter.construct(filter)
     end
+
+    def ldap_options
+      if @ldap_options.kind_of? Hash
+        [@ldap_options]
+      else
+        @ldap_options
+      end
+    end
   end
-end
+ end

data/app/views/wobauth/ad_users/index.html.erb

@@ -11,59 +11,65 @@
 </div>
 <br>
 
-<table id="adusers" class="table table-bordered table-striped dataTable" role="datatable">
-  <thead>
-    <tr>
-      <th><%= t('attributes.sn') %></th>
-      <th><%= t('attributes.givenname') %></th>
-      <th><%= t('attributes.ort') %></th>
-      <th><%= t('attributes.plz') %></th>
-      <th><%= t('attributes.streetaddress') %></th>
-      <th><%= t('attributes.department') %></th>
-      <th><%= t('attributes.company') %></th>
-      <th><%= t('attributes.mail') %></th>
-      <th><%= t('attributes.telephonenumber') %></th>
-      <th><%= t('attributes.facsimiletelephonenumber') %></th>
-      <th><%= t('attributes.mobile') %></th>
-      <th><%= t('attributes.username') %></th>
-      <th><%= t('wobauth.action') %></th>
-    </tr>
-  </thead>
-  <tfoot>
-    <tr>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </tfoot>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :adusers, role: :woauth_datatable,
+    class: "table table-bordered table-striped",
+    data: { 
+      target: 'datatables.datatable', 
+    } do %>
+    <thead>
+      <tr>
+        <th><%= t('attributes.sn') %></th>
+        <th><%= t('attributes.givenname') %></th>
+        <th><%= t('attributes.ort') %></th>
+        <th><%= t('attributes.plz') %></th>
+        <th><%= t('attributes.streetaddress') %></th>
+        <th><%= t('attributes.department') %></th>
+        <th><%= t('attributes.company') %></th>
+        <th><%= t('attributes.mail') %></th>
+        <th><%= t('attributes.telephonenumber') %></th>
+        <th><%= t('attributes.facsimiletelephonenumber') %></th>
+        <th><%= t('attributes.mobile') %></th>
+        <th><%= t('attributes.username') %></th>
+        <th><%= t('wobauth.action') %></th>
+      </tr>
+    </thead>
+    <tfoot>
+      <tr>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+      </tr>
+    </tfoot>
 
-  <tbody>
-    <% @ad_users.each do |ad_user| %>
-      <%= content_tag(:tr, class: aduser_class(Wobauth::User, ad_user)) do %>
-	<td><%= ad_user.sn %></td>
-	<td><%= ad_user.givenname %></td>
-	<td><%= ad_user.l %></td>
-	<td><%= ad_user.postalcode %></td>
-	<td><%= ad_user.streetaddress %></td>
-	<td><%= ad_user.department %></td>
-	<td><%= ad_user.company %></td>
-	<td><%= ad_user.mail %></td>
-	<td><%= ad_user.telephonenumber %></td>
-	<td><%= ad_user.facsimiletelephonenumber %></td>
-	<td><%= ad_user.mobile %></td>
-	<td><%= ad_user.username %></td>
-	<td><%= new_from_aduser_link(Wobauth::User, ad_user) %></td>
+    <tbody>
+      <% @ad_users.each do |ad_user| %>
+        <%= content_tag(:tr, class: aduser_class(Wobauth::User, ad_user)) do %>
+          <td><%= ad_user.sn %></td>
+          <td><%= ad_user.givenname %></td>
+          <td><%= ad_user.l %></td>
+          <td><%= ad_user.postalcode %></td>
+          <td><%= ad_user.streetaddress %></td>
+          <td><%= ad_user.department %></td>
+          <td><%= ad_user.company %></td>
+          <td><%= ad_user.mail %></td>
+          <td><%= ad_user.telephonenumber %></td>
+          <td><%= ad_user.facsimiletelephonenumber %></td>
+          <td><%= ad_user.mobile %></td>
+          <td><%= ad_user.username %></td>
+          <td><%= new_from_aduser_link(Wobauth::User, ad_user) %></td>
+        <% end %>
       <% end %>
-    <% end %>
-  </tbody>
-</table>
+    </tbody>
+  <% end %>
+</div>

data/app/views/wobauth/authorities/_form.html.erb

@@ -11,12 +11,16 @@
     <%= polymorphic_selector(f,
                              'authorizable',
                               Wobauth.authorizable_types,
-                              Wobauth.authorizable_group_method) %>
+                              Wobauth.authorizable_group_method,
+                              {class: 'select2'}) 
+     %>
     <%= f.association :role %>
     <%= polymorphic_selector(f,
                              'authorized_for',
                              Wobauth.authorized_for_types,
-                             Wobauth.authorized_for_group_method) %>
+                             Wobauth.authorized_for_group_method,
+                              {class: 'select2'}) 
+     %>
 
     <%= f.input :valid_from, as: :string, class: 'datepicker'
      %>

data/app/views/wobauth/authorities/index.html.erb

@@ -1,40 +1,45 @@
 <h1><%= t('controller.wobauth/authorities') %></h1>
 
-<%= content_tag :table, id: :wobauth_authorities, role: :wobauth_datatable,
-    class: "table table-bordered table-striped dataTable" do %>
-<thead>
-  <tr>
-    <th><%= t('attributes.authorizable') %></th>
-    <th><%= t('attributes.authorizable_type') %></th>
-    <th><%= t('attributes.role') %></th>
-    <th><%= t('attributes.authorized_for') %></th>
-    <th><%= t('attributes.authorized_for_type') %></th>
-    <th><%= t('attributes.valid_from') %></th>
-    <th><%= t('attributes.valid_until') %></th>
-    <th><%= t('wobauth.action') %></th>
-  </tr>
-</thead>
-<tbody>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_authorities, role: :wobauth_datatable,
+      class: "table table-bordered table-striped",
+      data: {
+        target: 'datatables.datatable',
+      } do %>
 
-<% @authorities.each do |authority| %>
-  <%= content_tag_for(:tr, authority) do %>
-    <td><%= authority.authorizable %></td>
-    <td><%= authority.authorizable_type %></td>
-    <td><%= authority.role %></td>
-    <td><%= authority.authorized_for %></td>
-    <td><%= authority.authorized_for_type %></td>
-    <td><%= authority.valid_from %></td>
-    <td><%= authority.valid_until %></td>
-    <td class="nowrap">
-      <%= show_link [wobauth, authority] %>
-      <%= edit_link [wobauth, authority] %>
-      <%= delete_link [wobauth, authority] %>
-    </td>
-  <% end %>
-<% end %>
-</tbody>
-<% end %>
+  <thead>
+    <tr>
+      <th><%= t('attributes.authorizable') %></th>
+      <th><%= t('attributes.authorizable_type') %></th>
+      <th><%= t('attributes.role') %></th>
+      <th><%= t('attributes.authorized_for') %></th>
+      <th><%= t('attributes.authorized_for_type') %></th>
+      <th><%= t('attributes.valid_from') %></th>
+      <th><%= t('attributes.valid_until') %></th>
+      <th><%= t('wobauth.action') %></th>
+    </tr>
+  </thead>
+  <tbody>
 
+  <% @authorities.each do |authority| %>
+    <%= content_tag(:tr, dom_id(authority)) do %>
+      <td><%= authority.authorizable %></td>
+      <td><%= authority.authorizable_type %></td>
+      <td><%= authority.role %></td>
+      <td><%= authority.authorized_for %></td>
+      <td><%= authority.authorized_for_type %></td>
+      <td><%= authority.valid_from %></td>
+      <td><%= authority.valid_until %></td>
+      <td class="nowrap">
+        <%= show_link [wobauth, authority] %>
+        <%= edit_link [wobauth, authority] %>
+        <%= delete_link [wobauth, authority] %>
+      </td>
+    <% end %>
+  <% end %>
+  </tbody>
+  <% end %>
+</div>
 <br />
 
 <%= back_link %>

data/app/views/wobauth/authorities/show.html.erb

@@ -3,33 +3,33 @@
     <h4><%= t('activerecord.models.wobauth/authority') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless">
       <tr>
-	<th><%= t('attributes.authorizable')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable')%>:</th>
 	<td><%= @authority.authorizable %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorizable_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable_type')%>:</th>
 	<td><%= @authority.authorizable_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.role')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.role')%>:</th>
 	<td><%= @authority.role %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for')%>:</th>
 	<td><%= @authority.authorized_for %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for_type')%>:</th>
 	<td><%= @authority.authorized_for_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_from')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_from')%>:</th>
 	<td><%= @authority.valid_from %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_until')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_until')%>:</th>
 	<td><%= @authority.valid_until %></td>
       </tr>
     </table>

data/app/views/wobauth/groups/_group_memberships.html.erb

@@ -8,7 +8,7 @@
  </thead>
  <tbody>
 <% group.memberships.each do |membership| %>
-  <%= content_tag_for(:tr, membership) do %>
+  <%= content_tag(:tr, dom_id(membership)) do %>
     <td><%= link_to membership.user, wobauth.user_path(membership.user) %></td>
     <td><%= membership.auto %></td>
     <td class="nowrap"> 

data/app/views/wobauth/groups/_group_roles.html.erb

@@ -9,7 +9,7 @@
  </thead>
  <tbody>
 <% group.authorities.each do |authority| %>
-  <%= content_tag_for(:tr, authority) do %>
+  <%= content_tag(:tr, dom_id(authority)) do %>
     <td><%= link_to authority.role, wobauth.role_path(authority.role) %></td>
     <td><%= authorized_for_link(authority.authorized_for) %></td>
     <td><%= authority.authorized_for_type %></td>

data/app/views/wobauth/groups/index.html.erb

@@ -1,29 +1,35 @@
 <h1><%= t('controller.wobauth/groups') %></h1>
 
-<%= content_tag :table, id: :wobauth_groups, role: :wobauth_datatable,
-    class: "table table-bordered table-striped dataTable" do %>
-<thead>
-  <tr>
-    <th><%= t('attributes.name') %></th>
-    <th><%= t('attributes.description') %></th>
-    <th><%= t('wobauth.action') %></th>
-  </tr>
-</thead>
-<tbody>
 
-<% @groups.each do |group| %>
-  <%= content_tag_for(:tr, group) do %>
-    <td><%= group.name %></td>
-    <td><%= group.description %></td>
-    <td class="nowrap">
-      <%= show_link [wobauth, group] %>
-      <%= edit_link [wobauth, group] %>
-      <%= delete_link [wobauth, group] %>
-    </td>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_groups, role: :wobauth_datatable,
+      class: "table table-bordered table-striped",
+      data: {
+        target: 'datatables.datatable',
+      } do %>
+  <thead>
+    <tr>
+      <th><%= t('attributes.name') %></th>
+      <th><%= t('attributes.description') %></th>
+      <th><%= t('wobauth.action') %></th>
+    </tr>
+  </thead>
+  <tbody>
+
+  <% @groups.each do |group| %>
+    <%= content_tag(:tr, dom_id(group)) do %>
+      <td><%= group.name %></td>
+      <td><%= group.description %></td>
+      <td class="nowrap">
+        <%= show_link [wobauth, group] %>
+        <%= edit_link [wobauth, group] %>
+        <%= delete_link [wobauth, group] %>
+      </td>
+    <% end %>
+  <% end %>
+  </tbody>
   <% end %>
-<% end %>
-</tbody>
-<% end %>
+</div>
 
 <br />
 

data/app/views/wobauth/memberships/index.html.erb

@@ -1,31 +1,36 @@
 <h1><%= t('controller.wobauth/memberships') %></h1>
 
-<%= content_tag :table, id: :wobauth_memberships, role: :wobauth_datatable,
-    class: "table table-bordered table-striped dataTable" do %>
-<thead>
-  <tr>
-    <th><%= t('attributes.user') %></th>
-    <th><%= t('attributes.group') %></th>
-    <th><%= t('attributes.auto') %></th>
-    <th><%= t('wobauth.action') %></th>
-  </tr>
-</thead>
-<tbody>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_memberships, role: :wobauth_datatable,
+      class: "table table-bordered table-striped dataTable",
+      data: {
+        target: 'datatables.datatable',
+      } do %>
+  <thead>
+    <tr>
+      <th><%= t('attributes.user') %></th>
+      <th><%= t('attributes.group') %></th>
+      <th><%= t('attributes.auto') %></th>
+      <th><%= t('wobauth.action') %></th>
+    </tr>
+  </thead>
+  <tbody>
 
-<% @memberships.each do |membership| %>
-  <%= content_tag_for(:tr, membership) do %>
-    <td><%= membership.user %></td>
-    <td><%= membership.group %></td>
-    <td><%= membership.auto %></td>
-    <td class="nowrap">
-      <%= show_link [wobauth, membership] %>
-      <%= edit_link [wobauth, membership] %>
-      <%= delete_link [wobauth, membership] %>
-    </td>
+  <% @memberships.each do |membership| %>
+    <%= content_tag(:tr, id: dom_id(membership)) do %>
+      <td><%= membership.user %></td>
+      <td><%= membership.group %></td>
+      <td><%= membership.auto %></td>
+      <td class="nowrap">
+        <%= show_link [wobauth, membership] %>
+        <%= edit_link [wobauth, membership] %>
+        <%= delete_link [wobauth, membership] %>
+      </td>
+    <% end %>
   <% end %>
-<% end %>
-</tbody>
-<% end %>
+  </tbody>
+  <% end %>
+</div>
 
 <br />
 

data/app/views/wobauth/memberships/show.html.erb

@@ -3,17 +3,17 @@
     <h4><%= t('attributes.membership') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless ">
       <tr>
-	<th><%= t('attributes.user')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.user')%>:</th>
 	<td><%= @membership.user %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.group')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.group')%>:</th>
 	<td><%= @membership.group %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.auto')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.auto')%>:</th>
 	<td><%= @membership.auto %></td>
       </tr>
     </table>

data/app/views/wobauth/roles/_role_authorities.html.erb

@@ -1,21 +1,27 @@
-<%= content_tag :table, id: :wobauth_role_authorities, role: :wobauth_datatable,
-    class: "table table-sm table-bordered dataTable" do %>
- <thead> 
-  <tr>
-    <th><%= t('attributes.user') %></th>
-    <th><%= t('attributes.authorizable_type') %></th>
-    <th><%= t('attributes.authorized_for') %></th>
-    <th><%= t('attributes.authorized_for_type') %></th>
-  </tr>
- </thead>
- <tbody>
-<% authorities.valid(Date.today).each do |authority| %>
-  <%= content_tag_for(:tr, authority) do %>
-    <td><%= link_to authority.authorizable, polymorphic_path([wobauth, authority.authorizable]) %></td>
-    <td><%= authority.authorizable_type %></td>
-    <td><%= authorized_for_link(authority.authorized_for) %></td>
-    <td><%= authority.authorized_for_type %></td>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_role_authorities, role: :wobauth_datatable,
+      class: "table table-sm table-bordered",
+      data: {
+        target: 'datatables.datatable',
+      } do %>
+
+   <thead> 
+    <tr>
+      <th><%= t('attributes.user') %></th>
+      <th><%= t('attributes.authorizable_type') %></th>
+      <th><%= t('attributes.authorized_for') %></th>
+      <th><%= t('attributes.authorized_for_type') %></th>
+    </tr>
+   </thead>
+   <tbody>
+  <% authorities.valid(Date.today).each do |authority| %>
+    <%= content_tag(:tr, dom_id(authority)) do %>
+      <td><%= link_to authority.authorizable, polymorphic_path([wobauth, authority.authorizable]) %></td>
+      <td><%= authority.authorizable_type %></td>
+      <td><%= authorized_for_link(authority.authorized_for) %></td>
+      <td><%= authority.authorized_for_type %></td>
+    <% end %>
   <% end %>
-<% end %>
-</tbody>
-<% end %>
+  </tbody>
+  <% end %>
+</div>

data/app/views/wobauth/roles/index.html.erb

@@ -1,25 +1,31 @@
 <h1><%= t('controller.wobauth/roles') %></h1>
 
-<%= content_tag :table, id: :wobauth_roles, role: :wobauth_datatable,
-    class: "table table-bordered table-striped dataTable" do %>
-<thead>
-  <tr>
-    <th><%= t('attributes.name') %></th>
-    <th><%= t('wobauth.action') %></th>
-  </tr>
-</thead>
-<tbody>
 
-<% @roles.each do |role| %>
-  <%= content_tag_for(:tr, role) do %>
-    <td><%= role.name %></td>
-    <td class="nowrap">
-      <%= show_link [wobauth, role] %>
-    </td>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_roles, role: :wobauth_datatable,
+      class: "table table-bordered table-striped",
+      data: {
+        target: 'datatables.datatable',
+      } do %>
+  <thead>
+    <tr>
+      <th><%= t('attributes.name') %></th>
+      <th><%= t('wobauth.action') %></th>
+    </tr>
+  </thead>
+  <tbody>
+
+  <% @roles.each do |role| %>
+    <%= content_tag(:tr, dom_id(role)) do %>
+      <td><%= role.name %></td>
+      <td class="nowrap">
+        <%= show_link [wobauth, role] %>
+      </td>
+    <% end %>
+  <% end %>
+  </tbody>
   <% end %>
-<% end %>
-</tbody>
-<% end %>
+</div>
 
 <br />
 

data/app/views/wobauth/users/_user_groups.html.erb

@@ -8,7 +8,7 @@
  </thead>
  <tbody>
 <% user.memberships.each do |membership| %>
-  <%= content_tag_for(:tr, membership) do %>
+  <%= content_tag(:tr, dom_id(membership)) do %>
     <td><%= link_to membership.group, wobauth.group_path(membership.group) %></td>
 
     <td><%= membership.auto %></td>

data/app/views/wobauth/users/_user_roles.html.erb

@@ -9,7 +9,7 @@
  </thead>
  <tbody>
 <% user.authorities.each do |authority| %>
-  <%= content_tag_for(:tr, authority) do %>
+  <%= content_tag(:tr, dom_id(authority)) do %>
     <td><%= link_to authority.role, wobauth.role_path(authority.role) %></td>
     <td><%= authorized_for_link(authority.authorized_for) %></td>
     <td><%= authority.authorized_for_type %></td>

data/app/views/wobauth/users/index.html.erb

@@ -1,49 +1,54 @@
 <h1><%= t('controller.wobauth/users') %></h1>
 
-<%= content_tag :table, id: :wobauth_users, role: :wobauth_datatable, 
-    class: "table table-bordered table-striped dataTable" do %>
-<thead>
-  <tr>
-    <th><%= t('attributes.name') %></th>
-    <th class="notvisible"><%= t('attributes.sn') %></th>
-    <th class="notvisible"><%= t('attributes.givenname') %></th>
-    <th class="notvisible"><%= t('attributes.title') %></th>
-    <th><%= t('attributes.username') %></th>
-    <th><%= t('attributes.telephone') %></th>
-    <th><%= t('attributes.email') %></th>
-    <th class="notvisible"><%= t('attributes.position') %></th>
-    <th class="notvisible"><%= t('attributes.department') %></th>
-    <th class="notvisible"><%= t('attributes.company') %></th>
-    <th><%= t('attributes.current_sign_in_at') %></th>
-    <th class="notvisible"><%= t('attributes.sign_in_count') %></th>
-    <th><%= t('wobauth.action')%></th>
-  </tr>
-</thead>
-<tbody>
+<div data-controller="datatables">
+  <%= content_tag :table, id: :wobauth_users, role: :wobauth_datatable, 
+      class: "table table-bordered table-striped",
+    data: {
+      target: 'datatables.datatable',
+    } do %>
+  <thead>
+    <tr>
+      <th><%= t('attributes.name') %></th>
+      <th class="notvisible"><%= t('attributes.sn') %></th>
+      <th class="notvisible"><%= t('attributes.givenname') %></th>
+      <th class="notvisible"><%= t('attributes.title') %></th>
+      <th><%= t('attributes.username') %></th>
+      <th><%= t('attributes.telephone') %></th>
+      <th><%= t('attributes.email') %></th>
+      <th class="notvisible"><%= t('attributes.position') %></th>
+      <th class="notvisible"><%= t('attributes.department') %></th>
+      <th class="notvisible"><%= t('attributes.company') %></th>
+      <th><%= t('attributes.current_sign_in_at') %></th>
+      <th class="notvisible"><%= t('attributes.sign_in_count') %></th>
+      <th><%= t('wobauth.action')%></th>
+    </tr>
+  </thead>
+  <tbody>
 
-<% @users.each do |user| %>
-  <%= content_tag_for(:tr, user) do %>
-    <td><%= user %></td>
-    <td><%= user.sn %></td>
-    <td><%= user.givenname %></td>
-    <td><%= user.title %></td>
-    <td><%= user.username %></td>
-    <td><%= user.telephone %></td>
-    <td><%= user.email %></td>
-    <td><%= user.position %></td>
-    <td><%= user.department %></td>
-    <td><%= user.company %></td>
-    <td><%= user.current_sign_in_at.try(:to_date) %></td>
-    <td><%= user.sign_in_count %></td>
-    <td class="nowrap">
-      <%= show_link [wobauth, user] %>
-      <%= edit_link [wobauth, user] %>
-      <%= delete_link [wobauth, user] %>
-    </td>
+  <% @users.each do |user| %>
+    <%= content_tag(:tr, dom_id(user)) do %>
+      <td><%= user %></td>
+      <td><%= user.sn %></td>
+      <td><%= user.givenname %></td>
+      <td><%= user.title %></td>
+      <td><%= user.username %></td>
+      <td><%= user.telephone %></td>
+      <td><%= user.email %></td>
+      <td><%= user.position %></td>
+      <td><%= user.department %></td>
+      <td><%= user.company %></td>
+      <td><%= user.current_sign_in_at.try(:to_date) %></td>
+      <td><%= user.sign_in_count %></td>
+      <td class="nowrap">
+        <%= show_link [wobauth, user] %>
+        <%= edit_link [wobauth, user] %>
+        <%= delete_link [wobauth, user] %>
+      </td>
+    <% end %>
   <% end %>
-<% end %>
-</tbody>
-<% end %>
+  </tbody>
+  <% end %>
+</div>
 
 <br />
 

data/config/ldap.yml.example

@@ -1,3 +1,4 @@
+# simple 
 ldap_options:
   host: 1.2.3.4
   port: 3268
@@ -7,3 +8,34 @@ ldap_options:
     username: myusername
     password: mysecretpassword
 
+# redundant: 1 directory with 2 redundant servers
+ldap_options:
+  hosts: 
+    - [1.2.3.4, 3269]
+    - [5.6.7.8, 3269]
+  encryption: :simple_tls
+  base: dc=example,dc=com
+  auth:
+    method: :simple
+    username: myusername
+    password: mysecretpassword
+
+# multiple directories
+ldap_options:
+  - host: 1.2.3.4
+    port: 3268
+    base: dc=example,dc=com
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+  - host: 5.6.7.8
+    port: 3269
+    base: dc=example,dc=com
+    encryption: :simple_tls
+    auth:
+      method: :simple
+      username: myusername
+      password: mysecretpassword
+
+

data/lib/wobauth.rb

@@ -45,13 +45,18 @@ module Wobauth
     config ||= Hash.new
 
     if config['ldap_options'].present?
-      opts = config['ldap_options'].symbolize_keys
-      opts.each do |k,v|
-        opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+      ldapopts = config['ldap_options']
+      if ldapopts.kind_of? Hash
+        ldapopts = [ldapopts]
+      end
+      ldapopts.each do |opts|
+        opts.symbolize_keys!
+        opts.each do |k,v|
+          opts[k] = opts[k].symbolize_keys if opts[k].kind_of? Hash
+        end
       end
     else
       nil
     end
   end
-
 end

data/lib/wobauth/version.rb

@@ -1,4 +1,4 @@
 module Wobauth
-  VERSION = "5.0.1".freeze
-  RELEASEDATE = "2020-01-22".freeze
+  VERSION = "5.1.3".freeze
+  RELEASEDATE = "2021-07-04".freeze
 end

data/spec/factories.rb

@@ -1,12 +1,28 @@
 FactoryBot.define do
 
+  sequence :email, 10000 do |n|
+    "person#{n}@example.net"
+  end
+
+  sequence :group do |n|
+    "group_#{n}"
+  end
+
+  sequence :username do |n|
+    "user_#{n}"
+  end
+
+  sequence :name do |n|
+    "name_#{n}"
+  end
+
   factory :authority, class: Wobauth::Authority do
     association :authorizable, factory: :user
     role
   end
 
   factory :group, class: Wobauth::Group do
-    sequence(:name) { |n| "name_#{n}" }
+    name { generate(:name) }
   end
 
   factory :membership, class: Wobauth::Membership do
@@ -15,12 +31,12 @@ FactoryBot.define do
   end
 
   factory :role, class: Wobauth::Role do
-    sequence(:name) { |n| "name_#{n}" }
+    name { generate(:name) }
   end
 
   factory :user, class: Wobauth::User do
-    sequence(:username)    { |n| "user#{n}" }
-    sequence(:email, 1000) { |n| "user#{n}@example.net" }
+    username { generate(:username) }
+    email { generate(:email) }
     password { "test99" }
     password_confirmation { "test99" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wobauth
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.3
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: wobaduser
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: record_tag_helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -352,20 +338,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: record_tag_helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -554,6 +526,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Rails engine providing MVCs for User, Group, Role, Membership and Authority
 email: wob@swobspace.de
 executables: []
@@ -684,7 +670,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rails engine providing MVCs for User, Group, Role, Membership and Authority