glib-web 3.23.0 → 3.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45dc3048668b5ebaea724341b5f6ee89cd90a467f7859d03923c1824ffdbb729
-  data.tar.gz: 69d8c59495ac1d84d17ee027a851b0761f1ae7981852a516ac449d36671f3d72
+  metadata.gz: a811ee1cb0c122afb173bc3518ec0259c734ccd5b137195fd6e2a1acfd7f4324
+  data.tar.gz: 826e0af4bbe74e0d804242d2cd6e79531ad56ebe7188061fa7d40d34a77c7f71
 SHA512:
-  metadata.gz: 9d31cca0cb02fb134b52c2eb166bd76fa4040ad64a88b4f3a7cd5d3080bf85a390c568e07805fc0fa91c0eab6529247b4d209f28a8c68385be82f31227ba9a4c
-  data.tar.gz: 0bc9b7c6b5d1e13fc1a4e6735f33f2819c5799c32ce6ee0001783c62eb9d6d9ed33d2771c80d695276d768e602e90ec591ebfa17b60b2234d696116312a5f49c
+  metadata.gz: e6bf10f5745554bc5ff670aa5acc12fbf544666b069a2d91c5f48ba56093317ac3ee839906e724f2ed3d4a9b6814575855f2a25a04e98449b2bdcf8a424218c0
+  data.tar.gz: 6d68d0b78429a9d25d8d04c1c23c32e0d742a8c7ebfb3eadb8ab0db0e35fcca7af432df0eebb3606005a54a79339f34c445ee24097735b88ff63bae7cb499d14

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.23.0
+  version: 3.23.1
 platform: ruby
 authors:
 - ''
@@ -336,7 +336,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''