app_manager 1.2.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba2a8e2159e68da401fd6ac3e3442b4b9e45e417544f69f0db476c86afcdb40
-  data.tar.gz: 16e80be01398355ff3c8d844a52ba9f95581ae9d2f5de9f0ad10a194771d630d
+  metadata.gz: 6727df8a0c9cc4df0425d8b62c206f3b9076bedb62d5ede29266ba9d43ef5df9
+  data.tar.gz: ace50d6916ff9f6c14c0ab9388fb194bada931f19b613ad664a68c1d20f06089
 SHA512:
-  metadata.gz: 0c926ddee98d8311397d52d9a27d263c33da079c9971aacd6dbd29020022b38042b772d3195ff60e83e22ecb0b2f6af14e21023ffd4b9541c2315dd9be9a585b
-  data.tar.gz: b723e7e8d3d8ba97780220140508188c14547037e88e6f5d77110c2cea5dc57c202d3ac9ca64015ebf4df73e1afa74fa856e2f87f88073ddf207cc02525a715b
+  metadata.gz: fd7e2afad41cedc53566ef723d5451a4435a0b15d2cb6726252819021fce43e869c50fcd27349df0987f395aa59b24e37a72335dd02f188ad3d13f5e439e8d70
+  data.tar.gz: 926eb7293fd9e2c0bdbc2b61737cb9cd74a4e17291aed9dac2f0fd537f518b91be5ebd5b36162f71d212a5953eed1546b3f039713abda16a1c6d4387c3a4f6ae

data/.gitignore

@@ -6,4 +6,10 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.env
+/.env
+.idea/
+.rakeTasks
+/.idea
+/.idea/
+/.rakeTasks/
+/.rakeTasks

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.6)
+    app_manager (1.3.1)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
-      sqlite3 (~> 1.4.4)
 
 GEM
   remote: https://rubygems.org/
