app_manager 2.3.5 → 2.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +128 -114
  3. data/app/controllers/app_manager/charges_controller.rb +5 -5
  4. data/lib/app_manager/graphql_helper.rb +3 -2
  5. data/lib/app_manager/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: de995ea586973a3fe3cfcaee740f6474e24ffb0413a6b6da36eea2f107574736
4
- data.tar.gz: 3009662562494e3df11b82dfc746eb99857eea841a2b2252c01e118a586a3f04
3
+ metadata.gz: 65de0d94a90a9b1c656bbc2fba01e4ab8efab00c5cef9625516fe82b771de75c
4
+ data.tar.gz: c705887f73bf5634e805c7af9038869edcfcd3e18f18ec245895fb7a91d9a95f
5
5
  SHA512:
6
- metadata.gz: 907e45618155d8d13f27d2311b951f59f48176675654b94552563de20546b0ff2d3ad89803b2caf8ad7e977c314e6e9d8603fe4362a1103d29d461b9a23f7f58
7
- data.tar.gz: 7e1133af4e56aba8175ded0bb956ec51e484b6ef71b384527ded33783d791161666ce752423ab8cae8d2989d103e32b60fe4d823fba27ae457fbff6aaffeba23
6
+ metadata.gz: 993a9870f84b778ad8fecedb7bfea401469300a5daf7a8b0993b2db97d261ee8e7ef57332468f8cae4c6a41351e9ca79f3478d1b94e3d1ab909a4f4608c825c2
7
+ data.tar.gz: a2bfc4327453ed04674f06dbb85d5cbf309bfd71ad3200b492b6172236c3cce9bfc88511683a116ccc6f401b266a1cd91ba6f6e3bf94c5a06c62cb46b3299a46
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- app_manager (2.3.5)
4
+ app_manager (2.3.7)
5
5
  activerecord-import (~> 1.4)
6
6
  httparty
7
7
  kaminari (>= 0.16.3)
@@ -10,29 +10,31 @@ PATH
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- actioncable (8.0.2)
14
- actionpack (= 8.0.2)
15
- activesupport (= 8.0.2)
13
+ action_text-trix (2.1.16)
14
+ railties
15
+ actioncable (8.1.2)
16
+ actionpack (= 8.1.2)
17
+ activesupport (= 8.1.2)
16
18
  nio4r (~> 2.0)
17
19
  websocket-driver (>= 0.6.1)
18
20
  zeitwerk (~> 2.6)
19
- actionmailbox (8.0.2)
20
- actionpack (= 8.0.2)
21
- activejob (= 8.0.2)
22
- activerecord (= 8.0.2)
23
- activestorage (= 8.0.2)
24
- activesupport (= 8.0.2)
21
+ actionmailbox (8.1.2)
22
+ actionpack (= 8.1.2)
23
+ activejob (= 8.1.2)
24
+ activerecord (= 8.1.2)
25
+ activestorage (= 8.1.2)
26
+ activesupport (= 8.1.2)
25
27
  mail (>= 2.8.0)
26
- actionmailer (8.0.2)
27
- actionpack (= 8.0.2)
28
- actionview (= 8.0.2)
29
- activejob (= 8.0.2)
30
- activesupport (= 8.0.2)
28
+ actionmailer (8.1.2)
29
+ actionpack (= 8.1.2)
30
+ actionview (= 8.1.2)
31
+ activejob (= 8.1.2)
32
+ activesupport (= 8.1.2)
31
33
  mail (>= 2.8.0)
32
34
  rails-dom-testing (~> 2.2)
33
- actionpack (8.0.2)
34
- actionview (= 8.0.2)
35
- activesupport (= 8.0.2)
35
+ actionpack (8.1.2)
36
+ actionview (= 8.1.2)
37
+ activesupport (= 8.1.2)
36
38
  nokogiri (>= 1.8.5)
37
39
  rack (>= 2.2.4)
38
40
  rack-session (>= 1.0.1)
@@ -40,81 +42,85 @@ GEM
40
42
  rails-dom-testing (~> 2.2)
41
43
  rails-html-sanitizer (~> 1.6)
42
44
  useragent (~> 0.16)
43
- actiontext (8.0.2)
44
- actionpack (= 8.0.2)
45
- activerecord (= 8.0.2)
46
- activestorage (= 8.0.2)
47
- activesupport (= 8.0.2)
45
+ actiontext (8.1.2)
46
+ action_text-trix (~> 2.1.15)
47
+ actionpack (= 8.1.2)
48
+ activerecord (= 8.1.2)
49
+ activestorage (= 8.1.2)
50
+ activesupport (= 8.1.2)
48
51
  globalid (>= 0.6.0)
49
52
  nokogiri (>= 1.8.5)
50
- actionview (8.0.2)
51
- activesupport (= 8.0.2)
53
+ actionview (8.1.2)
54
+ activesupport (= 8.1.2)
52
55
  builder (~> 3.1)
53
56
  erubi (~> 1.11)
54
57
  rails-dom-testing (~> 2.2)
55
58
  rails-html-sanitizer (~> 1.6)
56
- activejob (8.0.2)
57
- activesupport (= 8.0.2)
59
+ activejob (8.1.2)
60
+ activesupport (= 8.1.2)
58
61
  globalid (>= 0.3.6)
59
- activemodel (8.0.2)
60
- activesupport (= 8.0.2)
61
- activerecord (8.0.2)
62
- activemodel (= 8.0.2)
63
- activesupport (= 8.0.2)
62
+ activemodel (8.1.2)
63
+ activesupport (= 8.1.2)
64
+ activerecord (8.1.2)
65
+ activemodel (= 8.1.2)
66
+ activesupport (= 8.1.2)
64
67
  timeout (>= 0.4.0)
65
68
  activerecord-import (1.8.1)
66
69
  activerecord (>= 4.2)
67
- activestorage (8.0.2)
68
- actionpack (= 8.0.2)
69
- activejob (= 8.0.2)
70
- activerecord (= 8.0.2)
71
- activesupport (= 8.0.2)
70
+ activestorage (8.1.2)
71
+ actionpack (= 8.1.2)
72
+ activejob (= 8.1.2)
73
+ activerecord (= 8.1.2)
74
+ activesupport (= 8.1.2)
72
75
  marcel (~> 1.0)
73
- activesupport (8.0.2)
76
+ activesupport (8.1.2)
74
77
  base64
75
- benchmark (>= 0.3)
76
78
  bigdecimal
77
79
  concurrent-ruby (~> 1.0, >= 1.3.1)
78
80
  connection_pool (>= 2.2.5)
79
81
  drb
80
82
  i18n (>= 1.6, < 2)
83
+ json
81
84
  logger (>= 1.4.2)
82
85
  minitest (>= 5.1)
83
86
  securerandom (>= 0.3)
84
87
  tzinfo (~> 2.0, >= 2.0.5)
85
88
  uri (>= 0.13.1)
86
- addressable (2.8.0)
87
- public_suffix (>= 2.0.2, < 5.0)
88
- base64 (0.2.0)
89
- benchmark (0.4.0)
90
- bigdecimal (3.1.9)
89
+ addressable (2.8.8)
90
+ public_suffix (>= 2.0.2, < 8.0)
91
+ base64 (0.3.0)
92
+ bigdecimal (4.0.1)
91
93
  builder (3.3.0)
92
94
  coderay (1.1.3)
93
- concurrent-ruby (1.3.5)
94
- connection_pool (2.5.3)
95
- crack (0.4.5)
95
+ concurrent-ruby (1.3.6)
96
+ connection_pool (3.0.2)
97
+ crack (1.0.1)
98
+ bigdecimal
96
99
  rexml
97
100
  crass (1.0.6)
98
- csv (3.3.4)
99
- date (3.4.1)
100
- diff-lcs (1.5.0)
101
+ csv (3.3.5)
102
+ date (3.5.1)
103
+ diff-lcs (1.6.2)
101
104
  dotenv (2.1.2)
102
- drb (2.2.1)
105
+ drb (2.2.3)
106
+ erb (6.0.1)
103
107
  erubi (1.13.1)
104
- globalid (1.2.1)
108
+ globalid (1.3.0)
105
109
  activesupport (>= 6.1)
106
- hashdiff (1.0.1)
107
- httparty (0.23.1)
110
+ hashdiff (1.2.1)
111
+ httparty (0.24.2)
108
112
  csv
109
113
  mini_mime (>= 1.0.0)
110
114
  multi_xml (>= 0.5.2)
111
- i18n (1.14.7)
115
+ i18n (1.14.8)
112
116
  concurrent-ruby (~> 1.0)
113
- io-console (0.8.0)
114
- irb (1.15.2)
117
+ io-console (0.8.2)
118
+ irb (1.17.0)
115
119
  pp (>= 0.6.0)
120
+ prism (>= 1.3.0)
116
121
  rdoc (>= 4.0.0)
117
122
  reline (>= 0.4.2)
123
+ json (2.18.1)
118
124
  kaminari (1.2.2)
119
125
  activesupport (>= 4.1.0)
120
126
  kaminari-actionview (= 1.2.2)
@@ -128,22 +134,24 @@ GEM
128
134
  kaminari-core (= 1.2.2)
129
135
  kaminari-core (1.2.2)
130
136
  logger (1.7.0)
131
- loofah (2.24.1)
137
+ loofah (2.25.0)
132
138
  crass (~> 1.0.2)
133
139
  nokogiri (>= 1.12.0)
134
- mail (2.8.1)
140
+ mail (2.9.0)
141
+ logger
135
142
  mini_mime (>= 0.1.1)
136
143
  net-imap
137
144
  net-pop
138
145
  net-smtp
139
- marcel (1.0.4)
140
- method_source (1.0.0)
146
+ marcel (1.1.0)
147
+ method_source (1.1.0)
141
148
  mini_mime (1.1.5)
142
149
  mini_portile2 (2.8.9)
143
- minitest (5.25.5)
144
- multi_xml (0.7.2)
145
- bigdecimal (~> 3.1)
146
- net-imap (0.5.8)
150
+ minitest (6.0.1)
151
+ prism (~> 1.5)
152
+ multi_xml (0.8.1)
153
+ bigdecimal (>= 3.1, < 5)
154
+ net-imap (0.6.3)
147
155
  date
148
156
  net-protocol
149
157
  net-pop (0.1.2)
@@ -152,98 +160,104 @@ GEM
152
160
  timeout
153
161
  net-smtp (0.5.1)
154
162
  net-protocol
155
- nio4r (2.7.4)
156
- nokogiri (1.18.8)
163
+ nio4r (2.7.5)
164
+ nokogiri (1.19.1)
157
165
  mini_portile2 (~> 2.8.2)
158
166
  racc (~> 1.4)
159
- nokogiri (1.18.8-x86_64-linux-gnu)
167
+ nokogiri (1.19.1-x86_64-linux-gnu)
160
168
  racc (~> 1.4)
161
- pp (0.6.2)
169
+ pp (0.6.3)
162
170
  prettyprint
163
171
  prettyprint (0.2.0)
164
- pry (0.14.1)
172
+ prism (1.9.0)
173
+ pry (0.16.0)
165
174
  coderay (~> 1.1)
166
175
  method_source (~> 1.0)
167
- psych (5.2.6)
176
+ reline (>= 0.6.0)
177
+ psych (5.3.1)
168
178
  date
169
179
  stringio
170
- public_suffix (4.0.6)
180
+ public_suffix (7.0.2)
171
181
  racc (1.8.1)
172
- rack (3.1.14)
182
+ rack (3.2.5)
173
183
  rack-session (2.1.1)
174
184
  base64 (>= 0.1.0)
175
185
  rack (>= 3.0.0)
176
186
  rack-test (2.2.0)
177
187
  rack (>= 1.3)
178
- rackup (2.2.1)
188
+ rackup (2.3.1)
179
189
  rack (>= 3)
180
- rails (8.0.2)
181
- actioncable (= 8.0.2)
182
- actionmailbox (= 8.0.2)
183
- actionmailer (= 8.0.2)
184
- actionpack (= 8.0.2)
185
- actiontext (= 8.0.2)
186
- actionview (= 8.0.2)
187
- activejob (= 8.0.2)
188
- activemodel (= 8.0.2)
189
- activerecord (= 8.0.2)
190
- activestorage (= 8.0.2)
191
- activesupport (= 8.0.2)
190
+ rails (8.1.2)
191
+ actioncable (= 8.1.2)
192
+ actionmailbox (= 8.1.2)
193
+ actionmailer (= 8.1.2)
194
+ actionpack (= 8.1.2)
195
+ actiontext (= 8.1.2)
196
+ actionview (= 8.1.2)
197
+ activejob (= 8.1.2)
198
+ activemodel (= 8.1.2)
199
+ activerecord (= 8.1.2)
200
+ activestorage (= 8.1.2)
201
+ activesupport (= 8.1.2)
192
202
  bundler (>= 1.15.0)
193
- railties (= 8.0.2)
194
- rails-dom-testing (2.2.0)
203
+ railties (= 8.1.2)
204
+ rails-dom-testing (2.3.0)
195
205
  activesupport (>= 5.0.0)
196
206
  minitest
197
207
  nokogiri (>= 1.6)
198
208
  rails-html-sanitizer (1.6.2)
199
209
  loofah (~> 2.21)
200
210
  nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
201
- railties (8.0.2)
202
- actionpack (= 8.0.2)
203
- activesupport (= 8.0.2)
211
+ railties (8.1.2)
212
+ actionpack (= 8.1.2)
213
+ activesupport (= 8.1.2)
204
214
  irb (~> 1.13)
205
215
  rackup (>= 1.0.0)
206
216
  rake (>= 12.2)
207
217
  thor (~> 1.0, >= 1.2.2)
218
+ tsort (>= 0.2)
208
219
  zeitwerk (~> 2.6)
209
- rake (13.0.6)
210
- rdoc (6.13.1)
220
+ rake (13.3.1)
221
+ rdoc (7.2.0)
222
+ erb
211
223
  psych (>= 4.0.0)
212
- reline (0.6.1)
224
+ tsort
225
+ reline (0.6.3)
213
226
  io-console (~> 0.5)
214
- rexml (3.2.5)
215
- rspec (3.11.0)
216
- rspec-core (~> 3.11.0)
217
- rspec-expectations (~> 3.11.0)
218
- rspec-mocks (~> 3.11.0)
219
- rspec-core (3.11.0)
220
- rspec-support (~> 3.11.0)
221
- rspec-expectations (3.11.0)
227
+ rexml (3.4.4)
228
+ rspec (3.13.2)
229
+ rspec-core (~> 3.13.0)
230
+ rspec-expectations (~> 3.13.0)
231
+ rspec-mocks (~> 3.13.0)
232
+ rspec-core (3.13.6)
233
+ rspec-support (~> 3.13.0)
234
+ rspec-expectations (3.13.5)
222
235
  diff-lcs (>= 1.2.0, < 2.0)
223
- rspec-support (~> 3.11.0)
224
- rspec-github (2.3.1)
236
+ rspec-support (~> 3.13.0)
237
+ rspec-github (3.0.0)
225
238
  rspec-core (~> 3.0)
226
- rspec-mocks (3.11.0)
239
+ rspec-mocks (3.13.7)
227
240
  diff-lcs (>= 1.2.0, < 2.0)
228
- rspec-support (~> 3.11.0)
229
- rspec-support (3.11.0)
241
+ rspec-support (~> 3.13.0)
242
+ rspec-support (3.13.7)
230
243
  securerandom (0.4.1)
231
- stringio (3.1.7)
232
- thor (1.3.2)
233
- timeout (0.4.3)
244
+ stringio (3.2.0)
245
+ thor (1.5.0)
246
+ timeout (0.6.0)
247
+ tsort (0.2.0)
234
248
  tzinfo (2.0.6)
235
249
  concurrent-ruby (~> 1.0)
236
- uri (1.0.3)
250
+ uri (1.1.1)
237
251
  useragent (0.16.11)
238
- webmock (3.14.0)
252
+ webmock (3.26.1)
239
253
  addressable (>= 2.8.0)
240
254
  crack (>= 0.3.2)
241
255
  hashdiff (>= 0.4.0, < 2.0.0)
242
- websocket-driver (0.7.7)
256
+ websocket-driver (0.8.0)
243
257
  base64
244
258
  websocket-extensions (>= 0.1.0)
245
259
  websocket-extensions (0.1.5)
246
- zeitwerk (2.7.2)
260
+ zeitwerk (2.7.4)
247
261
 
248
262
  PLATFORMS
249
263
  ruby
data/app/controllers/app_manager/charges_controller.rb CHANGED
@@ -165,11 +165,11 @@ module AppManager
165
165
  old_plan_string = !old_plan_data.nil? ? "#{old_plan_data['name'].gsub(" ", "-")}-#{old_plan_data['interval']['label']}" : "none" rescue ""
166
166
  plan_query_string = "new_plan=#{current_plan_string}&old_plan=#{old_plan_string}"
167
167
  if app_slug.present? && plan_page_route_value.present?
168
- redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}/#{plan_page_route_value}?#{plan_query_string}"
168
+ redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}/#{plan_page_route_value}?#{plan_query_string}", :allow_other_host => true
169
169
  elsif app_slug.present? && !plan_page_route_value.present?
170
- redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}"
170
+ redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}", :allow_other_host => true
171
171
  else
172
- redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
172
+ redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :allow_other_host => true, :status => 301 and return
173
173
  end
174
174
  else
175
175
  raise Error, "Invalid shopify charge #{charges.inspect}"
@@ -181,9 +181,9 @@ module AppManager
181
181
  if params[:shop].present?
182
182
  embed_host = Base64.encode64(params[:shop] + "/admin")
183
183
  if app_slug.present?
184
- redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}"
184
+ redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}", :allow_other_host => true
185
185
  else
186
- redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
186
+ redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :allow_other_host => true, :status => 301 and return
187
187
  end
188
188
  else
189
189
  raise Error, "Invalid params, must have charge_id,shop && plan in charge controller"
data/lib/app_manager/graphql_helper.rb CHANGED
@@ -57,8 +57,9 @@ module AppManager
57
57
  def recurring_charge_api_call(plan,return_url,shop,discount_local_storage)
58
58
  plan_test = nil
59
59
  shop_plan_field = AppManager.configuration.field_names['shopify_plan'] rescue nil
60
- if !plan['affiliate'].nil? && plan['affiliate'].any? && !shop_plan_field.nil? && plan['affiliate'].map{|e| e['value']}.include?(shop[shop_plan_field])
61
- plan_test = true
60
+ partner_development_field = AppManager.configuration.field_names['partner_development'] rescue nil
61
+ if !plan['affiliate'].nil? && plan['affiliate'].any? && !shop_plan_field.nil? && (plan['affiliate'].map{|e| e['value']}.include?(shop[shop_plan_field]) || shop[partner_development_field])
62
+ plan_test = true
62
63
  end
63
64
  trial_days = plan['trial_days'] || 0
64
65
  if shop && shop.shopify_domain && trial_days
data/lib/app_manager/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module AppManager
4
- VERSION = "2.3.5"
4
+ VERSION = "2.3.7"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: app_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.5
4
+ version: 2.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rahul Tiwari @ Hulkapps
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-05-16 00:00:00.000000000 Z
11
+ date: 2026-02-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: httparty