Skip to content

Commit 956f892

Browse files
committed
Reapply "Merge pull request #1960 from Shopify/remove-jwt-middleware"
This reverts commit 57bafc0.
1 parent 2788d52 commit 956f892

File tree

7 files changed

+3
-132
lines changed

7 files changed

+3
-132
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Unreleased
22
----------
3+
- ⚠️ [Breaking] Removes `ShopifyApp::JWTMiddleware` and `ShopifyApp::JWT` See [Upgrading](/docs/Upgrading.md) for more migration. [1960](https://github.com/Shopify/shopify_app/pull/1960)
34
- ⚠️ [Breaking] Removed deprecated `CallbackController` methods. `perform_after_authenticate_job`, `install_webhooks`, and `perform_post_authenticate_jobs` have been removed. [#1961](https://github.com/Shopify/shopify_app/pull/1961)
45
- ⚠️ [Breaking] Bumps minimum supported Ruby version to 3.1 [#1959](https://github.com/Shopify/shopify_app/pull/1959)
56
- Adds a `script_tag_manager` that will automatically create script tags when the app is installed. [1948](https://github.com/Shopify/shopify_app/pull/1948)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ PATH
33
specs:
44
shopify_app (22.6.0)
55
addressable (~> 2.7)
6-
jwt (>= 2.2.3)
76
rails (> 5.2.1)
87
redirect_safely (~> 1.0)
98
shopify_api (>= 14.7.0, < 15.0)
@@ -258,6 +257,7 @@ PLATFORMS
258257

259258
DEPENDENCIES
260259
byebug
260+
jwt (>= 2.2.3)
261261
minitest
262262
mocha
263263
pry

lib/shopify_app.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,11 @@ def self.add_csp_directives(policy)
8080
# managers
8181
require "shopify_app/managers/webhooks_manager"
8282
require "shopify_app/managers/script_tags_manager"
83-
# middleware
84-
require "shopify_app/middleware/jwt_middleware"
8583

8684
# session
8785
require "shopify_app/session/in_memory_session_store"
8886
require "shopify_app/session/in_memory_shop_session_store"
8987
require "shopify_app/session/in_memory_user_session_store"
90-
require "shopify_app/session/jwt"
9188
require "shopify_app/session/null_user_session_store"
9289
require "shopify_app/session/session_repository"
9390
require "shopify_app/session/session_storage"

lib/shopify_app/engine.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ class Engine < Rails::Engine
1616
engine_name "shopify_app"
1717
isolate_namespace ShopifyApp
1818

19-
initializer "shopify_app.middleware" do |app|
20-
app.config.middleware.insert_after(::Rack::Runtime, ShopifyApp::JWTMiddleware)
21-
end
22-
2319
initializer "shopify_app.assets.precompile" do |app|
2420
app.config.assets.precompile += [
2521
"shopify_app/redirect.js",

lib/shopify_app/middleware/jwt_middleware.rb

Lines changed: 0 additions & 48 deletions
This file was deleted.

lib/shopify_app/session/jwt.rb

Lines changed: 0 additions & 73 deletions
This file was deleted.

shopify_app.gemspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
1818
s.add_runtime_dependency("rails", "> 5.2.1")
1919
s.add_runtime_dependency("redirect_safely", "~> 1.0")
2020
s.add_runtime_dependency("shopify_api", ">= 14.7.0", "< 15.0")
21-
# Deprecated: move to development dependencies when releasing v23
22-
s.add_runtime_dependency("jwt", ">= 2.2.3")
23-
2421
s.add_development_dependency("byebug")
22+
s.add_development_dependency("jwt", ">= 2.2.3")
2523
s.add_development_dependency("minitest")
2624
s.add_development_dependency("mocha")
2725
s.add_development_dependency("pry")

0 commit comments

Comments
 (0)