Changed session_handing

cps/kobo_auth.py

@@ -102,7 +102,7 @@ def requires_kobo_auth(f):
         auth_token = get_auth_token()
         if auth_token is not None:
             user = (
-                ub.session.query(ub.User)
+                g.ubsession.query(ub.User)
                 .join(ub.RemoteAuthToken)
                 .filter(ub.RemoteAuthToken.auth_token == auth_token).filter(ub.RemoteAuthToken.token_type==1)
                 .first()
@@ -135,7 +135,7 @@ def generate_auth_token(user_id):
         )
     else:
         # Invalidate any prevously generated Kobo Auth token for this user.
-        auth_token = ub.session.query(ub.RemoteAuthToken).filter(
+        auth_token = g.ubsession.query(ub.RemoteAuthToken).filter(
             ub.RemoteAuthToken.user_id == user_id
         ).filter(ub.RemoteAuthToken.token_type==1).first()
 
@@ -146,8 +146,8 @@ def generate_auth_token(user_id):
             auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
             auth_token.token_type = 1
 
-            ub.session.add(auth_token)
-            ub.session.commit()
+            g.ubsession.add(auth_token)
+            g.ubsession.commit()
         return render_title_template(
             "generate_kobo_auth_url.html",
             title=_(u"Kobo Setup"),
@@ -162,7 +162,7 @@ def generate_auth_token(user_id):
 @login_required
 def delete_auth_token(user_id):
     # Invalidate any prevously generated Kobo Auth token for this user.
-    ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
+    g.ubsession.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
         .filter(ub.RemoteAuthToken.token_type==1).delete()
-    ub.session.commit()
+    g.ubsession.commit()
     return ""