feat: enhance OAuth login flow and improve error handling

app/__init__.py

@@ -1,11 +1,10 @@
 from typing import Optional
 
+from flask import Flask, flash, redirect, url_for
 from flask_dance.consumer import oauth_authorized, oauth_error
 from flask_dance.contrib.discord import make_discord_blueprint
 from flask_dance.contrib.google import make_google_blueprint
-from flask import Flask, flash, redirect, url_for
-from flask_login import login_user
-import requests
+from flask_login import current_user, login_user
 
 from .extensions import db, login_manager, migrate
 from .models import OAuth, User
@@ -36,14 +35,16 @@ def create_app():
             "https://www.googleapis.com/auth/userinfo.email",
             "openid",
         ],
+        redirect_url="/login/google/authorized",
+        reprompt_consent=True,
     )
     app.register_blueprint(google_bp, url_prefix="/login")
 
     discord_bp = make_discord_blueprint(
-        client_secret=app.config["DISCORD_CLIENT_SECRET"],
-        scope=["identify", "email", "guilds.join"],
         client_id=app.config["DISCORD_CLIENT_ID"],
-        prompt="consent",
+        client_secret=app.config["DISCORD_CLIENT_SECRET"],
+        scope=["identify", "email"],
+        redirect_url="/login/discord/authorized",
     )
     app.register_blueprint(discord_bp, url_prefix="/login")
 
@@ -56,21 +57,41 @@ def create_app():
     ):
         if not email:
             flash(
-                f"{provider_name.title()} Account Must Include A Public Email.", "error"
+                f"{provider_name.title()} Account Must Contain A Public Email.", "error"
             )
             return False
 
+        if current_user.is_authenticated:
+            user = current_user
+            oauth = OAuth.query.filter_by(
+                provider=provider_name, provider_user_id=provider_user_id
+            ).first()
+
+            if not oauth:
+                oauth = OAuth(
+                    provider=provider_name,
+                    provider_user_id=provider_user_id,
+                    token=token,
+                    user_id=user.id,
+                )
+                db.session.add(oauth)
+            else:
+                oauth.token = token
+
+            db.session.commit()
+            flash(f"{provider_name.title()} Account Linked!", "success")
+            return redirect(url_for("main.settings"))
+
         oauth = OAuth.query.filter_by(
-            provider_user_id=provider_user_id,
             provider=provider_name,
-        ).one_or_none()
+            provider_user_id=provider_user_id,
+        ).first()
 
         if oauth:
             user = oauth.user
             oauth.token = token
         else:
-            user = User.query.filter_by(email=email).one_or_none()
-
+            user = User.query.filter_by(email=email).first()
             if not user:
                 user = User(name=name or email.split("@")[0], email=email)
                 db.session.add(user)
@@ -82,61 +103,40 @@ def create_app():
                 token=token,
                 user=user,
             )
-
             db.session.add(oauth)
 
         db.session.commit()
 
         login_user(user)
-
         flash(f"Signed In With {provider_name.title()}", "success")
         return redirect(url_for("main.index"))
 
-    def _join_discord_guild(discord_user_id: str, access_token: str):
-        bot_token = app.config.get("DISCORD_BOT_TOKEN")
-        guild_id = app.config.get("DISCORD_GUILD_ID")
-
-        if not guild_id or not bot_token:
-            return
-
-        url = f"https://discord.com/api/v10/guilds/{guild_id}/members/{discord_user_id}"
-        headers = {"Authorization": f"Bot {bot_token}"}
-        payload = {"access_token": access_token}
-
-        try:
-            response = requests.put(url, headers=headers, json=payload, timeout=10)
-
-        except requests.RequestException as exc:
-            app.logger.warning("Failed To Add User To Discord Guild: %s", exc)
-            return
-
-        if response.status_code not in (200, 201, 204):
-            app.logger.warning(
-                "Discord Guild Join Failed (%s): %s",
-                response.status_code,
-                response.text,
-            )
-
     @oauth_authorized.connect_via(google_bp)
     def google_logged_in(blueprint, token):
         if not token:
-            flash("Google Authentication Failed.", "error")
+            flash("Google Authentication Ffailed.", "error")
             return False
 
         resp = blueprint.session.get("/oauth2/v2/userinfo")
-
         if not resp.ok:
-            flash("Unable To Read Google Profile Information.", "error")
+            flash("Failed To load Google Profile.", "error")
             return False
 
-        google_info = resp.json()
-        google_user_id = str(google_info["id"])
+        info = resp.json()
+        google_user_id = str(info["id"])
+
+        if "refresh_token" in token:
+            existing = OAuth.query.filter_by(
+                provider=blueprint.name, provider_user_id=google_user_id
+            ).first()
+            if existing:
+                existing.token["refresh_token"] = token["refresh_token"]
 
         return _finish_login(
-            provider_user_id=google_user_id,
-            email=google_info.get("email"),
             provider_name=blueprint.name,
-            name=google_info.get("name"),
+            provider_user_id=google_user_id,
+            email=info.get("email"),
+            name=info.get("name"),
             token=token,
         )
 
@@ -148,31 +148,27 @@ def create_app():
 
         resp = blueprint.session.get("/api/users/@me")
         if not resp.ok:
-            flash("Unable To Read Discord Profile Information.", "error")
+            flash("Failed To Load Discord Profile.", "error")
             return False
 
-        discord_info = resp.json()
-        discord_user_id = str(discord_info["id"])
+        info = resp.json()
+        discord_user_id = str(info["id"])
 
-        redirect_response = _finish_login(
-            name=discord_info.get("username"),
-            provider_user_id=discord_user_id,
-            email=discord_info.get("email"),
+        response = _finish_login(
             provider_name=blueprint.name,
+            provider_user_id=discord_user_id,
+            email=info.get("email"),
+            name=info.get("username"),
             token=token,
         )
 
-        if redirect_response and token.get("access_token"):
-            _join_discord_guild(discord_user_id, token["access_token"])
-
-        return redirect_response
+        return response
 
     @oauth_error.connect_via(google_bp)
     @oauth_error.connect_via(discord_bp)
     def oauth_error_handler(blueprint, error, error_description=None, error_uri=None):
-        message = f"{blueprint.name.title()} OAuth error: {error_description or error}."
+        message = f"{blueprint.name.title()} OAuth error: {error_description or error}"
         app.logger.error(message)
-
         flash(message, "error")
 
     return app