From 258306ac9a9af399ea382878aa6480fe13e9eabd Mon Sep 17 00:00:00 2001
From: Paul Bob <paul.ionut.bob@gmail.com>
Date: Tue, 11 Feb 2025 11:16:33 +0200
Subject: [PATCH 1/2] chore: drop universalid dependency

---
 Gemfile.lock                          | 12 ------------
 app/helpers/avo/application_helper.rb |  4 ++--
 avo.gemspec                           |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 89b271617..3bbbc3b94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,6 @@ PATH
       prop_initializer (>= 0.2.0)
       turbo-rails (>= 2.0.0)
       turbo_power (>= 0.6.0)
-      universalid
       view_component (>= 3.7.0)
       zeitwerk (>= 2.6.12)
 
@@ -162,7 +161,6 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    brotli (0.6.0)
     builder (3.3.0)
     bump (0.10.0)
     bundler-integrity (1.0.9)
@@ -181,9 +179,6 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.5)
-    config (5.5.2)
-      deep_merge (~> 1.2, >= 1.2.1)
-      ostruct
     connection_pool (2.5.0)
     countries (7.1.0)
       unaccent (~> 0.3)
@@ -206,7 +201,6 @@ GEM
     debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    deep_merge (1.2.2)
     derailed_benchmarks (2.1.2)
       benchmark-ips (~> 2)
       dead_end
@@ -666,12 +660,6 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    universalid (0.1.7)
-      activesupport (>= 6.1)
-      brotli (>= 0.4)
-      config (>= 5.0)
-      msgpack (>= 1.7)
-      zeitwerk (>= 2.6)
     uri (1.0.2)
     useragent (0.16.11)
     view_component (3.21.0)
diff --git a/app/helpers/avo/application_helper.rb b/app/helpers/avo/application_helper.rb
index 7b1ba7c00..80f773f92 100644
--- a/app/helpers/avo/application_helper.rb
+++ b/app/helpers/avo/application_helper.rb
@@ -172,12 +172,12 @@ def container_classes
 
     # encode params
     def e(value)
-      URI::UID.build(value).payload
+      Marshal.dump(value)
     end
 
     # decode params
     def d(value)
-      URI::UID.from_payload(value).decode
+      Marshal.load(value)
     rescue
       value
     end
diff --git a/avo.gemspec b/avo.gemspec
index 8783151fd..e7d24f18a 100644
--- a/avo.gemspec
+++ b/avo.gemspec
@@ -48,5 +48,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "docile"
   spec.add_dependency "inline_svg"
   spec.add_dependency "prop_initializer", ">= 0.2.0"
-  spec.add_dependency "universalid"
 end

From 21e001f492595cc8cab1fe31ec270a88d9dd5d5e Mon Sep 17 00:00:00 2001
From: Paul Bob <paul.ionut.bob@gmail.com>
Date: Tue, 11 Feb 2025 11:38:31 +0200
Subject: [PATCH 2/2] safe encode & decode

---
 app/helpers/avo/application_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/avo/application_helper.rb b/app/helpers/avo/application_helper.rb
index 80f773f92..2ff816658 100644
--- a/app/helpers/avo/application_helper.rb
+++ b/app/helpers/avo/application_helper.rb
@@ -170,14 +170,14 @@ def container_classes
       container_is_full_width? ? "" : "2xl:container 2xl:mx-auto"
     end
 
-    # encode params
+    # encode & encrypt params
     def e(value)
-      Marshal.dump(value)
+      Avo::Services::EncryptionService.encrypt(message: value, purpose: :return_to, serializer: Marshal)
     end
 
-    # decode params
+    # decrypt & decode params
     def d(value)
-      Marshal.load(value)
+      Avo::Services::EncryptionService.decrypt(message: value, purpose: :return_to, serializer: Marshal)
     rescue
       value
     end