app_manager 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1093f4ae3ee06a00f81bf11ad98bb1669f6b9f931bed69a430525733058143a0
-  data.tar.gz: 9a3a425bdf82d12982f33ace1e86a1e5b47bbc7b3430ccd96b0469967cbf2f65
+  metadata.gz: f97b31c44449e934975e233f07a745d883e58abd3a29ccd30537ec0e1ba6bca2
+  data.tar.gz: 863e6b243cd1c16839c4d5c9d7f3a3a0b1b47909ce613c9ff075e21d996ce314
 SHA512:
-  metadata.gz: 9306209e778f2593afc88cdaf1f468f8c0ccefddd197e3ecfcb516301581577131975ed73dde14decae361454d32955f25c80220edab9cc755955f986d37a747
-  data.tar.gz: b0f6d9c366e807ebaa5d5fd5de056ecd3f7e93addfbdc944cda14ec915dc86a5e20d4b248426dfe04bc7c5962887d858fd01eed6de2bc4ae7c5976540e9c8c6a
+  metadata.gz: 31f071cf42a3cfec28b0fae59cedfc72c2b24b80a85c237932acf0d118807977a961aa199ebd5435f5ddcb4f9310a27ac47589b35db953f39e61fbdd7e6d25d6
+  data.tar.gz: 67769978a3d30041d329e02a22432dad4d936a5254ac711e118a03be50101e11260aa22929a2c210ddbec027c44b60fa807f0c51dc494e6aac92a16033b8b83d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.0.0)
+    app_manager (2.2.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -68,7 +68,7 @@ GEM
       activemodel (= 7.1.3.2)
       activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activerecord-import (1.5.1)
+    activerecord-import (1.6.0)
       activerecord (>= 4.2)
     activestorage (7.1.3.2)
       actionpack (= 7.1.3.2)
@@ -89,7 +89,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
@@ -137,8 +137,8 @@ GEM
     marcel (1.0.4)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    mini_portile2 (2.8.6)
+    minitest (5.22.3)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
     net-imap (0.3.7)
@@ -148,10 +148,10 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.15.5)
+    nio4r (2.7.1)
+    nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pry (0.14.1)
@@ -161,7 +161,7 @@ GEM
       stringio
     public_suffix (4.0.6)
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -199,9 +199,9 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.0.6)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    reline (0.4.3)
+    reline (0.5.1)
       io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -41,6 +41,7 @@ module AppManager
                 end
                 if @shop.update(update_info)
                   begin
+                    plan_data['old_plan'] = params[:old_plan] || nil;
                     AppManager::EventHandler.new('charge_created', {
                         "plan" => plan_data,
                         "charge" => nil,
@@ -59,11 +60,12 @@ module AppManager
               end
             request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
             request_data.merge!('host' => params['host']) if params['host'].present?
+            request_data.merge!('old_plan' => params['old_plan']) if params['old_plan'].present?
 
             return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
-            discount_cookie = AppManager.resolve_from_cookies(self.request)
             gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
-            data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop,discount_cookie)
+            discount_local_storage = params[:discount_code].present? && !params[:discount_code].nil? ? params[:discount_code] : nil
+            data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop,discount_local_storage)
             if data.present? && !data["errors"].present? && (data["data"].present? && data["data"]["appSubscriptionCreate"].present? && (!data["data"]["appSubscriptionCreate"]["userErrors"].any? && data["data"]["appSubscriptionCreate"]["confirmationUrl"]))
               redirect_charge = data["data"]["appSubscriptionCreate"]["confirmationUrl"]
               render json: {'redirect_url' => redirect_charge}
@@ -88,8 +90,7 @@ module AppManager
         shopify_token = @field_names['shopify_token']
         shopify_domain = @field_names['name']
         grandfathered_field = @field_names['grandfathered']
-        discounted_plans = JSON.parse(params[:discounted_plans]) rescue []
-        discounted_plans = discounted_plans.map!(&:to_s) if discounted_plans.any?
+        discounted_plans = []
         if !@shop.nil?
           old_plan_id = @shop[@plan_field]
           old_plan_data = nil
@@ -139,11 +140,11 @@ module AppManager
 
                 begin
                   plan_obj = AppManager::Client.new
-                  discounted_plans_present =  discounted_plans.present? && discounted_plans.any?
-                  if params[:promo_discount].present? && discounted_plans_present && discounted_plans.include?(params[:plan])
-                    plan_obj.discount_used(@shop[shopify_domain], params[:promo_discount])
-                  elsif params[:promo_discount].present? && discounted_plans.blank?
-                    plan_obj.discount_used(@shop[shopify_domain], params[:promo_discount])
+                  if params[:discount].present? && !params[:discount].nil?
+                    discounted_plans = plan_obj.get_related_discounted_plans(params[:discount])
+                    if discounted_plans.empty? || discounted_plans.include?(params[:plan].to_i)
+                      plan_obj.discount_used(@shop[shopify_domain], params[:discount])
+                    end
                   end
                 rescue
                   Rollbar.error("Error in APP MANAGER Discount used API call >>>> #{e.inspect}")