@@ -93,7 +92,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -139,8 +138,6 @@ GEM
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
-      racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -192,7 +189,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sqlite3 (1.4.4)
     strscan (3.0.3)
     thor (1.2.1)
     timeout (0.3.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -1,166 +1,166 @@
 require_dependency "app_manager/application_controller"
 module AppManager
-	  class ChargesController < ApplicationController
-	  	include HTTParty
-		skip_before_action :verify_authenticity_token, :only => [:process_plan]
-		before_action :params_permit
-	 	require 'time'
-		require 'rack'
-
-	 	def process_plan
-	    	if params[:shop].present? && params[:plan_id].present? 
-	    		@shop = shop_data
-	    		if !@shop.nil?
-	    		 plan_obj = AppManager::Client.new
-	    		 plan_data = plan_obj.get_plan(params[:plan_id],params[:shop])
-	    		 # render json: plan_data and return #use this to test plan failsafe api
-	    		 if plan_data.present? && plan_data.is_a?(Hash) 
-            		if plan_data['price'] == 0
-            			active_charge_data = plan_obj.get_charge(params[:shop])
-            			begin
-            				if active_charge_data && active_charge_data.any? && !active_charge_data['active_charge'].nil? && !active_charge_data['active_charge']['charge_id'].nil?
-	        					gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain,@shop.shopify_token)
-	        					rec_cancel_data = gq_obj.recurring_charge_cancel_api_call(active_charge_data['active_charge']['charge_id'],@shop)
-								if !rec_cancel_data["errors"].present? && (rec_cancel_data["data"].present? && rec_cancel_data["data"]["appSubscriptionCancel"].present? && !rec_cancel_data["data"]["appSubscriptionCancel"]["userErrors"].any? && (rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["status"] == 'CANCELLED'))
-									cancelled_charge_id = rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["id"].split('/')[-1]
-									plan_obj.cancel_charge(params[:shop],cancelled_charge_id)
-								end
-        					end
-            			rescue Exception => e
-            				Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
-            			end
-        				
-            			if @shop.update(@plan_field => params[:plan_id])
-            				begin
-            					AppManager::EventHandler.new('charge_created',{
-								"plan" => plan_data,
-								"charge" => nil,
-								"previous_charge" => nil,
-								"shopify_domain" => params[:shop]  	
-								})
-            				rescue Exception => e
-            					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
-            				end
-            				AppManager.clear_cache
-            				render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"}  and return true
-            			else
-            				raise Error, "Invalid charge"
-            			end
-            		end
-	    		 	request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
-	    		    return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
-	    		    gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain,@shop.shopify_token)
-		    		data = gq_obj.recurring_charge_api_call(plan_data,return_url,@shop)
-					if !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}
-					else
-						raise Error, "#{data["errors"].as_json}"
-					end
-	    		 else
-	    		 	raise Error, "#{data["errors"]}"
-	    		 end
-	    		else
-	    			raise ModelNotFound, "Shop not found"
-	    		end
-	        else
-	        	raise Error, "Missing Shop domain or plan id in params"
-	    	end
-	    end
-
-
-	    def callback
-			if params[:charge_id].present? && params[:shop].present? && params[:plan].present?
-				@shop = shop_data
-				shopify_token = @field_names['shopify_token']
-				shopify_domain = @field_names['name']
-	    		if !@shop.nil?
-	    			headers = {"X-Shopify-Access-Token" => @shop[shopify_token]}
-	    			charges = HTTParty.get('https://'+@shop[shopify_domain]+'/admin/api/'+@api_version+'/recurring_application_charges/'+params[:charge_id]+'.json', :headers => headers)
-	    			
-	    			if charges.parsed_response && charges.parsed_response.is_a?(Hash) && charges.parsed_response.has_key?('recurring_application_charge')
- 
-					plan_obj = AppManager::Client.new
-					plan_data = plan_obj.get_plan(params[:plan],params[:shop])
-
-    				charge = charges.parsed_response['recurring_application_charge']
-					charge['charge_id']  = charge['id']
-					charge['type'] = 'recurring'
-					charge['plan_id'] = params[:plan]
-					charge['shop_domain'] = params[:shop]
-					charge['interval'] = plan_data['interval']['value']
-
-						if !@plan_field.nil?
-							begin
-								plan_obj.cancel_charge(@shop[shopify_domain],@shop[@plan_field])
-							rescue Exception => e
-								Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
-							end
-						end
-
-						charge_ob = AppManager::Client.new(nil,json_req=true)
-						response = charge_ob.store_charge(charge.to_json)
-
-						if response['message'] == "success"
-							AppManager.clear_cache
-							@shop.update(@plan_field => params[:plan])
-							charge_data = plan_obj.get_charge(@shop[shopify_domain]) 
-							begin
-								AppManager::EventHandler.new('charge_created',{
-								"plan" => plan_data,
-								"charge" => charge,
-								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
-								"shopify_domain" => params[:shop]  	
-								})
-							rescue Exception => e
-								Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
-							end
-						end     					
-						redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
-	    			else
-	    				raise Error, "Invalid shopify charge #{charges.insect}"
-	    			end
-	    		else
-					raise ModelNotFound, "Shop not found"
-	    		end
-			else
-				raise Error, "Invalid params, must have charge_id,shop && plan"
-			end
-	    end
-
-	    private
-
-	    def params_permit
-	    	params.permit!
-	    end
-
-	    def model
-        	@models = ActiveRecord::Base.connection.tables
-			@config_table = AppManager.configuration.shopify_table_name
-			@shopify_domain = AppManager.configuration.shopify_domain_field
-			@plan_field = AppManager.configuration.plan_id_or_name_field
-			@field_names = AppManager.configuration.field_names
-			@api_version = AppManager.configuration.shopify_api_version
-			if @models.include?(@config_table) && !@plan_field.nil?
-				return @config_table.classify.constantize
-			else
-				return nil
-			end
+  class ChargesController < ApplicationController
+    include HTTParty
+    skip_before_action :verify_authenticity_token, :only => [:process_plan]
+    before_action :params_permit
+    require 'time'
+    require 'rack'
+
+    def process_plan
+      if params[:shop].present? && params[:plan_id].present?
+        @shop = shop_data
+        if !@shop.nil?
+          plan_obj = AppManager::Client.new
+          plan_data = plan_obj.get_plan(params[:plan_id], params[:shop])
+          # render json: plan_data and return #use this to test plan failsafe api
+          if plan_data.present? && plan_data.is_a?(Hash)
+            if plan_data['price'] == 0
+              active_charge_data = plan_obj.get_charge(params[:shop])
+              begin
+                if active_charge_data && active_charge_data.any? && !active_charge_data['active_charge'].nil? && !active_charge_data['active_charge']['charge_id'].nil?
+                  gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
+                  rec_cancel_data = gq_obj.recurring_charge_cancel_api_call(active_charge_data['active_charge']['charge_id'], @shop)
+                  if !rec_cancel_data["errors"].present? && (rec_cancel_data["data"].present? && rec_cancel_data["data"]["appSubscriptionCancel"].present? && !rec_cancel_data["data"]["appSubscriptionCancel"]["userErrors"].any? && (rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["status"] == 'CANCELLED'))
+                    cancelled_charge_id = rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["id"].split('/')[-1]
+                    plan_obj.cancel_charge(params[:shop], cancelled_charge_id)
+                  end
+                end
+              rescue Exception => e
+                Rollbar.error("APP MANAGER Process Plan Failed #{e}")
+              end
+
+              if @shop.update(@plan_field => params[:plan_id])
+                begin
+                  AppManager::EventHandler.new('charge_created', {
+                      "plan" => plan_data,
+                      "charge" => nil,
+                      "previous_charge" => nil,
+                      "shopify_domain" => params[:shop]
+                  })
+								rescue Exception => e
+									Rollbar.error("APP MANAGER Error in Process Plan #{e}")
+                end
+                AppManager.clear_cache
+                render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
+              else
+                raise Error, "Invalid charge"
+              end
+            end
+            request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
+            return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
+            gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
+            data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop)
+            if !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}
+            else
+              raise Error, "#{data["errors"].as_json}"
+            end
+          else
+            raise Error, "#{data["errors"]}"
+          end
+        else
+          raise ModelNotFound, "Shop not found"
         end
