Fix revoke subscription hang caused by blocking SMTP email send.

Revocation completes instantly now with background email notifications, plus modal loading state and clearer validation feedback in SuperAdmin.

app/services/superadmin_service.py

@@ -9,6 +9,7 @@ RULE: All revocations MUST update Redis revocation blacklist immediately.
 from datetime import datetime, timedelta, timezone
 from typing import Literal
 
+import asyncio
 import structlog
 from redis.asyncio import Redis
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -63,6 +64,23 @@ class SuperAdminService:
         self._audit = AuditRepository(db)
         self._email = EmailService()
 
+    async def _notify_email_async(self, send_fn, *args, **kwargs) -> None:
+        """Fire-and-forget email — never block API responses on SMTP."""
+        if not cfg.SMTP_USERNAME or not cfg.SMTP_PASSWORD:
+            logger.debug("SMTP not configured — skipping email notification")
+            return
+
+        async def _worker() -> None:
+            try:
+                await asyncio.wait_for(
+                    asyncio.to_thread(send_fn, *args, **kwargs),
+                    timeout=5.0,
+                )
+            except Exception as e:
+                logger.warning("Email notification failed", error=str(e))
+
+        asyncio.create_task(_worker())
+
     async def suspend_author(
         self, actor: User, author_id: str, reason: str = ""
     ) -> None:
@@ -183,16 +201,14 @@ class SuperAdminService:
             details={"plan": plan, "expires_at": expires_at.isoformat(), "token_budget": token_budget},
         )
 
-        # Notify author by email
-        try:
-            self._email.send_subscription_granted(
-                to=author.email,
-                name=author.full_name or author.email,
-                plan=plan.replace("_", " ").title(),
-                expires_at=expires_at.strftime("%B %d, %Y"),
-            )
-        except Exception as e:
-            logger.warning("Failed to send access granted email", error=str(e))
+        # Notify author by email (non-blocking)
+        await self._notify_email_async(
+            self._email.send_subscription_granted,
+            to=author.email,
+            name=author.full_name or author.email,
+            plan=plan.replace("_", " ").title(),
+            expires_at=expires_at.strftime("%B %d, %Y"),
+        )
 
         logger.info("Access granted", author_id=author_id, plan=plan, grant_id=grant_id)
         return {
@@ -257,17 +273,15 @@ class SuperAdminService:
             details={"reason": reason, "author_id": access.author_id},
         )
 
-        # Notify author
+        # Notify author (non-blocking — revocation is already effective)
         author = await self._user_repo.get_by_id(access.author_id)
         if author:
-            try:
-                self._email.send_subscription_revoked(
-                    to=author.email,
-                    name=author.full_name or author.email,
-                    reason=reason,
-                )
-            except Exception as e:
-                logger.warning("Failed to send revocation email", error=str(e))
+            await self._notify_email_async(
+                self._email.send_subscription_revoked,
+                to=author.email,
+                name=author.full_name or author.email,
+                reason=reason,
+            )
 
         logger.info("Access revoked", grant_id=grant_id, reason=reason)
 

app/superadmin/router.py