data/app/controllers/app_manager/plans_controller.rb

@@ -66,15 +66,12 @@ module AppManager
       end
 
       promotional_discount = []
-      discount_cookie = AppManager.resolve_from_cookies(self.request)
-      if discount_cookie && @shop
-        created_at = @shop[AppManager.configuration.field_names['created_at']]
-        reinstall = AppManager.check_if_reinstall(created_at)
+      if params[:discount_code].present? && !params[:discount_code].nil? && @shop
+        discount_local_storage = params[:discount_code]
         plan_obj = AppManager::Client.new
-        promotional_discount = plan_obj.get_promotional_discount(params[:shop_domain], discount_cookie['codeType'], discount_cookie['code'], reinstall)
+        promotional_discount = plan_obj.get_promotional_discount(params[:shop_domain],discount_local_storage)
         promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
       end
-
       response = {
           'plans' => plans,
           'promotional_discount' => promotional_discount,

data/lib/app_manager/client/connection.rb

@@ -74,7 +74,7 @@ module AppManager
           return fetch_static_cached_response(cache_key)
         end
         begin
-        response = self.class.send(http_method, path, { body: options, timeout: 1 })
+        response = self.class.send(http_method, path, { body: options, timeout: 120 })
           if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
              Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
           else
@@ -131,6 +131,8 @@ module AppManager
           return @fs.get_local_discount(params, options)
         when 'use-discount'
           return @fs.store_discount_used(params,options)
+        when 'get-related-discounted-plans'
+          return @fs.get_local_related_discounted_plans(params,options)
         else
          return nil
         end

data/lib/app_manager/client/plans.rb

@@ -43,8 +43,8 @@ module AppManager
         get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
       end
 
-      def get_promotional_discount(shop_domain = nil, code_type, code, reinstall)
-        get("/discount?shop_domain=#{shop_domain}&reinstall=#{reinstall}&code_type=#{code_type}&code=#{code}")
+      def get_promotional_discount(shop_domain = nil,code)
+        get("/discount?shop_domain=#{shop_domain}&code=#{code}")
       end
 
       def discount_used(shop_domain, discount_id)
@@ -55,6 +55,10 @@ module AppManager
         post("/use-discount-sync", options)
       end
 
+      def get_related_discounted_plans(discount_id)
+        get("/get-related-discounted-plans?discount_id=#{discount_id}")
+      end
+
     end
   end
 end

data/lib/app_manager/fail_safe.rb

@@ -224,10 +224,6 @@ module AppManager
         promotional_discounts_data = []
         promotional_discounts.each do |promotional_discount|
 
-          Rails.logger.info "                                                   "
-          Rails.logger.info "=== promotional_discount===========#{promotional_discount.inspect}"
-          Rails.logger.info "                                                   "
-
            promotional_discounts_data << AppManager::Discount.new(
               discount_id: promotional_discount['id'],
               name: promotional_discount['name'],
@@ -249,9 +245,6 @@ module AppManager
            )
         end
 
-        Rails.logger.info "                                                   "
-        Rails.logger.info "=== promotional_discounts_data===========#{promotional_discounts_data.inspect}"
-        Rails.logger.info "                                                   "
         AppManager::Discount.bulk_import promotional_discounts_data
       end
     end
@@ -614,14 +607,12 @@ module AppManager
 
     def get_local_discount(params, options)
       code = [params['code']].pack('H*')
-      code_type = params['code_type']
-      reinstall = params['reinstall']
       shop_domain = params['shop_domain']
       now = Time.now
 
       discount_data = AppManager::Discount.where(enabled: true)
                           .where('valid_from <= ?', now)
-                          .where('valid_to >= ?', now)
+                          .where('valid_to IS NULL OR valid_to >= ?', now)
                           .where(code: code)
                           .first
       return [] if discount_data.nil?
@@ -674,6 +665,11 @@ module AppManager
 
     end
 
+    def get_local_related_discounted_plans(params, options)
+      discounted_plans = DiscountLinkPlan.where(discount_id: params['discount_id']).pluck(:plan_id) rescue []
+      return discounted_plans
+    end
+
     def store_local_charge(params, options)
       message = {"message" => 'fail'}
       if options

data/lib/app_manager/graphql_helper.rb

@@ -54,7 +54,7 @@ module AppManager
     end
 
 
-   def recurring_charge_api_call(plan,return_url,shop,discount_cookie)
+   def recurring_charge_api_call(plan,return_url,shop,discount_local_storage)
       plan_test = nil
       shop_plan_field = AppManager.configuration.field_names['shopify_plan'] rescue nil
       if !plan['affiliate'].nil? && plan['affiliate'].any? && !shop_plan_field.nil? && plan['affiliate'].map{|e| e['value']}.include?(shop[shop_plan_field])
@@ -84,11 +84,9 @@ module AppManager
       end
 
       promotional_discount = []
-      if discount_cookie && shop
-        created_at = shop[AppManager.configuration.field_names['created_at']]
-        reinstall = AppManager.check_if_reinstall(created_at)
+      if !discount_local_storage.nil? && shop
         plan_obj = AppManager::Client.new
-        promotional_discount = plan_obj.get_promotional_discount(shop.shopify_domain, discount_cookie['codeType'], discount_cookie['code'], reinstall)
+        promotional_discount = plan_obj.get_promotional_discount(shop.shopify_domain, discount_local_storage)
         promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
       end
 
@@ -141,9 +139,8 @@ module AppManager
       promotional_discount_applies = promotional_discount.present? && promotional_discount.any?
       promotional_discount_id = discount_exists && promotional_discount_applies ? 0 : promotional_discount_applies ? promotional_discount['id'] : 0
 
-      plans_relation = promotional_discount.present? && promotional_discount['plan_relation'].any? ? promotional_discount['plan_relation'] : []
-      # Append additional data to the existing return_url
-      return_url += "&promo_discount=#{promotional_discount_id}&discounted_plans=#{Rack::Utils.escape(plans_relation.to_json)}"
+      return_url += "&discount=#{promotional_discount_id}"
+
 
       price_details = {
                        "price": { "amount": plan['price'], "currencyCode": 'USD' },

data/lib/app_manager/set_local_storage.rb

@@ -0,0 +1,34 @@
+require 'uri'
+
+# app/middleware/set_cookie.rb
+module AppManager
+  class SetLocalStorage
+    def initialize(app, condition,destination_url)
+      @app = app
+      @condition = condition
+      @destination_url = destination_url
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+
+      if @condition.call(request)
+        url = URI.parse(request.url)
+        host = url.host
+        discount_code = request.path.split('/')[2] rescue ''
+        AppManager.clear_cache #clearing cache
+        # Set a 302 response with an external URL and a cookie
+        return [
+            302,
+            {
+                'Location' => "#{@destination_url}?discount_code=#{discount_code}" ,
+                'Content-Type' => 'text/plain'
+            },
+            ['Redirecting to external URL with cookie']
+        ]
+      end
+
+      @app.call(env)
+    end
+  end
+end

data/lib/app_manager/version.rb

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

data/lib/app_manager.rb

@@ -16,25 +16,8 @@ require "app_manager/model"
 require "app_manager/fail_safe"
 require 'app_manager/railtie' if defined?(Rails)
 require 'app_manager/exceptions'
-require 'action_dispatch/middleware/cookies' if defined?(Rails)
-require "action_controller"
 
 module AppManager
-  module CookiesHandler
-    include ActionController::Cookies
-
-    def self.resolve_from_cookies(request)
-      if request.cookies['ShopCircleDiscount'].present?
-        {
-            'codeType' => 'normal',
-            'code' => request.cookies['ShopCircleDiscount']
-        }
-      else
-        nil
-      end
-    end
-  end
-
   def self.configure
     yield configuration  
   end
@@ -51,14 +34,4 @@ module AppManager
   	end
   end
 
-  def self.resolve_from_cookies(request)
-    CookiesHandler.resolve_from_cookies(request)
-  end
-
-  def self.check_if_reinstall(created_at)
-    created_at < (Time.now - 5.minutes) ? 1 : 0
-  end
-
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -119,7 +119,7 @@ files:
 - lib/app_manager/protection.rb
 - lib/app_manager/railtie.rb
 - lib/app_manager/response_cache.rb
-- lib/app_manager/set_cookie.rb
+- lib/app_manager/set_local_storage.rb
 - lib/app_manager/tasks/sync/local_app_manager.rake
 - lib/app_manager/version.rb
 - lib/generators/app_manager/install/install_generator.rb

data/lib/app_manager/set_cookie.rb

@@ -1,41 +0,0 @@
-# app/middleware/set_cookie_middleware.rb
-require 'action_dispatch/middleware/cookies'
-require 'uri'
-
-# app/middleware/set_cookie.rb
-module AppManager
-  class SetCookie
-  def initialize(app, condition)
-    @app = app
-    @condition = condition
-  end
-
-  def call(env)
-    request = Rack::Request.new(env)
-
-    if @condition.call(request)
-      url = URI.parse(request.url)
-      host = url.host
-      discount_code = request.path.split('/')[2]
-
-      # Set a cookie named 'ShopCircleDiscount' with the extracted values
-      lifetime = Time.now + 60 * 60 * 24 * 365
-      cookie_value = discount_code
-
-      AppManager.clear_cache #clearing cache
-      # Set a 302 response with an external URL and a cookie
-      return [
-          302,
-          {
-              'Location' => 'https://admin.shopify.com/admin/apps/'+ENV['SHOPIFY_APP_SLUG']+'/home/plan' ,
-              'Set-Cookie' => "ShopCircleDiscount=#{cookie_value}; expires=#{lifetime.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')}; path=/; domain=#{host}; secure; HttpOnly; SameSite=None",
-              'Content-Type' => 'text/plain'
-          },
-          ['Redirecting to external URL with cookie']
-      ]
-    end
-
-    @app.call(env)
-  end
-end
-end