+      else
+        raise Error, "Missing Shop domain or plan id in params"
+      end
+    end
+
+
+    def callback
+      if params[:charge_id].present? && params[:shop].present? && params[:plan].present?
+        @shop = shop_data
+        shopify_token = @field_names['shopify_token']
+        shopify_domain = @field_names['name']
+        grandfathered_field = @field_names['grandfathered']
+        if !@shop.nil?
+          headers = {"X-Shopify-Access-Token" => @shop[shopify_token]}
+          charges = HTTParty.get('https://' + @shop[shopify_domain] + '/admin/api/' + @api_version + '/recurring_application_charges/' + params[:charge_id] + '.json', :headers => headers)
+
+          if charges.parsed_response && charges.parsed_response.is_a?(Hash) && charges.parsed_response.has_key?('recurring_application_charge')
+
+            plan_obj = AppManager::Client.new
+            plan_data = plan_obj.get_plan(params[:plan], params[:shop])
+
+            charge = charges.parsed_response['recurring_application_charge']
+            charge['charge_id'] = charge['id']
+            charge['type'] = 'recurring'
+            charge['plan_id'] = params[:plan]
+            charge['shop_domain'] = params[:shop]
+            charge['interval'] = plan_data['interval']['value']
+
+            if !@plan_field.nil?
+              begin
+                plan_obj.cancel_charge(@shop[shopify_domain], @shop[@plan_field])
+              rescue Exception => e
+                Rollbar.error("APP MANAGER Error in Cancel charge >>>> #{e.inspect}")
+              end
+            end
+
+            charge_ob = AppManager::Client.new(nil, json_req = true)
+            response = charge_ob.store_charge(charge.to_json)
+
+            if response['message'] == "success"
+              AppManager.clear_cache
+              @shop.update(@plan_field => params[:plan],grandfathered_field => 0)
+              charge_data = plan_obj.get_charge(@shop[shopify_domain])
+              begin
+                AppManager::EventHandler.new('charge_created', {
+                    "plan" => plan_data,
+                    "charge" => charge,
+                    "previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
+                    "shopify_domain" => params[:shop]
+                })
+              rescue Exception => e
+                Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}")
+              end
+            end
+            redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+          else
+            raise Error, "Invalid shopify charge #{charges.insect}"
+          end
+        else
+          raise ModelNotFound, "Shop not found"
+        end
+      else
+        raise Error, "Invalid params, must have charge_id,shop && plan"
+      end
+    end
+
+    private
+
+    def params_permit
+      params.permit!
+    end
 
-	    def shop_data
-			if model
-				return model.where(@shopify_domain => params[:shop]).first rescue nil
-			else
-				return nil
-			end
-	    end
+    def model
+      @models = ActiveRecord::Base.connection.tables
+      @config_table = AppManager.configuration.shopify_table_name
+      @shopify_domain = AppManager.configuration.shopify_domain_field
+      @plan_field = AppManager.configuration.plan_id_or_name_field
+      @field_names = AppManager.configuration.field_names
+      @api_version = AppManager.configuration.shopify_api_version
+      if @models.include?(@config_table) && !@plan_field.nil?
+        return @config_table.classify.constantize
+      else
+        return nil
+      end
+    end
 
-	    def app_url
-	    	AppManager.configuration.app_url
-	    end
+    def shop_data
+      if model
+        return model.where(@shopify_domain => params[:shop]).first rescue nil
+      else
+        return nil
+      end
+    end
 
+    def app_url
+      AppManager.configuration.app_url
+    end
 
 
-	  end
+  end
 end