app_manager 2.4.3 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0290bbafdb7d1f3176dc2fa2a81f2826e5ca3fad4438786347b6ad4b075e8c08'
-  data.tar.gz: 57f949f7c33cf5aa80d1c58fc0d5d30e9d55a91e76907ce194c59e0f846fcb01
+  metadata.gz: 94638c960cf4212bf79630b801d43959ed6b59b1b4f5ff29904a040deb1f9b52
+  data.tar.gz: f33a5c3a6982758993bbc11ccc0cc62b5da051994420a75fdbf471771bd88a7c
 SHA512:
-  metadata.gz: 25811aad36f0e14134924c08563b56358910e8e47371d040adc9045d0e41fe0aaece9cb7a6346d816d5df0396c987b634e9f7cc0ea646a04fa0774b76d2d2441
-  data.tar.gz: 6ae46323bb5bcade4371e2142d70148e8b8dfb555e2a79ed2ac145457a42fd525087631e0df5a12cf7c83b75619fd5ece268b73b927ffce4933d4838b57c382d
+  metadata.gz: b7b5b23ba4794bf59faa9e333cc2ebb5ea9d52afc37961a36ddfed603ce4bc0da0831c3a6cb7745f6d4be556c988aa35e7c72a3f23f859a4fde5cd7d975af927
+  data.tar.gz: 485ad091b4a35194d6118e2264223b3d4066fb29c917b20696ed7f40c8c6017e024bdee9129e38e1f08ec68dddf93025bb9a76d0257bcdd3870d4297ae78c919

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.4.3)
+    app_manager (2.4.5)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    action_text-trix (2.1.16)
+    action_text-trix (2.1.17)
       railties
     actioncable (8.1.2)
       actionpack (= 8.1.2)