@@ -253,6 +253,8 @@ async def revoke_access(
             actor=superadmin, grant_id=grant_id, reason=payload.reason,
         )
         return {"message": "Access revoked"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
     except Exception as e:
         return _err(e, "revoke_access")
 

app/superadmin/templates/superadmin.html

@@ -302,7 +302,7 @@
     </div>
 
     <!-- TOKEN ACTION MODAL -->
-    <div id="token-modal" style="display:none;position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:none;align-items:center;justify-content:center;">
+    <div id="token-modal" style="display:none;position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;align-items:center;justify-content:center;">
       <div style="background:var(--white);border-radius:var(--radius);padding:32px;width:100%;max-width:460px;box-shadow:var(--shadow-lg);animation:scaleIn 0.2s ease;">
         <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:20px;">
           <h2 style="font-size:18px;font-weight:700;" id="modal-title">Action</h2>
@@ -706,10 +706,26 @@ function openTokenModal(title, body, onConfirm, confirmLabel = 'Confirm', confir
   document.getElementById('modal-title').textContent = title;
   document.getElementById('modal-body').innerHTML = body;
   const acts = document.getElementById('modal-actions');
-  acts.innerHTML = `<button class="btn btn-secondary" onclick="closeTokenModal()">Cancel</button><button class="btn ${confirmClass}" id="modal-confirm-btn">${confirmLabel}</button>`;
-  document.getElementById('modal-confirm-btn').onclick = onConfirm;
-  const modal = document.getElementById('token-modal');
-  modal.style.display = 'flex';
+  acts.innerHTML = `<button class="btn btn-secondary" id="modal-cancel-btn">Cancel</button><button class="btn ${confirmClass}" id="modal-confirm-btn">${confirmLabel}</button>`;
+  document.getElementById('modal-cancel-btn').onclick = closeTokenModal;
+  document.getElementById('modal-confirm-btn').onclick = async () => {
+    const btn = document.getElementById('modal-confirm-btn');
+    const cancelBtn = document.getElementById('modal-cancel-btn');
+    const original = btn.textContent;
+    btn.disabled = true;
+    cancelBtn.disabled = true;
+    btn.textContent = '⏳ Working...';
+    try {
+      await onConfirm();
+    } catch (e) {
+      toast(e.message || 'Action failed', 'error');
+    } finally {
+      btn.disabled = false;
+      cancelBtn.disabled = false;
+      btn.textContent = original;
+    }
+  };
+  document.getElementById('token-modal').style.display = 'flex';
 }
 function openExtendModal(grantId, email) {
   openTokenModal('Extend Subscription',
@@ -718,11 +734,9 @@ function openExtendModal(grantId, email) {
      <div style="font-size:12px;color:var(--muted);margin-top:8px;">💡 If the subscription has expired, it will be extended from today.</div>`,
     async () => {
       const days = parseInt(document.getElementById('tm-extend-days').value) || 30;
-      try {
-        await apiPost(`/super/grants/${grantId}/extend`, { extend_days: days });
-        toast(`Extended by ${days} days ✅`, 'success');
-        closeTokenModal(); loadTokenManagement(); loadSubscriptions();
-      } catch(e) { toast(e.message, 'error'); }
+      await apiPost(`/super/grants/${grantId}/extend`, { extend_days: days });
+      toast(`Extended by ${days} days ✅`, 'success');
+      closeTokenModal(); loadTokenManagement(); loadSubscriptions();
     }, '📅 Extend Subscription'
   );
 }
@@ -733,11 +747,9 @@ function openBonusModal(grantId, email) {
      <div style="font-size:12px;color:var(--muted);margin-top:8px;">💡 Bonus tokens add to the existing budget without changing expiry.</div>`,
     async () => {
       const tokens = parseInt(document.getElementById('tm-bonus-tokens').value) || 100000;
-      try {
-        await apiPost(`/super/grants/${grantId}/bonus-tokens`, { bonus_tokens: tokens });
-        toast(`${tokens.toLocaleString()} bonus tokens added ✅`, 'success');
-        closeTokenModal(); loadTokenManagement();
-      } catch(e) { toast(e.message, 'error'); }
+      await apiPost(`/super/grants/${grantId}/bonus-tokens`, { bonus_tokens: tokens });
+      toast(`${tokens.toLocaleString()} bonus tokens added ✅`, 'success');
+      closeTokenModal(); loadTokenManagement();
     }, '⚡ Add Bonus Tokens'
   );
 }
@@ -746,11 +758,9 @@ function openResetModal(grantId, email) {
     `<div style="margin-bottom:14px;font-size:13px;color:var(--muted);">Author: <strong>${esc(email)}</strong></div>
      <div style="background:var(--yellow-bg);border:1px solid var(--yellow);border-radius:8px;padding:12px;font-size:13px;color:var(--text2);">⚠️ This will set <strong>tokens_used back to 0</strong> and clear any bonus tokens. The author gets a fresh token budget for the same subscription period.</div>`,
     async () => {
-      try {
-        await apiPost(`/super/grants/${grantId}/reset-tokens`, {});
-        toast('Token usage reset to 0 ✅', 'success');
-        closeTokenModal(); loadTokenManagement();
-      } catch(e) { toast(e.message, 'error'); }
+      await apiPost(`/super/grants/${grantId}/reset-tokens`, {});
+      toast('Token usage reset to 0 ✅', 'success');
+      closeTokenModal(); loadTokenManagement();
     }, '🔄 Reset Usage', 'btn-secondary'
   );
 }
@@ -762,11 +772,10 @@ function openRevokeModal(grantId, email) {
     async () => {
       const reason = document.getElementById('tm-revoke-reason').value.trim();
       if (!reason) { toast('Please enter a reason', 'error'); return; }
-      try {
-        await apiPost(`/super/grants/${grantId}/revoke`, { reason });
-        toast('Subscription revoked ✅', 'success');
-        closeTokenModal(); loadTokenManagement(); loadSubscriptions();
-      } catch(e) { toast(e.message, 'error'); }
+      if (reason.length < 5) { toast('Reason must be at least 5 characters', 'error'); return; }
+      await apiPost(`/super/grants/${grantId}/revoke`, { reason });
+      toast('Subscription revoked ✅', 'success');
+      closeTokenModal(); loadTokenManagement(); loadSubscriptions();
     }, '🚫 Revoke Now', 'btn-danger'
   );
 }