shopify_app 21.4.0 → 21.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8bffcbbd9262af14d8b5d0c0333b2a17f4de563ad4c40134dec7b838eaf789b
-  data.tar.gz: 0ba89c4f9ff64b366c3d368b70abcfdf2e02f1e0f66c796f5b16a6a5fafdcd07
+  metadata.gz: '029b36852c1c017c7e96570b5e90aca34f2471bd9b56699c1bc1d4ef6f6996a8'
+  data.tar.gz: '01239772e056908581b57f0cc93dc3b867fa14447887865c19b09e7b6fae08bf'
 SHA512:
-  metadata.gz: bc4dc9ccd6267a2eb7ff1d22e54f1527c0ab32cb61b83841bc71cc4bb79b14a33aa4021e13494e3167d0a7d20aeea86f9af9dd478ebff8400ec4b33ac1426417
-  data.tar.gz: c2154db900a3fb4321be1d224c8d44987fdce714984b3004b87b4dd5301717832fa11b907fe88b261020da82b4c3255256d4e4ba4dd5800262a8e3daa4778f91
+  metadata.gz: 10cdbfa6bef394875c1d5bd518f62862c289bce52f835af22dae3c3c3f64d91629008e012cf10e7e1dd83fff70664fd01cc070dd90672e99f88bde9e529aba03
+  data.tar.gz: e38068aca0100e029f26695c5558c698ebff02fb7a4189b217a7b8e38902d4a8d38564f4a8eabba4d959bf55677e54822444937d43da2251e88f9334c3dc2a85

data/.github/workflows/build.yml

@@ -12,12 +12,12 @@ jobs:
     name: Ruby ${{ matrix.version }}
     strategy:
       matrix:
-        version: ['2.7', '3.0']
+        version: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ~/.npm

data/.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Extract tag name
       id: tag
       run: echo "::set-output name=value::${GITHUB_REF##*/}"
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create Release
       id: create_release

data/.github/workflows/remove-labels-on-activity.yml

@@ -7,7 +7,7 @@ jobs:
   remove-labels-on-activity:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-ecosystem/action-remove-labels@v1
         if: contains(github.event.issue.labels.*.name, 'Waiting for Response')
         with:

data/.github/workflows/rubocop.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby 2.7
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/stale.yml

@@ -1,32 +1,43 @@
-name: Close inactive issues
+name: Close inactive issues / prs
 on:
   schedule:
     - cron: "30 1 * * *"
 
 jobs:
-  close-issues:
+  stale:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v7
         with:
-          days-before-issue-stale: 90
+          days-before-issue-stale: 60
           days-before-issue-close: 14
+          days-before-pr-stale: 60
+          days-before-pr-close: 14
+          operations-per-run: 1000
           stale-issue-label: "Stale"
+          stale-pr-label: "Stale"
           stale-issue-message: >
-            This issue is stale because it has been open for 90 days with no activity. It will be closed if no further action occurs in 14 days. 
+            This issue is stale because it has been open for 60 days with no activity. It will be closed if no further action occurs in 14 days.
           close-issue-message: |
-            We are closing this issue because it has been inactive for a few months. 
-            This probably means that it is not reproducible or it has been fixed in a newer version. 
+            We are closing this issue because it has been inactive for a few months.
+            This probably means that it is not reproducible or it has been fixed in a newer version.
             If it’s an enhancement and hasn’t been taken on since it was submitted, then it seems other issues have taken priority.
 
             If you still encounter this issue with the latest stable version, please reopen using the issue template. You can also contribute directly by submitting a pull request– see the [CONTRIBUTING.md](https://github.com/Shopify/shopify_app/blob/main/CONTRIBUTING.md) file for guidelines
 
             Thank you!
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          exempt-issue-labels: "feature request"
+          stale-pr-message: >
+            This pull request is stale because it has been open for 60 days with no activity. It will be closed if no further action occurs in 14 days.
+          close-pr-message: |
+            We are closing this pull request because it has been inactive for a few months.
+            This probably means that it is not reproducible or it has been fixed in a newer version.
+            If it’s an enhancement and hasn’t been taken on since it was submitted, then it seems other issues have taken priority.
+
+            If you still encounter this pull request with the latest stable version, please reopen using the pull request template. You can also contribute directly by submitting a pull request– see the [CONTRIBUTING.md](https://github.com/Shopify/shopify_app/blob/main/CONTRIBUTING.md) file for guidelines
+
+            Thank you!
+          repo-token: ${{ github.token }}
           close-issue-reason: "not_planned"

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.2.2

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 Unreleased
 ----------
 
+21.5.0 (May 18, 2023)
+----------
+* Support Unified Admin [#1658](https://github.com/Shopify/shopify_app/pull/1658)
+* Set `access_scopes` column to string by default [#1636](https://github.com/Shopify/shopify_app/pull/1636)
+* Fixes a bug with `EnsureBilling` causing infinite redirect in embedded apps [#1578](https://github.com/Shopify/shopify_app/pull/1578)
+* Modifies SessionStorage#with_shopify_session to call a block with a supplied session instance [#1488](https://github.com/Shopify/shopify_app/pull/1488)
+* Refactors `ShopifyApp::WebhhooksManager#recreate_webhooks!` to have a uniform webhook inventory that doesn't clash with the API library. Updates webhook generator to use supplied session. [#1686](https://github.com/Shopify/shopify_app/pull/1686)
+* No longer use session repository from API library[#1689](https://github.com/Shopify/shopify_app/pull/1689)
+
+21.4.1 (Feb 21, 2023)
+----------
+* Fixed bug where authentication redirect could still happen even though `reauth_on_access_scope_changes` is set to `false` [#1639](https://github.com/Shopify/shopify_app/pull/1639)
+
 21.4.0 (Jan 5, 2023)
 ----------
 * Updated shopify_api to 12.4.0 [#1633](https://github.com/Shopify/shopify_app/pull/1633)

data/CONTRIBUTING.md

@@ -61,7 +61,7 @@ If you have a suggestion for the Shopify App gem or a feature request, provide t
 
 The process described here has several goals:
 
-* Maintain the Shopify App gem's quality
+* Maintain the Shopify App gem's quality (does the change you're making have a test?)
 * Fix problems that are important to app developers
 * Enable a sustainable system for the Shopify App gem's maintainers to review contributions
 
@@ -74,7 +74,22 @@ Please follow these steps to have your contribution considered by the maintainer
 
       While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.
     </details>
-    
+
+### Running tests
+
+#### Test Environment Requirements
+
+To run tests, you'll need to make sure that your development environment is setup correctly. You'll need:
+
+* Ruby 3+ is installed on your system
+* Install dependencies with `bundle install`
+
+#### Executing Tests
+
+* To run all tests: `bundle exec rake test`
+* To run a specific test file: `bundle exec rake test TEST=test/controllers/callback_controller_test.rb`
+* To run a single test: `bundle exec rake test TEST=test/controllers/callback_controller_test.rb:50` where `50` is the line number on or inside the test case.
+
 ### App Bridge client
 
 This gem ships with a UMD version of the App Bridge client. It lives inside the assets folder: `app/assets/javascripts/shopify_app/`. To update the client, simply download the UMD build from [unpkg.com](https://unpkg.com/@shopify/app-bridge) and save it into the folder.

data/Gemfile.lock

@@ -1,87 +1,87 @@
 PATH
   remote: .
   specs:
-    shopify_app (21.4.0)
+    shopify_app (21.5.0)
       activeresource
       addressable (~> 2.7)
       browser_sniffer (~> 2.0)
       jwt (>= 2.2.3)
       rails (> 5.2.1)
       redirect_safely (~> 1.0)
-      shopify_api (~> 12.4)
+      shopify_api (~> 13.0)
       sprockets-rails (>= 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    actioncable (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailbox (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.7)
-      actionpack (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailer (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7)
-      actionview (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionpack (6.1.7.3)
+      actionview (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7)
-      actionpack (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actiontext (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7)
-      activesupport (= 6.1.7)
+    actionview (6.1.7.3)
+      activesupport (= 6.1.7.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7)
-      activesupport (= 6.1.7)
+    activejob (6.1.7.3)
+      activesupport (= 6.1.7.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.7)
-      activesupport (= 6.1.7)
+    activemodel (6.1.7.3)
+      activesupport (= 6.1.7.3)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7)
-      activemodel (= 6.1.7)
-      activesupport (= 6.1.7)
+    activerecord (6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
     activeresource (6.0.0)
       activemodel (>= 6.0)
       activemodel-serializers-xml (~> 1.0)
       activesupport (>= 6.0)
-    activestorage (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activesupport (= 6.1.7)
+    activestorage (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     binding_of_caller (1.0.0)
@@ -90,28 +90,29 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    date (3.3.3)
     debug_inspector (1.1.0)
-    erubi (1.11.0)
-    globalid (1.0.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     hash_diff (1.1.1)
     hashdiff (1.0.1)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    jwt (2.6.0)
-    language_server-protocol (3.17.0.2)
-    loofah (2.19.0)
+    jwt (2.7.0)
+    language_server-protocol (3.17.0.3)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.8.0)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -119,32 +120,33 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.17.0)
+    minitest (5.18.0)
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
     multi_xml (0.6.0)
-    net-imap (0.3.1)
+    net-imap (0.3.4)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.0)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.9-arm64-darwin)
+    nio4r (2.5.9)
+    nokogiri (1.15.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.15.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.15.0-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.23)
+    oj (3.14.3)
     openssl (3.1.0)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    prettier_print (1.1.0)
-    pry (0.14.1)
+    prettier_print (1.2.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-nav (1.0.0)
@@ -153,24 +155,24 @@ GEM
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
     public_suffix (5.0.1)
-    racc (1.6.1)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7)
-      actioncable (= 6.1.7)
-      actionmailbox (= 6.1.7)
-      actionmailer (= 6.1.7)
-      actionpack (= 6.1.7)
-      actiontext (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activemodel (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    rails (6.1.7.3)
+      actioncable (= 6.1.7.3)
+      actionmailbox (= 6.1.7.3)
+      actionmailer (= 6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actiontext (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.7)
+      railties (= 6.1.7.3)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -179,11 +181,11 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -192,30 +194,30 @@ GEM
     rb-readline (0.5.5)
     redirect_safely (1.0.0)
       activemodel
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rubocop (1.39.0)
+    rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    rubocop-shopify (2.10.1)
-      rubocop (~> 1.35)
-    ruby-lsp (0.3.6)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-shopify (2.13.0)
+      rubocop (~> 1.50)
+    ruby-lsp (0.5.1)
       language_server-protocol (~> 3.17.0)
       sorbet-runtime
-      syntax_tree (>= 4.0.2, < 5.0.0)
-    ruby-progressbar (1.11.0)
+      syntax_tree (>= 6.1.1, < 7)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     securerandom (0.2.2)
-    shopify_api (12.4.0)
+    shopify_api (13.0.0)
       activesupport
       concurrent-ruby
       hash_diff
@@ -226,24 +228,24 @@ GEM
       securerandom
       sorbet-runtime
       zeitwerk (~> 2.5, < 2.6.5)
-    sorbet-runtime (0.5.10601)
-    sprockets (4.1.1)
+    sorbet-runtime (0.5.10835)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-arm64-darwin)
-    sqlite3 (1.5.4-x86_64-darwin)
-    sqlite3 (1.5.4-x86_64-linux)
-    syntax_tree (4.3.0)
-      prettier_print (>= 1.0.2)
-    thor (1.2.1)
-    timeout (0.3.1)
-    tzinfo (2.0.5)
+    sqlite3 (1.6.3-arm64-darwin)
+    sqlite3 (1.6.3-x86_64-darwin)
+    sqlite3 (1.6.3-x86_64-linux)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
+    thor (1.2.2)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -255,7 +257,10 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -276,4 +281,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.4
+   2.4.10

data/app/controllers/concerns/shopify_app/authenticated.rb

@@ -5,8 +5,11 @@ module ShopifyApp
     extend ActiveSupport::Concern
 
     included do
-      ShopifyApp::Logger.deprecated("Authenticated has been replaced by EnsureHasSession."\
-        " Please use the EnsureHasSession controller concern for the same behavior", "22.0.0")
+      ShopifyApp::Logger.deprecated(
+        "Authenticated has been replaced by EnsureHasSession."\
+          " Please use the EnsureHasSession controller concern for the same behavior",
+        "22.0.0",
+      )
     end
 
     include ShopifyApp::EnsureHasSession

data/app/controllers/concerns/shopify_app/require_known_shop.rb

@@ -6,8 +6,11 @@ module ShopifyApp
     include ShopifyApp::EnsureInstalled
 
     included do
-      ShopifyApp::Logger.deprecated("RequireKnownShop has been replaced by EnsureInstalled."\
-        " Please use the EnsureInstalled controller concern for the same behavior", "22.0.0")
+      ShopifyApp::Logger.deprecated(
+        "RequireKnownShop has been replaced by EnsureInstalled."\
+          " Please use the EnsureInstalled controller concern for the same behavior",
+        "22.0.0",
+      )
     end
   end
 end

data/docs/shopify_app/session-repository.md

@@ -35,7 +35,7 @@ This will generate a shop model and user model, which will be the storage for th
 
 The current Shopify user will be stored in the rails session at `session[:shopify_user]`
 
-Read more about Online vs. Offline access [here](https://help.shopify.com/api/getting-started/authentication/oauth).
+Read more about Online vs. Offline access [here](https://shopify.dev/apps/auth/oauth/access-modes).
 
 ## Access scopes
 

data/lib/generators/shopify_app/add_after_authenticate_job/add_after_authenticate_job_generator.rb

@@ -25,8 +25,11 @@ module ShopifyApp
         )
 
         unless initializer.include?(after_authenticate_job_config)
-          shell.say("Error adding after_authenticate_job to config. Add this line manually: "\
-            "#{after_authenticate_job_config}", :red)
+          shell.say(
+            "Error adding after_authenticate_job to config. Add this line manually: "\
+              "#{after_authenticate_job_config}",
+            :red,
+          )
         end
       end
 

data/lib/generators/shopify_app/add_after_authenticate_job/templates/after_authenticate_job.rb

@@ -5,7 +5,7 @@ module Shopify
     def perform(shop_domain:)
       shop = Shop.find_by(shopify_domain: shop_domain)
 
-      shop.with_shopify_session do
+      shop.with_shopify_session do |session|
       end
     end
   end

data/lib/generators/shopify_app/add_webhook/templates/webhook_job.rb.tt

@@ -12,11 +12,11 @@ class <%= @job_class_name %> < ActiveJob::Base
 
     if shop.nil?
       logger.error("#{self.class} failed: cannot find shop with domain '#{shop_domain}'")
-      
+
       raise ActiveRecord::RecordNotFound, "Shop Not Found"
     end
 
-    shop.with_shopify_session do
+    shop.with_shopify_session do |session|
     end
   end
 end

data/lib/generators/shopify_app/install/install_generator.rb

@@ -13,8 +13,8 @@ module ShopifyApp
       class_option :embedded, type: :string, default: "true"
       class_option :api_version, type: :string, default: nil
 
-      NGROK_HOST = "/\[-\\w]+\\.ngrok\\.io/"
-      CLOUDFLARE_HOST = "/\[-\\w]+\\.trycloudflare\\.com/"
+      NGROK_HOST = "/[-\\w]+\\.ngrok\\.io/"
+      CLOUDFLARE_HOST = "/[-\\w]+\\.trycloudflare\\.com/"
 
       def create_shopify_app_initializer
         @application_name = format_array_argument(options["application_name"])

data/lib/generators/shopify_app/shop_model/templates/db/migrate/add_shop_access_scopes_column.erb

@@ -1,5 +1,5 @@
 class AddShopAccessScopesColumn < ActiveRecord::Migration[<%= rails_migration_version %>]
   def change
-    add_column :shops, :access_scopes, :string
+    add_column :shops, :access_scopes, :string, default: "", null: false
   end
 end

data/lib/generators/shopify_app/user_model/templates/db/migrate/add_user_access_scopes_column.erb

@@ -1,5 +1,5 @@
 class AddUserAccessScopesColumn < ActiveRecord::Migration[<%= rails_migration_version %>]
   def change
-    add_column :users, :access_scopes, :string
+    add_column :users, :access_scopes, :string, default: "", null: false
   end
 end

data/lib/shopify_app/access_scopes/user_strategy.rb

@@ -8,8 +8,10 @@ module ShopifyApp
           return update_access_scopes_for_user_id?(user_id) if user_id
           return update_access_scopes_for_shopify_user_id?(shopify_user_id) if shopify_user_id
 
-          raise(::ShopifyApp::InvalidInput,
-            "#update_access_scopes? requires user_id or shopify_user_id parameter inputs")
+          raise(
+            ::ShopifyApp::InvalidInput,
+            "#update_access_scopes? requires user_id or shopify_user_id parameter inputs",
+          )
         end
 
         def covers_scopes?(current_shopify_session)

data/lib/shopify_app/controller_concerns/ensure_billing.rb

@@ -30,6 +30,8 @@ module ShopifyApp
           add_top_level_redirection_headers(url: confirmation_url, ignore_response_code: true)
           ShopifyApp::Logger.debug("Responding with 401 unauthorized")
           head(:unauthorized)
+        elsif ShopifyApp.configuration.embedded_app?
+          fullpage_redirect_to(confirmation_url)
         else
           redirect_to(confirmation_url, allow_other_host: true)
         end
@@ -174,7 +176,7 @@ module ShopifyApp
       response
     end
 
-    RECURRING_PURCHASES_QUERY = <<~'QUERY'
+    RECURRING_PURCHASES_QUERY = <<~QUERY
       query appSubscription {
         currentAppInstallation {
           activeSubscriptions {
@@ -184,7 +186,7 @@ module ShopifyApp
       }
     QUERY
 
-    ONE_TIME_PURCHASES_QUERY = <<~'QUERY'
+    ONE_TIME_PURCHASES_QUERY = <<~QUERY
       query appPurchases($endCursor: String) {
         currentAppInstallation {
           oneTimePurchases(first: 250, sortKey: CREATED_AT, after: $endCursor) {
@@ -201,7 +203,7 @@ module ShopifyApp
       }
     QUERY
 
-    RECURRING_PURCHASE_MUTATION = <<~'QUERY'
+    RECURRING_PURCHASE_MUTATION = <<~QUERY
       mutation createPaymentMutation(
         $name: String!
         $lineItems: [AppSubscriptionLineItemInput!]!
@@ -222,7 +224,7 @@ module ShopifyApp
       }
     QUERY
 
-    ONE_TIME_PURCHASE_MUTATION = <<~'QUERY'
+    ONE_TIME_PURCHASE_MUTATION = <<~QUERY
       mutation createPaymentMutation(
         $name: String!
         $price: MoneyInput!

data/lib/shopify_app/controller_concerns/login_protection.rb

@@ -30,7 +30,8 @@ module ShopifyApp
         return redirect_to_login
       end
 
-      unless ShopifyApp.configuration.user_access_scopes_strategy.covers_scopes?(current_shopify_session)
+      if ShopifyApp.configuration.reauth_on_access_scope_changes &&
+          !ShopifyApp.configuration.user_access_scopes_strategy.covers_scopes?(current_shopify_session)
         clear_shopify_session
         return redirect_to_login
       end
@@ -204,8 +205,11 @@ module ShopifyApp
       if ShopifyApp.configuration.embedded_app?
         raise ::ShopifyApp::ShopifyDomainNotFound if current_shopify_domain.nil?
 
-        render("shopify_app/shared/redirect", layout: false,
-          locals: { url: url, current_shopify_domain: current_shopify_domain })
+        render(
+          "shopify_app/shared/redirect",
+          layout: false,
+          locals: { url: url, current_shopify_domain: current_shopify_domain },
+        )
       else
         redirect_to(url)
       end

data/lib/shopify_app/engine.rb

@@ -17,9 +17,14 @@ module ShopifyApp
     isolate_namespace ShopifyApp
 
     initializer "shopify_app.assets.precompile" do |app|
-      app.config.assets.precompile += ["shopify_app/redirect.js", "shopify_app/post_redirect.js",
-                                       "shopify_app/top_level.js", "shopify_app/enable_cookies.js",
-                                       "shopify_app/request_storage_access.js", "storage_access.svg",]
+      app.config.assets.precompile += [
+        "shopify_app/redirect.js",
+        "shopify_app/post_redirect.js",
+        "shopify_app/top_level.js",
+        "shopify_app/enable_cookies.js",
+        "shopify_app/request_storage_access.js",
+        "storage_access.svg",
+      ]
     end
 
     initializer "shopify_app.middleware" do |app|

data/lib/shopify_app/managers/webhooks_manager.rb

@@ -24,10 +24,8 @@ module ShopifyApp
         destroy_webhooks(session: session)
         return unless ShopifyApp.configuration.has_webhooks?
 
-        add_registrations
-
         ShopifyApp::Logger.debug("Recreating webhooks")
-        ShopifyAPI::Webhooks::Registry.register_all(session: session)
+        add_registrations
       end
 
       def destroy_webhooks(session:)
@@ -80,8 +78,10 @@ module ShopifyApp
       def webhook_job_klass_name(path)
         job_file_name = Pathname(path.to_s).basename
 
-        [ShopifyApp.configuration.webhook_jobs_namespace,
-         "#{job_file_name}_job",].compact.join("/").classify
+        [
+          ShopifyApp.configuration.webhook_jobs_namespace,
+          "#{job_file_name}_job",
+        ].compact.join("/").classify
       end
     end
   end

data/lib/shopify_app/session/session_repository.rb

@@ -2,8 +2,6 @@
 
 module ShopifyApp
   class SessionRepository
-    extend ShopifyAPI::Auth::SessionStorage
-
     class << self
       attr_writer :shop_storage
 
@@ -34,8 +32,10 @@ module ShopifyApp
       end
 
       def shop_storage
-        load_shop_storage || raise(::ShopifyApp::ConfigurationError,
-          "ShopifySessionRepository.shop_storage is not configured!")
+        load_shop_storage || raise(
+          ::ShopifyApp::ConfigurationError,
+          "ShopifySessionRepository.shop_storage is not configured!",
+        )
       end
 
       def user_storage

data/lib/shopify_app/session/session_storage.rb

@@ -10,8 +10,8 @@ module ShopifyApp
     end
 
     def with_shopify_session(&block)
-      ShopifyAPI::Auth::Session.temp(shop: shopify_domain, access_token: shopify_token) do
-        yield block
+      ShopifyAPI::Auth::Session.temp(shop: shopify_domain, access_token: shopify_token) do |session|
+        block.call(session)
       end
     end
   end

data/lib/shopify_app/utils.rb

@@ -18,10 +18,10 @@ module ShopifyApp
           no_shop_name_in_subdomain = uri.host == trusted_domain
           from_trusted_domain = trusted_domain == uri.domain
 
+          return myshopify_domain_from_unified_admin(uri) if unified_admin?(uri) && from_trusted_domain
           return nil if no_shop_name_in_subdomain || uri.host&.empty?
           return uri.host if from_trusted_domain
         end
-
         nil
       end
 
@@ -65,6 +65,16 @@ module ShopifyApp
       rescue Addressable::URI::InvalidURIError
         nil
       end
+
+      def unified_admin?(uri)
+        uri.host.split(".").first == "admin"
+      end
+
+      def myshopify_domain_from_unified_admin(uri)
+        shop = uri.path.split("/").last
+
+        "#{shop}.myshopify.com"
+      end
     end
   end
 end

data/lib/shopify_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShopifyApp
-  VERSION = "21.4.0"
+  VERSION = "21.5.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "21.4.0",
+  "version": "21.4.1",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",

data/service.yml

@@ -1,3 +1 @@
 audience: partner
-slack_channels:
-- shopify_app_gem

data/shopify_app.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("jwt", ">= 2.2.3")
   s.add_runtime_dependency("rails", "> 5.2.1")
   s.add_runtime_dependency("redirect_safely", "~> 1.0")
-  s.add_runtime_dependency("shopify_api", "~> 12.4")
+  s.add_runtime_dependency("shopify_api", "~> 13.0")
   s.add_runtime_dependency("sprockets-rails", ">= 2.0.0")
 
   s.add_development_dependency("byebug")

data/translation.yml

@@ -1,5 +1,6 @@
 source_language: en
 target_languages: [cs, da, de, es, fi, fr, it, ja, ko, nb, nl, pl, pt-BR, pt-PT, sv, th, tr, vi, zh-CN, zh-TW]
+async_pr_mode: per_pr
 components:
   - name: 'merchant'
     paths:

data/yarn.lock

@@ -2070,9 +2070,9 @@ decamelize@^1.2.0:
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 deep-eql@^3.0.1:
   version "3.0.1"
@@ -3171,9 +3171,9 @@ json-schema-traverse@^0.4.1:
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -3317,9 +3317,9 @@ loader-runner@^2.4.0:
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
 loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -3515,9 +3515,9 @@ minimatch@3.0.4, minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -4730,9 +4730,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 21.4.0
+  version: 21.5.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.4'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: This gem is used to get quickly started with the Shopify API