Return Google Maps API key + canarydrop from new history endpoint

thinkst · May 16, 2024 · f0e5d40 · f0e5d40
1 parent 7ed0d04
commit f0e5d40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/canarytokens/models.py b/canarytokens/models.py
@@ -2544,3 +2544,9 @@ class ManageResponse(BaseModel):
     wg_qr_code: Optional[str]
     qr_code: Optional[str]
     force_https: Optional[bool]
+
+
+class HistoryResponse(BaseModel):
+    canarydrop: Dict
+    history: AnyTokenHistory
+    google_api_key: Optional[str]
diff --git a/frontend/app.py b/frontend/app.py
@@ -43,7 +43,6 @@
 from canarytokens.models import (
     AnyDownloadRequest,
     AnySettingsRequest,
-    AnyTokenHistory,
     AnyTokenRequest,
     AnyTokenResponse,
     AWSKeyTokenRequest,
@@ -98,6 +97,7 @@
     DownloadZipResponse,
     FastRedirectTokenRequest,
     FastRedirectTokenResponse,
+    HistoryResponse,
     KubeconfigTokenRequest,
     KubeconfigTokenResponse,
     Log4ShellTokenRequest,
@@ -780,11 +780,16 @@ async def api_manage_canarytoken(token: str, auth: str) -> ManageResponse:
 @api.get(
     "/history",
     tags=["Canarytokens History"],
-    response_model=AnyTokenHistory,
+    response_model=HistoryResponse,
 )
 async def api_history(token: str, auth: str) -> JSONResponse:
     canarydrop = get_canarydrop_and_authenticate(token=token, auth=auth)
-    return canarydrop.triggered_details
+    response = {
+        "canarydrop": canarydrop,
+        "history": canarydrop.triggered_details,
+        "google_api_key": queries.get_canary_google_api_key(),
+    }
+    return HistoryResponse(**response)
 
 
 @api.post(