app_manager 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3a1d17d520c154419fd5917813fda210900f58d12686723bacf05d99ecbd14
-  data.tar.gz: 0f62d38f1160f30e07eb96007f845395ce397f70d82043f76f71aaf8c564e0e0
+  metadata.gz: 323da6aca37d494397aea55d292e70a76b0a7280116fbda06eef42a23359147b
+  data.tar.gz: 9e73448ce7fd0d997780dde01638c8d9c342a9408faf58e28fe231d65b577a7b
 SHA512:
-  metadata.gz: c6136666c06d579b448ab775a4e9cc6c72f314f0ffc39baccece2d9fe3951a56c1853848d6e83bdfb847037680d2b1e978a4e04b0d440fbc783169a6ecac3e06
-  data.tar.gz: 730a1f415a8d7a679ade4bb74b60b84ddc109ecfa661dc950c666c8fa8bdef44dd3faf6d14d0979052ae73c58350ff53225e0fe51f96f4f463a19f7c50314e95
+  metadata.gz: 12b8049dcef01005dce9b9debba9a0eb1d9921e73d4af6d629fb68fbb028711a26d9942031ed654bb93da656a2674e35d891f6bc6acf5b335db646e2a8698978
+  data.tar.gz: 62f134c579d43e5187bc0a8cb3c6dd172e36f8b040f2e2421657b7072ac4c7f0ccff910c333f79097380149db8dc4c15c98bcd309e947e347059314f92905a4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.7)
+    app_manager (1.4.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -88,7 +88,7 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.0)
     dotenv (2.1.2)
-    erubi (1.10.0)
+    erubi (1.11.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
@@ -121,7 +121,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_xml (0.6.0)
     net-imap (0.2.3)
       digest
@@ -138,7 +138,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pry (0.14.1)
@@ -192,10 +192,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    strscan (3.0.3)
+    strscan (3.0.4)
     thor (1.2.1)
     timeout (0.3.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -134,7 +134,13 @@ module AppManager
                 end
               end
             end
-            redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+            embed_host = Base64.encode64(params[:shop] + "/admin")
+            # redirect_to "/login?host=#{embed_host}&shop=#{shop}" 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
@@ -143,7 +149,12 @@ module AppManager
         end
       else
         if params[:shop].present?
-          redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+          embed_host = Base64.encode64(params[:shop] + "/admin")
+          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
@@ -182,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/app/controllers/app_manager/plans_controller.rb

@@ -1,5 +1,5 @@
 require_dependency "app_manager/application_controller"
-
+require 'kaminari'
 module AppManager
   class PlansController < ApplicationController
     cache_response_for :plans

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.7"
+  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.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty