shopify_app 17.0.1 → 17.0.2

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/release.yml +6 -2
  3. data/CHANGELOG.md +4 -0
  4. data/Gemfile.lock +3 -3
  5. data/app/controllers/shopify_app/callback_controller.rb +10 -2
  6. data/lib/shopify_app/version.rb +1 -1
  7. data/package.json +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8903612dd539f6990fa6931bc28a2e2a8d37ba5f1177baea4d5326f41f581dca
4
- data.tar.gz: 1760faccb6a46bd3d15a7e5635f33d31d492d81b14a07331e0f778e4e15ff974
3
+ metadata.gz: 00c45ff5e3c6ab4df81d1e28f068661e60e261ec521673d6b667745490c938d9
4
+ data.tar.gz: d4757699fa3dac3eea23a29a60ad0ae4972feca489355df86ed8119906e4f929
5
5
  SHA512:
6
- metadata.gz: 334bd5cb712bd1823133cdfc095a67c547901699bf7dc9b924fb60d009077e0c89629d5e661c15b60e8e5a1fb0ca4656726b75527db76d6db725f6df48b20731
7
- data.tar.gz: a4d52f1d592da1644015edd08f2b153c762cab5a2762426d4406a3105d63ee66e257e65219b56d0c02682e9fc9836890f5cd07c0332e55bf0f9c05d8fd0c49ab
6
+ metadata.gz: f56f3e3ef32065a340c20d50525b493120d56e0a4b2b2c37c38a77ad8631788852dfaa396a98308760370e268316f74cb78ab344850215fba88b023da40688c8
7
+ data.tar.gz: 7751267b60e9c0b2a5c83dfb826772d41edbea1682875ac0587adb47e6fef219b70d42a3f44095d5869c59e0a963b0b580a9366ed1fa429239c2eac35fd570ff
data/.github/workflows/release.yml CHANGED
@@ -14,7 +14,11 @@ jobs:
14
14
  run: echo "::set-output name=value::${GITHUB_REF##*/}"
15
15
  - uses: actions/checkout@v2
16
16
 
17
- - name: Create Release # https://hub.github.com/hub-release.1.html
17
+ - name: Create Release
18
+ id: create_release
19
+ uses: actions/create-release@v1
18
20
  env:
19
21
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20
- run: hub release create ${{ steps.tag.outputs.value }}
22
+ with:
23
+ tag_name: ${{ steps.tag.outputs.value }}
24
+ release_name: ${{ steps.tag.outputs.value }}
data/CHANGELOG.md CHANGED
@@ -1,6 +1,10 @@
1
1
  Unreleased
2
2
  ----------
3
3
 
4
+ 17.0.2 (January 20, 2021)
5
+ ------
6
+ * Fix failing script tags and webhooks installs after completing OAuth [#1151](https://github.com/Shopify/shopify_app/pull/1151)
7
+
4
8
  17.0.1 (January 18, 2021)
5
9
  ------
6
10
  * Don't attempt to read Shopify environment variables when the generators are running, since they may not be present yet [#1144](https://github.com/Shopify/shopify_app/pull/1144)
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- shopify_app (17.0.1)
4
+ shopify_app (17.0.2)
5
5
  browser_sniffer (~> 1.2.2)
6
6
  jwt (~> 2.2.1)
7
7
  omniauth-shopify-oauth2 (~> 2.2.2)
@@ -96,7 +96,7 @@ GEM
96
96
  faraday-net_http (1.0.1)
97
97
  globalid (0.4.2)
98
98
  activesupport (>= 4.2.0)
99
- graphql (1.11.6)
99
+ graphql (1.11.7)
100
100
  graphql-client (0.16.0)
101
101
  activesupport (>= 3.0)
102
102
  graphql (~> 1.8)
@@ -207,7 +207,7 @@ GEM
207
207
  rubocop-shopify (1.0.7)
208
208
  rubocop (~> 1.4)
209
209
  ruby-progressbar (1.10.1)
210
- ruby2_keywords (0.0.2)
210
+ ruby2_keywords (0.0.4)
211
211
  shopify_api (9.2.0)
212
212
  activeresource (>= 4.1.0, < 6.0.0)
213
213
  graphql-client
data/app/controllers/shopify_app/callback_controller.rb CHANGED
@@ -89,6 +89,14 @@ module ShopifyApp
89
89
  auth_hash.uid
90
90
  end
91
91
 
92
+ def offline_access_token
93
+ ShopifyApp::SessionRepository.retrieve_shop_session_by_shopify_domain(shop_name)&.token
94
+ end
95
+
96
+ def online_access_token
97
+ ShopifyApp::SessionRepository.retrieve_user_session_by_shopify_user_id(associated_user_id)&.token
98
+ end
99
+
92
100
  def associated_user
93
101
  return unless auth_hash.dig('extra', 'associated_user').present?
94
102
 
@@ -132,7 +140,7 @@ module ShopifyApp
132
140
 
133
141
  WebhooksManager.queue(
134
142
  shop_name,
135
- shop_session&.token || user_session.token,
143
+ offline_access_token || online_access_token,
136
144
  ShopifyApp.configuration.webhooks
137
145
  )
138
146
  end
@@ -142,7 +150,7 @@ module ShopifyApp
142
150
 
143
151
  ScripttagsManager.queue(
144
152
  shop_name,
145
- shop_session&.token || user_session.token,
153
+ offline_access_token || online_access_token,
146
154
  ShopifyApp.configuration.scripttags
147
155
  )
148
156
  end
data/lib/shopify_app/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module ShopifyApp
3
- VERSION = '17.0.1'
3
+ VERSION = '17.0.2'
4
4
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shopify_app",
3
- "version": "17.0.1",
3
+ "version": "17.0.2",
4
4
  "repository": "git@github.com:Shopify/shopify_app.git",
5
5
  "author": "Shopify",
6
6
  "license": "MIT",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shopify_app
3
3
  version: !ruby/object:Gem::Version
4
- version: 17.0.1
4
+ version: 17.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shopify
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-01-18 00:00:00.000000000 Z
11
+ date: 2021-01-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: browser_sniffer