glib-web 3.22.1 → 3.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdf7c0b808e5d7dd817d1546bf7bddba4a90e770d4743e9ab72b21679520741
-  data.tar.gz: 77713543dc8529f1e324947297d7114ac51c774b33649032191b9746e9932af1
+  metadata.gz: 806df354ed58edcee98f342d40209e0f42b16343f79427941accd17b796d6c33
+  data.tar.gz: 8b0de205b315c74ad1a773cf6963f461e2952cf1fbf5f36e63aea66c648c4640
 SHA512:
-  metadata.gz: df71f8031865db335bda02625aed6e77c1b14c065cc292cc2a146c200e45c8e9d8aadeceb553838a323ab0f345e5e2d6bdba0c2f0a8e5341b67eb27c9a50063e
-  data.tar.gz: f09047258852d6eb4e46b0af5f5611f6597ab8a6e41bdb313a25c024a1d104ce3bd8f485896819cd56f328a30ca7436d06e4bfe90b094e965e6bdfa605a2618c
+  metadata.gz: 5e9062feefed9651443c3a128de05df41e63a755cafdc10b66167f60643b9bf847a1dc4c68af9f95e8b9eff4f7a0f3b52d31fa61907575a6f09de7903dffb684
+  data.tar.gz: 651ae04bd671192239d8bc08e144733a011f6777e6b33347739579ec7511c7ff9bd9d0f23ff36ff110076242424606ac0500cb80ba0212b4487f788b177b7f55

data/app/controllers/concerns/glib/json/libs.rb

@@ -62,14 +62,27 @@ module Glib::Json::Libs
     JSON.parse(render_to_string(template, locals: args))
   end
 
-  def glib_redirect_to(url)
+  def glib_html_url(url)
+    url = url.include?('?') ? url.sub(/.json\?/, '?') : url.sub(/.json$/, '')
+
+    # As much as possible, try retaining the front fragment by matching the back, because
+    # the front could be either a `?` or `&`
+    url = url.sub(/format=json\&/, '');
+
+    # If no match, then we replace the front fragment
+    url.sub(/[\&\?]format=json/, '');
+  end
+
+  def glib_redirect_to(url, return_to_previous: false)
+    url = __delete_redirect_back_url(url) if return_to_previous
+
     respond_to do |format|
       format.html do
         redirect_to url
       end
       format.json do
         if __json_ui_rendering?
-          redirect_to url
+          redirect_to glib_html_url(url)
           return
         end
 
@@ -147,10 +160,10 @@ module Glib::Json::Libs
     session.delete(REDIRECT_BACK_KEY) || url
   end
 
-  def html_ui_redirect_back_or_to(default_url)
-    redirect_url = __delete_redirect_back_url(default_url)
-    redirect_to redirect_url
-  end
+  # def html_ui_redirect_back_or_to(default_url)
+  #   redirect_url = __delete_redirect_back_url(default_url)
+  #   redirect_to redirect_url
+  # end
 
   def json_ui_redirect_back_or_to(default_url, json_action)
     redirect_url = __delete_redirect_back_url(default_url)
@@ -210,9 +223,15 @@ module Glib::Json::Libs
   end
 
   def json_ui_redirect_to(url)
-    render json: {
-      onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
-    }
+    # `onLoad` also executes in `onResponse` situation, e.g. form submit.
+    on_load = { action: 'windows/open', url: url }
+
+    if glib_json_dialog_mode?
+      # Only do this in dialog mode because this seems to add to the rendering time
+      # (i.e. longer flicker time), presumably due to the use of things like `nextTick()`.
+      on_load = { action: 'dialogs/close', onClose: on_load }
+    end
+    render json: { onLoad: on_load }
   end
 
   module ClassMethods

data/app/helpers/glib/urls_helper.rb

@@ -1,7 +1,7 @@
 module Glib
   module UrlsHelper
-    def glib_url_current(new_params = {})
-      url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
+    def glib_url_current(override_params: params.to_unsafe_h, extra_params: {})
+      url_for(override_params.merge(extra_params.merge(only_path: false)))
     end
 
     def glib_url_equals_current?(url)

data/lib/glib/crypt/utils.rb

@@ -1,5 +1,6 @@
+# Deprecated. Use Glib::Crypt instead.
 module Glib
-  module Crypt
+  class Crypt
     class Utils
       def self.encrypt(original_message, encryption_secret, encryption_salt)
         encryptor = message_encryptor(encryption_secret, encryption_salt)

data/lib/glib/crypt.rb

@@ -1 +1,28 @@
 require_relative './crypt/utils'
+
+# A replacement of Glib::Crypt::Utils
+module Glib
+  class Crypt
+    # Recommended digest: 'SHA256'
+    def self.encrypt(original_message, encryption_secret, encryption_salt, digest)
+      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
+      CGI.escape(encryptor.encrypt_and_sign(original_message))
+    end
+
+    def self.decrypt(encrypted_message, encryption_secret, encryption_salt, digest)
+      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
+      begin
+        encryptor.decrypt_and_verify(CGI.unescape(encrypted_message))
+      rescue ActiveSupport::MessageEncryptor::InvalidMessage
+        nil
+      end
+    end
+
+    private
+      def self.message_encryptor(encryption_secret, encryption_salt, digest)
+        key_generator = ActiveSupport::KeyGenerator.new(encryption_secret, iterations: 1000)
+        key_secret = key_generator.generate_key(encryption_salt, 32)
+        ActiveSupport::MessageEncryptor.new(key_secret, digest: digest, serializer: JSON)
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.22.1
+  version: 3.22.2
 platform: ruby
 authors:
 - ''