app_manager 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dfdd07111c73c3c82b14f21099777f2b8f173e5ee38a8a8bd2eb1413993690f
-  data.tar.gz: 23e680f4470a0ac86745fc51379f60770e75d9391f02758a9152930afe42c463
+  metadata.gz: 323da6aca37d494397aea55d292e70a76b0a7280116fbda06eef42a23359147b
+  data.tar.gz: 9e73448ce7fd0d997780dde01638c8d9c342a9408faf58e28fe231d65b577a7b
 SHA512:
-  metadata.gz: 64f68a22812c58a5cb3c2156b8dc1a5d8c0d95a216b61d5bc145494ca53157e3faa424be03cee86bf93a4b5d5466b1e2e2076960e5ef8fd770be91980e38d909
-  data.tar.gz: a014b7af9a38fecdd17cebb6d978984cfa95fae711931fca5968a7c1d4160d758acb264e677e9be36a584ca4ee1ca7194739a6dff16784e8b7998c54081f102c
+  metadata.gz: 12b8049dcef01005dce9b9debba9a0eb1d9921e73d4af6d629fb68fbb028711a26d9942031ed654bb93da656a2674e35d891f6bc6acf5b335db646e2a8698978
+  data.tar.gz: 62f134c579d43e5187bc0a8cb3c6dd172e36f8b040f2e2421657b7072ac4c7f0ccff910c333f79097380149db8dc4c15c98bcd309e947e347059314f92905a4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.9)
+    app_manager (1.4.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)

data/app/controllers/app_manager/charges_controller.rb

@@ -136,7 +136,11 @@ module AppManager
             end
             embed_host = Base64.encode64(params[:shop] + "/admin")
             # redirect_to "/login?host=#{embed_host}&shop=#{shop}" and return
-            redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
+            if app_slug.present?
+              redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}"
+            else
+              redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
+            end
           else
             raise Error, "Invalid shopify charge #{charges.insect}"
           end
@@ -146,7 +150,11 @@ module AppManager
       else
         if params[:shop].present?
           embed_host = Base64.encode64(params[:shop] + "/admin")
-          redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
+          if app_slug.present?
+            redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}"
+          else
+            redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
+          end
         else
           raise Error, "Invalid params, must have charge_id,shop && plan in charge controller"
         end
@@ -185,6 +193,10 @@ module AppManager
       AppManager.configuration.app_url
     end
 
+    def app_slug
+      AppManager.configuration.shopify_app_slug
+    end
+
     def config_trial_days
       @field_names = AppManager.configuration.field_names
       if !@field_names.nil? && @field_names.has_key?('total_trial_days') && !@field_names['total_trial_days'].nil? && !@field_names['total_trial_days'].blank?

data/lib/app_manager/config.rb

@@ -13,6 +13,7 @@ module AppManager
     attr_accessor :plan_id_or_name_field
     attr_accessor :field_names
     attr_accessor :refresh_by_request_params
+    attr_accessor :shopify_app_slug
 
     def initialize
       @refresh_by_request_params = true
@@ -24,6 +25,7 @@ module AppManager
       @shopify_table_name = 'shops'
       @shopify_domain_field = 'shopify_domain'
       @plan_id_or_name_field = nil
+      @shopify_app_slug = nil
       @field_names = {
         'name' => 'shopify_domain', # sample example: demo-chirag-parmar.myshopify.com
         'shopify_email' => 'email', # chirag.p@hulkapps.com
@@ -82,5 +84,9 @@ module AppManager
       @refresh_by_request_params
     end
 
+    def shopify_app_slug
+      @shopify_app_slug
+    end
+
   end
 end

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty