diff --git a/cfg/sample/config.json b/cfg/sample/config.json
index 49a1cca..bd11c42 100644
--- a/cfg/sample/config.json
+++ b/cfg/sample/config.json
@@ -11,5 +11,6 @@
},
"auth": {
"enabled": false
- }
+ },
+ "veins": []
}
diff --git a/soleprint/artery/veins/google/api/routes.py b/soleprint/artery/veins/google/api/routes.py
index 4439669..f54446f 100644
--- a/soleprint/artery/veins/google/api/routes.py
+++ b/soleprint/artery/veins/google/api/routes.py
@@ -135,9 +135,25 @@ async def oauth_callback(
if not code:
raise HTTPException(400, "Missing authorization code")
+ # Extract redirect URL from state if present
+ # Format: "csrf_state|redirect_url" OR just "redirect_url" if no csrf state
+ redirect_url = None
+ if state:
+ if "|" in state:
+ parts = state.split("|", 1)
+ redirect_url = parts[1] if len(parts) > 1 else None
+ elif state.startswith("http"):
+ # No csrf state, just the redirect URL
+ redirect_url = state
+
try:
tokens = oauth_client.exchange_code_for_tokens(code)
token_storage.save_tokens(DEFAULT_USER_ID, tokens)
+
+ # Redirect back to original page if specified
+ if redirect_url:
+ return RedirectResponse(url=redirect_url)
+
return {
"status": "ok",
"message": "Successfully authenticated with Google",
@@ -164,6 +180,32 @@ async def get_userinfo(
raise HTTPException(400, f"Failed to get user info: {e}")
+@router.get("/oauth/status")
+async def oauth_status():
+ """Check if user is authenticated (for sidebar)."""
+ try:
+ tokens = token_storage.load_tokens(DEFAULT_USER_ID)
+ if not tokens:
+ return {"authenticated": False}
+
+ # Check if expired
+ if token_storage.is_expired(tokens):
+ if "refresh_token" not in tokens:
+ return {"authenticated": False}
+ try:
+ new_tokens = oauth_client.refresh_access_token(tokens["refresh_token"])
+ token_storage.save_tokens(DEFAULT_USER_ID, new_tokens)
+ except Exception:
+ return {"authenticated": False}
+
+ return {
+ "authenticated": True,
+ "user": {"email": f"{DEFAULT_USER_ID}@authenticated"},
+ }
+ except Exception:
+ return {"authenticated": False}
+
+
@router.get("/oauth/logout")
async def logout():
"""Clear stored tokens."""
diff --git a/soleprint/index.html b/soleprint/index.html
index 1ec3f92..1fffd99 100644
--- a/soleprint/index.html
+++ b/soleprint/index.html
@@ -215,56 +215,12 @@
color: #666;
}
+ {% if managed %}
+
+
+ {% endif %}