@@ -120,7 +120,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.1)
+    json (2.19.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -134,7 +134,7 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     logger (1.7.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -244,7 +244,7 @@ GEM
     securerandom (0.4.1)
     stringio (3.2.0)
     thor (1.5.0)
-    timeout (0.6.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/app/controllers/app_manager/plans_controller.rb

@@ -6,6 +6,7 @@ module AppManager
     cache_response_for :index
     cache_response_for :users
     skip_before_action :verify_authenticity_token, :only => [:active_without_plan, :burst_cache, :fail_safe_backup]
+    ALLOWED_SORTS = %w[name shopify_email created_at].freeze
 
     def index
       render :json => {"features" => AppManager.configuration.plan_features || []}
@@ -110,8 +111,10 @@ module AppManager
       if model
 
         search = params[:search]
-        sort = params[:sort] || AppManager.configuration.field_names['created_at']
-        order = params[:order] || 'asc'
+        sort_param = params[:sort]&.downcase
+        sort = ALLOWED_SORTS.include?(sort_param) ? AppManager.configuration.field_names[sort_param] : 'created_at'
+        order_param = params[:order]&.downcase
+        order = %w[asc desc].include?(order_param) ? order_param : 'asc'
         plans = params[:plans] || nil
         plans = plans.values if !plans.nil?
         shopify_plans = params[:shopify_plans] || nil
@@ -120,12 +123,12 @@ module AppManager
         @shopify_email = AppManager.configuration.field_names['shopify_email']
         @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
         if params[:search]
-          data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%").order(sort + " " + order)
+          data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%").order(sort => order)
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         else
-          data = model.order(sort + " " + order)
+          data = model.order(sort => order)
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
@@ -133,7 +136,7 @@ module AppManager
         all_user_count = model.count
         users = {
             "current_page" => data && data.current_page ? data.current_page : 0,
-            "data" => data ? data.collect { |st| @field_names.map { |key, value| [key, "#{st[value]}"] }.to_h } : [],
+            "data" => data ? data.collect { |st| @field_names.except('shopify_token').map { |key, value| [key, "#{st[value]}"] }.to_h } : [],
             "first_page_url" => "#{app_url}/api/app-manager/users?page=1",
             "from" => data && data.total_pages ? data.current_page == 1 ? 1 : ((data.current_page-1)*items_per_page)+1 : 0,
             "last_page" => data && data.total_pages ? data.total_pages : 0,

data/lib/app_manager/fail_safe.rb

@@ -4,9 +4,11 @@ require 'time'
 require "fileutils"
 require 'active_record'
 require 'activerecord-import'
+require_relative 'fail_safe_helper'
 module AppManager
 
   class FailSafe
+    include AppManager::FailSafeHelper
 
     def initialize(db_name = 'app_manager_local')
       # begin
@@ -321,7 +323,7 @@ module AppManager
       app_structure = AppManager::AppStructure.first
       app_structure_computed = {}
       if app_structure.present?
-        app_structure_computed["banners"] = eval(app_structure.banners)
+        app_structure_computed["banners"] = safe_parse_json(app_structure.banners)
       end
       return app_structure_computed
     end
@@ -374,20 +376,20 @@ module AppManager
           new_plan = {}
           plan.as_json.each_with_index do |(key, value)|
             if ['interval'].include?(key)
-              val = eval(value)
+              val = safe_parse_json(value)
               new_plan[key] = val
               new_plan[key] = val['value'] if val rescue {}
             elsif ['shopify_plans'].include?(key)
-              val = eval(value)
+              val = safe_parse_json(value)
               new_plan[key] = val.collect { |e| e['value'] }
             elsif ['affiliate'].include?(key)
-              new_plan[key] = eval(value)
+              new_plan[key] = safe_parse_json(value)
             elsif ['is_custom', 'public', 'store_base_plan', 'choose_later_plan'].include?(key)
               new_plan[key] = (value == 0 || value == false ? false : true)
             elsif ['test'].include?(key)
               new_plan[key] = (value == 0 || value == false ? nil : true)
             elsif ['features'].include?(key)
-              value = eval(value)
+              value = safe_parse_json(value)
               value = value.each { |e| e.delete("id") }.each { |e| e.delete("created_at") }.each { |e| e.delete("updated_at") }
               new_plan[key] = value
             elsif ['plan_id'].include?(key)
@@ -473,10 +475,10 @@ module AppManager
             new_plan = {}
             plan.as_json.each_with_index do |(key, value), index|
               if ['interval'].include?(key)
-                val = eval(value)
+                val = safe_parse_json(value)
                 new_plan[key] = val
               elsif ['shopify_plans', 'affiliate', 'features'].include?(key)
-                new_plan[key] = eval(value)
+                new_plan[key] = safe_parse_json(value)
               elsif ['is_custom', 'public', 'store_base_plan', 'choose_later_plan'].include?(key)
                 new_plan[key] = (value == 0 || value == false ? false : true)
               elsif ['test'].include?(key)
@@ -678,7 +680,7 @@ module AppManager
       message = {"message" => 'fail'}
       if options
         options.gsub!('null', 'nil') rescue nil
-        charge = eval(options) rescue nil
+        charge = safe_parse_json(options)
         if charge
           charge = charge.as_json if charge.class == Hash
           test_value = charge["test"]

data/lib/app_manager/fail_safe_helper.rb

@@ -0,0 +1,33 @@
+module AppManager
+    module FailSafeHelper
+      def convert_ruby_hash_to_json(ruby_string)
+        return nil if ruby_string.nil? || ruby_string.empty?
+        
+        json_string = ruby_string.dup
+        
+        json_string.gsub!(/([^:])=>([^:])/, '\1:\2')
+        
+        json_string.gsub!(/\bnil\b/, 'null')
+        
+        json_string.gsub!(/\btrue\b/, 'true')
+        json_string.gsub!(/\bfalse\b/, 'false')
+        
+        json_string.gsub!(/,(\s*[}\]])/, '\1')
+        
+        json_string
+      rescue => e
+        nil
+      end
+      
+      def safe_parse_json(value)
+        return nil if value.nil? || value.empty?
+        
+        begin
+          json_string = convert_ruby_hash_to_json(value)
+          return JSON.parse(json_string) if json_string
+        rescue JSON::ParserError => e
+          return nil
+        end
+      end
+    end
+  end

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "2.4.3"
+  VERSION = "2.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.5
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -114,6 +114,7 @@ files:
 - lib/app_manager/engine.rb
 - lib/app_manager/exceptions.rb
 - lib/app_manager/fail_safe.rb
+- lib/app_manager/fail_safe_helper.rb
 - lib/app_manager/graphql_helper.rb
 - lib/app_manager/model.rb
 - lib/app_manager/protection.rb
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.13
 signing_key:
 specification_version: 4
 summary: An API wrapper of Hulkapps AppManager portal