Merge pull request #211 from nsidc/issue-178-login-redirect

Attempt to fix login redirect behaviors

usaon_benefit_tool/__init__.py

@@ -78,8 +78,7 @@ def before_request():
             if time.time() >= token['expires_at']:
                 del s['google_oauth_token']
 
-    from usaon_benefit_tool.routes.google import google_bp
-    from usaon_benefit_tool.routes.login import login_bp
+    from usaon_benefit_tool.routes.login import google_bp, login_bp
     from usaon_benefit_tool.routes.logout import logout_bp
     from usaon_benefit_tool.routes.response import response_bp
     from usaon_benefit_tool.routes.response.applications import application_bp

usaon_benefit_tool/routes/login.py

@@ -1,30 +1,34 @@
+import os
+
 from flask import Blueprint, redirect, url_for
-from flask_dance.contrib.google import google
+from flask_dance.consumer import oauth_authorized
+from flask_dance.contrib.google import google, make_google_blueprint
 from flask_login import login_user
 
 from usaon_benefit_tool.util.db.user import ensure_user_exists
 
 login_bp = Blueprint('login', __name__, url_prefix='/login')
+google_bp = make_google_blueprint(
+    client_id=os.getenv('USAON_BENEFIT_TOOL_GOOGLE_CLIENT_ID'),
+    client_secret=os.getenv('USAON_BENEFIT_TOOL_GOOGLE_CLIENT_SECRET'),
+    scope=["profile", "email"],
+)
 
 
 @login_bp.route("")
 def login():
     if not google.authorized:
         return redirect(url_for("google.login"))
-    resp = google.get("/oauth2/v2/userinfo")
-    assert resp.ok, resp.text
-
-    user = ensure_user_exists(resp.json())
-    login_user(user)
 
     return redirect(url_for('root.root'))
 
 
-# this may be the login issue
-# @app.before_request
-# def before_request():
-#     """Handle expired google tokens as a pre-request hook."""
-#     if token := (s := session).get('google_oauth_token'):
-#         print("Token expiring in", token['expires_at'] - time.time())
-#         if time.time() >= token['expires_at']:
-#             del s['google_oauth_token']
+@oauth_authorized.connect_via(google_bp)
+def google_logged_in(blueprint):
+    # TODO: Flash a message?
+    account_data = blueprint.session.get("/oauth2/v2/userinfo")
+
+    user = ensure_user_exists(account_data.json())
+    login_user(user)
+
+    return redirect(url_for('root.root'))