Fix login in loginModal for all controllers and update to 0.12.4 (#430)

* add needs_hashcash to all controllers based on decidim::applicationcontroller

* update to 0.12.4

* fix dependabot for nokogiri and thor versions

* update gemfile to 0.29.4 and package.json too

* change install of chrome

* change chrome to current version

* fix spec based on #431

* add test to test hashcash in proposals

Author: davidbeig

.github/workflows/tests.yml

@@ -11,7 +11,6 @@ env:
   SIMPLECOV: 1
   NODE_VERSION: 18.17.1
   RUBY_VERSION: 3.2.8
-  CHROME_VERSION: "126.0.6478.182"
   BUNDLE_GEMFILE: Gemfile
   DISABLE_SPRING: 1
   DISPLAY: ":99"
@@ -153,6 +152,7 @@ jobs:
           wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
           sudo dpkg -i /tmp/chrome.deb
           rm /tmp/chrome.deb
+
       - uses: nanasess/setup-chromedriver@v2
         name: Install Chrome version
 

CHANGELOG.md

@@ -10,6 +10,7 @@ Features:
   - Added application context for config constraints (whether the user is logged or not)
   - Allow to granular permissions to forced verifications.
     **NOTE** Config var `force_authorization_after_login` has changed to `force_authorizations`
+  - Fix use of hashcash in loginModals
 
 v0.12.3
 -------

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decidim-decidim_awesome (0.12.3)
+    decidim-decidim_awesome (0.12.4)
       active_hashcash (~> 0.4.0)
       decidim-admin (>= 0.29.1, < 0.30)
       decidim-core (>= 0.29.1, < 0.30)
@@ -87,7 +87,7 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
-    base64 (0.2.0)
+    base64 (0.3.0)
     batch-loader (1.5.0)
     bcrypt (3.1.20)
     better_html (2.1.1)
@@ -97,7 +97,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
@@ -141,7 +141,7 @@ GEM
     crass (1.0.6)
     css_parser (1.21.1)
       addressable
-    csv (3.3.4)
+    csv (3.3.5)
     dartsass (1.49.8)
     date (3.4.1)
     date_validator (0.12.0)
@@ -348,11 +348,11 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.11.0)
       devise (>= 4.9.0)
-    devise_invitable (2.0.10)
+    devise_invitable (2.0.11)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.6.2)
-    diffy (3.4.3)
+    diffy (3.4.4)
     doc2text (0.4.8)
       nokogiri (>= 1.18.2)
       rubyzip (~> 2.3.0)
@@ -371,7 +371,7 @@ GEM
       temple
     erubi (1.13.1)
     escape_utils (1.3.0)
-    excon (1.2.5)
+    excon (1.2.8)
       logger
     extended-markdown-filter (0.7.0)
       html-pipeline (~> 2.9)
@@ -382,11 +382,11 @@ GEM
       railties (>= 6.1.0)
     faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     ffi (1.17.2)
     file_validators (3.0.0)
@@ -399,7 +399,7 @@ GEM
       mime-types
     fog-local (0.9.0)
       fog-core (>= 1.27, < 3.0)
-    formatador (1.1.0)
+    formatador (1.1.1)
     foundation_rails_helper (4.0.1)
       actionpack (>= 4.1, < 7.1)
       activemodel (>= 4.1, < 7.1)
@@ -459,8 +459,8 @@ GEM
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
     io-console (0.8.1)
-    json (2.12.0)
-    jwt (2.10.1)
+    json (2.13.2)
+    jwt (3.1.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -504,7 +504,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0520)
+    mime-types-data (3.2025.0729)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
@@ -514,7 +514,7 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.8)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -524,7 +524,7 @@ GEM
     net-smtp (0.3.4)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -533,7 +533,7 @@ GEM
       version_gem (~> 1.1)
     oauth-tty (1.0.5)
       version_gem (~> 1.1, >= 1.1.1)
-    oauth2 (2.0.11)
+    oauth2 (2.0.12)
       faraday (>= 0.17.3, < 4.0)
       jwt (>= 1.0, < 4.0)
       logger (~> 1.2)
@@ -574,7 +574,7 @@ GEM
     parallel (1.27.0)
     parallel_tests (4.10.1)
       parallel
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pg (1.4.6)
@@ -597,7 +597,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.16)
+    rack (2.2.17)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (1.1.1)
@@ -645,7 +645,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     ransack (3.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
@@ -706,7 +706,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.21.0)
@@ -732,7 +732,7 @@ GEM
     rubocop-rubycw (0.1.6)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.3)
+    ruby-vips (2.2.4)
       ffi (~> 1.12)
       logger
     rubyXL (3.4.33)
@@ -771,11 +771,11 @@ GEM
       listen (>= 2.7, < 4.0)
       spring (>= 4)
     stringio (3.1.7)
-    temple (0.10.3)
+    temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.3.2)
-    tilt (2.6.0)
+    thor (1.4.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
@@ -803,15 +803,15 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    web-push (3.0.1)
-      jwt (~> 2.0)
+    web-push (3.0.2)
+      jwt (~> 3.0)
       openssl (~> 3.0)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

app/overrides/decidim/shared/_login_modal/add_hashcash.html.erb.deface

@@ -1,3 +1,3 @@
-<!-- insert_after "erb[loud]:contains('sign_up')" -->
+<!-- insert_top ".login__modal-links" -->
 
 <%= render partial: "decidim/decidim_awesome/hashcash/hidden_field", locals: { zone: :login } %>

app/views/decidim/decidim_awesome/hashcash/_hidden_field.html.erb

@@ -1,4 +1,3 @@
-
 <% if defined?(awesome_hashcash_bits) && awesome_hashcash_bits(zone) %>
   <% append_javascript_pack_tag("decidim_decidim_awesome_hashcash") %>
   <%= hashcash_hidden_field_tag %>

lib/decidim/decidim_awesome/engine.rb

@@ -30,7 +30,7 @@ class Engine < ::Rails::Engine
           # Add hashcash to signup and login
           Decidim::Devise::SessionsController.include(Decidim::DecidimAwesome::NeedsHashcash)
           Decidim::Devise::RegistrationsController.include(Decidim::DecidimAwesome::NeedsHashcash)
-          Decidim::Components::BaseController.include(Decidim::DecidimAwesome::NeedsHashcash)
+          Decidim::ApplicationController.include(Decidim::DecidimAwesome::NeedsHashcash)
         end
         # Include additional helpers globally
         ActiveSupport.on_load(:action_view) { include Decidim::DecidimAwesome::AwesomeHelpers }

lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.12.3"
+    VERSION = "0.12.4"
     COMPAT_DECIDIM_VERSION = [">= 0.29.1", "< 0.30"].freeze
   end
 end

mise.toml

@@ -0,0 +1,8 @@
+[env]
+RAILS_ENV="development"
+DATABASE_USERNAME="decidim_app"
+DATABASE_PASSWORD="decidim123456789"
+CENSUS_URL="http://webapps01.getxo.org/WSConsultaPadron/WSConsultaPadron.asmx"
+
+[tools]
+node = "22"