Skip to content

Fix shopify_login_required() wrapper for Shopify API Version update #1

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

Open
daniel-gomes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix shopify_login_required() wrapper for Shopify API Version update #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions flask_shopify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ def shopify_login_required(func):
"""
@wraps(func)
def decorated_view(*args, **kwargs):
shop_n_token = current_app.shopify.tokengetter_func()
if not shop_n_token:
shop_token = current_app.shopify.tokengetter_func()
if not shop_token:
return redirect(url_for(
current_app.shopify.login_view,
shop=request.args.get('shop'),
next=request.url
))

with shopify.Session.temp(*shop_n_token):
with shopify.Session.temp(*shop_token):
return func(*args, **kwargs)

return decorated_view
Expand Down Expand Up @@ -113,8 +113,8 @@ def before_request(self):
ctx = _request_ctx_stack.top
if shop_token is not None:
# should be a valid token
domain, token = shop_token
shop_session = shopify.Session(domain, self.api_version, token)
domain, api_version, token = shop_token
shop_session = shopify.Session(domain, api_version, token)
shopify.ShopifyResource.activate_session(shop_session)
ctx.request.shopify_session = shop_session
else:
Expand Down Expand Up @@ -144,7 +144,7 @@ def authenticate(self):
shop_session = shopify.Session(request.args['shop'], self.api_version)
token = shop_session.request_token(request.args)
shopify.ShopifyResource.activate_session(shop_session)
self.tokensetter_func(request.args['shop'], token)
self.tokensetter_func(request.args['shop'], self.api_version, token)
return shop_session

def token_getter(self, f):
Expand All @@ -165,16 +165,18 @@ def token_setter(self, f):
@classmethod
def _session_token_getter(cls):
try:
return session['SHOPIFY_SHOP'], session['SHOPIFY_TOKEN']
return session['SHOPIFY_SHOP'], session['SHOPIFY_API_VERSION'], session['SHOPIFY_TOKEN']
except KeyError:
return None

@classmethod
def _session_token_setter(cls, shop, token):
def _session_token_setter(cls, shop, api_version, token):
session['SHOPIFY_SHOP'] = shop
session['SHOPIFY_API_VERSION'] = api_version
session['SHOPIFY_TOKEN'] = token

def logout(self):
session.pop('SHOPIFY_SHOP', None)
session.pop('SHOPIFY_API_VERSION', None)
session.pop('SHOPIFY_TOKEN', None)
shopify.ShopifyResource.clear_session()