From 06ba2b9c1a5488b16d78518885115f7a8da5884f Mon Sep 17 00:00:00 2001
From: Hemalatha <khema2010@gmail.com>
Date: Sat, 15 Apr 2017 01:29:11 -0700
Subject: [PATCH] fix: value error for JSON decode in fbconnect

---
 project.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/project.py b/project.py
index e00b465..89ad726 100644
--- a/project.py
+++ b/project.py
@@ -11,8 +11,7 @@
 from flask import make_response
 import requests
 from functools import wraps
-from flask import Flask, render_template, request, redirect, jsonify, url_for,
-flash
+from flask import Flask, render_template, request, redirect, jsonify, url_for, flash
 
 app = Flask(__name__)
 
@@ -218,11 +217,11 @@ def fbconnect():
         'web']['app_id']
     app_secret = json.loads(
         open('fb_client_secrets.json', 'r').read())['web']['app_secret']
-    url = 'https://graph.facebook.com/v2.8/oauth/access_token?grant_type= '\
-        'fb_exchange_token&client_id=%s&client_secret=%s&fb_exchange_token '\
+    url = 'https://graph.facebook.com/v2.8/oauth/access_token?grant_type=' \
+        'fb_exchange_token&client_id=%s&client_secret=%s&fb_exchange_token' \
         '=%s' % (app_id, app_secret, access_token)
     h = httplib2.Http()
-    result = h.request(url, 'GET')[1]
+    result = h.request(url, 'GET')[1].decode("utf8")
 
     # Use token to get user info from API
     # userinfo_url = "https://graph.facebook.com/v2.4/me"
@@ -234,7 +233,7 @@ def fbconnect():
 
     url = 'https://graph.facebook.com/v2.8/me?%s&fields=name,id,email' % token
     h = httplib2.Http()
-    result = h.request(url, 'GET')[1]
+    result = h.request(url, 'GET')[1].decode("utf8")
     # print "url sent for API access:%s"% url
     # print "API JSON result: %s" % result
     data = json.loads(result)
@@ -244,7 +243,7 @@ def fbconnect():
     login_session['facebook_id'] = data["id"]
 
     # The token must be stored in the login_session in order to properly \
-    logout, let's strip out the information before the equals sign in our token
+    # logout, let's strip out the information before the equals sign in our token
     stored_token = token.split("=")[1]
     login_session['access_token'] = stored_token
 
@@ -252,7 +251,7 @@ def fbconnect():
     url = 'https://graph.facebook.com/v2.4/me/picture?%s&redirect=0&' \
           'height=200&width=200' % token
     h = httplib2.Http()
-    result = h.request(url, 'GET')[1]
+    result = h.request(url, 'GET')[1].decode("utf8")
     data = json.loads(result)
 
     login_session['picture'] = data["data"]["url"]
@@ -285,7 +284,7 @@ def fbdisconnect():
     url = 'https://graph.facebook.com/%s/permissions?access_token=%s' \
           % (facebook_id, access_token)
     h = httplib2.Http()
-    result = h.request(url, 'DELETE')[1]
+    result = h.request(url, 'DELETE')[1].decode("utf8")
     # Reset the user's sesson.
     del login_session['access_token']
     del login_session['user_id']
@@ -398,8 +397,7 @@ def showMenu(restaurant_id):
     creator = getUserInfo(restaurant.user_id)
     items = session.query(MenuItem).filter_by(
         restaurant_id=restaurant_id).all()
-    if 'username' not in login_session or
-    creator.id != login_session.get('user_id'):
+    if 'username' not in login_session or creator.id != login_session.get('user_id'):
         return render_template('publicmenu.html', items=items,
                                restaurant=restaurant, creator=creator)
     else: