Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Validate store sessions #1612

Merged
merged 8 commits into from
Dec 14, 2022
Merged

Validate store sessions #1612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9287e15
Check shop offline session is still valid when embedded
nelsonwittwer Dec 13, 2022
04a2f53
only redirect on 401 and use better naming
nelsonwittwer Dec 13, 2022
a7e2677
use guard clause instead of conditional filter
nelsonwittwer Dec 13, 2022
7fa7cab
redirect to shop_login if token failed
nelsonwittwer Dec 14, 2022
e13f5a4
update tests to match expected behavior
nelsonwittwer Dec 14, 2022
debe184
Changelog updates
nelsonwittwer Dec 14, 2022
29199b1
raise error if not 401
nelsonwittwer Dec 14, 2022
7f88b9f
better redirect test
nelsonwittwer Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/controllers/concerns/shopify_app/ensure_installed.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module EnsureInstalled

before_action :check_shop_domain
before_action :check_shop_known
before_action :validate_emebedded_session_is_active, if: :embedded_param?
nelsonwittwer marked this conversation as resolved.
Show resolved Hide resolved
end

def current_shopify_domain
Expand All @@ -30,6 +31,10 @@ def current_shopify_domain
@shopify_domain
end

def installed_shop_session
@installed_shop_session ||= @shop
end

private

def check_shop_domain
Expand Down Expand Up @@ -58,5 +63,12 @@ def shop_login

url.to_s
end

def validate_emebedded_session_is_active
client = ShopifyAPI::Clients::Rest::Admin.new(session: installed_shop_session)
client.get(path: "shop")
rescue ShopifyAPI::Errors::HttpResponseError
nelsonwittwer marked this conversation as resolved.
Show resolved Hide resolved
redirect_for_embedded
end
end
end
22 changes: 22 additions & 0 deletions test/controllers/concerns/ensure_installed_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,26 @@ def index

assert_within_deprecation_schedule(version)
end

test "redirects to redirect_for_embedded if app is no longer installed according to the API but not the session repository" do
session = mock
ShopifyApp::SessionRepository.stubs(:retrieve_shop_session_by_shopify_domain).returns(session)

client = mock
ShopifyAPI::Clients::Rest::Admin.expects(:new).with(session: session).returns(client)
uninstalled_http_error = ShopifyAPI::Errors::HttpResponseError.new(
response: ShopifyAPI::Clients::HttpResponse.new(
code: 404,
headers: {},
body: "Invalid API key or access token (unrecognized login or wrong password)",
),
)
client.expects(:get).with(path: "shop").raises(uninstalled_http_error)

embedded_redirect_url = "reverse_card_on_reverse_card.embedded.joke"
ShopifyApp.configuration.stubs(:embedded_redirect_url).returns(embedded_redirect_url)

@controller.expects(:redirect_for_embedded)
get :index, params: { shop: "shop1.myshopify.com", embedded: "1" }
end
end