small cleanups

Author: Tim Anema

home/views.py

@@ -4,8 +4,6 @@
 
 @shop_login_required
 def index(request):
-    page_data = {
-        'products': shopify.Product.find(limit=3),
-        'orders': shopify.Order.find(limit=3, order="created_at DESC"),
-    }
-    return render(request, 'home/index.html', page_data)
+    products = shopify.Product.find(limit=3)
+    orders = shopify.Order.find(limit=3, order="created_at DESC")
+    return render(request, 'home/index.html', {'products': products, 'orders': orders})

shopify_app/views.py

@@ -6,16 +6,6 @@
 import hmac, base64, hashlib, binascii, os
 import shopify
 
-def _return_address(request):
-    return request.session.get('return_to') or reverse('root_path')
-
-def _shop(request):
-    shop_url = request.GET.get('shop', request.POST.get('shop'))
-    if not shop_url:
-        messages.error(request, "A shop param is required")
-        return redirect(reverse(login))
-    return shop_url.strip()
-
 def _new_session(shop_url):
     api_version = apps.get_app_config('shopify_app').SHOPIFY_API_VERSION
     return shopify.Session(shop_url, api_version)
@@ -29,7 +19,10 @@ def login(request):
     return render(request, 'shopify_app/login.html', {})
 
 def authenticate(request):
-    shop_url = _shop(request)
+    shop_url = request.GET.get('shop', request.POST.get('shop')).strip()
+    if not shop_url:
+        messages.error(request, "A shop param is required")
+        return redirect(reverse(login))
     scope = apps.get_app_config('shopify_app').SHOPIFY_API_SCOPE
     redirect_uri = request.build_absolute_uri(reverse(finalize))
     state = binascii.b2a_hex(os.urandom(15)).decode("utf-8")
@@ -58,7 +51,7 @@ def finalize(request):
         return redirect(reverse(login))
 
     try:
-        shop_url = _shop(request)
+        shop_url = params['shop']
         session = _new_session(shop_url)
         request.session['shopify'] = {
             "shop_url": shop_url,
@@ -69,7 +62,7 @@ def finalize(request):
         return redirect(reverse(login))
     messages.info(request, "Logged in to shopify store.")
     request.session.pop('return_to', None)
-    return redirect(_return_address(request))
+    return redirect(request.session.get('return_to', reverse('root_path')))
 
 def logout(request):
     request.session.pop('shopify', None)