hubssolib 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b026e98baa7f70c200a5abe0ff7e5e3a874e9aaf5a1f88c33114e45cb1ab14
-  data.tar.gz: d19ff3d675d0b63286e06c03b6c3bce05be434a16f554533efde1152bb9c2641
+  metadata.gz: 891c5bc596ecfdd5f9f1e9b844ac77eaa443426607d55ba16110cc194baca3a8
+  data.tar.gz: 42ffee7f098f4c9cbd1eec9e42e2c0f2e10a700ebd85b083113b517cd6706619
 SHA512:
-  metadata.gz: a8d0724e454ffab27e616a91b1aa9837d4aefa5dff6d871bb92671ddefda789626e7cf3ed2dc523b48d4a09bcb3210c81ff279c7e553d2d579c8b00d6af693dd
-  data.tar.gz: 36f17712168ba66f8de41193c41959dfa3ddb81e1ae5c683f4f747d177a6e4f5643aee2a8b387eaa244f0945608ee88f70552143f58f344e2a4078dabbf65ea4
+  metadata.gz: 7d0046239b22405b6e6cf47d3e8e326bcc9f4c88a58ced4b13a3eab14fd822bb16bc63d3b06523a926abda7d46d53a15211000fdd9b7aff7e071ba2b708afd92
+  data.tar.gz: 0a1cd9ccaab6b08ae323ad572f3a563fa002c7a2250073cb0b76848f8f2c8879350828664fe37ee9a0590d134a8949dacb4419a54520569a3468d6a5b86eb3da

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.0.3, 10-Feb-2025
+
+Change JavaScript code used for the login indicator so that simpler engines such as [Duktape](https://duktape.org) can run it. Operates correctly in script-enabled [NetSurf](https://www.netsurf-browser.org) now.
+
+## 3.0.2, 04-Feb-2025
+
+Fixes a bug that could cause cookie deletions for login state indication to sometimes fail to work as expected.
+
 ## 3.0.0, 28-Jan-2025 and 3.0.1, 03-Feb-2025
 
 * The Hub "login indication" URL approach is now dropped, so layout templates **should be updated.**

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hubssolib (3.0.1)
+    hubssolib (3.0.3)
       base64 (~> 0.2)
       drb (~> 2.2)
 
@@ -29,7 +29,7 @@ GEM
     psych (5.2.3)
       date
       stringio
-    rdoc (6.11.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
     reline (0.6.0)
       io-console (~> 0.5)
@@ -37,7 +37,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)

data/hubssolib.gemspec

@@ -4,7 +4,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name     = 'hubssolib'
 
-  s.version  = '3.0.1'
+  s.version  = '3.0.3'
   s.author   = 'Andrew Hodgkinson and others'
   s.email    = 'ahodgkin@rowing.org.uk'
   s.homepage = 'http://pond.org.uk/'

data/lib/hub_sso_lib.rb

@@ -42,10 +42,10 @@ module HubSsoLib
   HUB_IDLE_TIME_LIMIT = 4 * 60 * 60
 
   # Shared cookie name.
-  HUB_COOKIE_NAME = 'hubapp_shared_id'
+  HUB_COOKIE_NAME = :hubapp_shared_id
 
   # Principally for #hubssolib_account_link.
-  HUB_LOGIN_INDICATOR_COOKIE       = 'hubapp_shared_id_alive'
+  HUB_LOGIN_INDICATOR_COOKIE       = :hubapp_shared_id_alive
   HUB_LOGIN_INDICATOR_COOKIE_VALUE = 'Y'
 
   # Bypass SSL, for testing purposes? Rails 'production' mode will
@@ -560,9 +560,14 @@ module HubSsoLib
           const logged_out_html = "#{helpers.j(logged_out_link)}";
           const container       = document.getElementById('hubssolib_login_indication')
 
+          #{
+            # No '?.' support in NetSurf's JS engine, so can't do the match
+            # and pop in a single line via "?.pop() || ''".
+          }
           function hubSsoLibLoginStateWriteLink() {
             const regexp = '#{helpers.j(HUB_LOGIN_INDICATOR_COOKIE)}\\s*=\\s*([^;]+)';
-            const flag   = document.cookie.match(regexp)?.pop() || '';
+            const match  = document.cookie.match(regexp);
+            const flag   = (match ? match.pop() : null) || '';
 
             if (flag === '#{HUB_LOGIN_INDICATOR_COOKIE_VALUE}') {
               container.innerHTML = logged_in_html;
@@ -576,6 +581,7 @@ module HubSsoLib
             # login indications should thus arise from cached data.
           }
           hubSsoLibLoginStateWriteLink();
+          window.addEventListener('load',     hubSsoLibLoginStateWriteLink);
           window.addEventListener('pageshow', hubSsoLibLoginStateWriteLink);
         </script>
       HTML
@@ -722,7 +728,7 @@ module HubSsoLib
       logged_in = hubssolib_logged_in?
 
       if logged_in == false
-        cookies.delete(HUB_LOGIN_INDICATOR_COOKIE)
+        cookies.delete(HUB_LOGIN_INDICATOR_COOKIE, domain: :all, path: '/')
 
         if login_is_required
           hubssolib_store_location
@@ -736,8 +742,9 @@ module HubSsoLib
       #
       cookies[HUB_LOGIN_INDICATOR_COOKIE] = {
         value:    HUB_LOGIN_INDICATOR_COOKIE_VALUE,
-        domain:   :all,
         path:     '/',
+        domain:   :all,
+        expires:  1.year, # I.e. *not* session-scope
         secure:   ! hub_bypass_ssl?,
         httponly: false
       }
@@ -1039,8 +1046,8 @@ module HubSsoLib
 
       cookies[HUB_COOKIE_NAME] = {
         value:    key,
-        domain:   :all,
         path:     '/',
+        domain:   :all,
         secure:   ! hub_bypass_ssl?,
         httponly: true
       }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hubssolib
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Hodgkinson and others
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb