Header for web3 application id usage naming

Author: kompotkot

brood/middleware.py

@@ -1,7 +1,7 @@
 import base64
 import json
 import logging
-from typing import cast, Optional
+from typing import Optional, cast
 from uuid import UUID
 
 from fastapi import Depends, HTTPException, Request
@@ -20,7 +20,7 @@
 from .settings import (
     BOT_INSTALLATION_TOKEN,
     BOT_INSTALLATION_TOKEN_HEADER,
-    BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER,
+    BUGOUT_APPLICATION_ID_HEADER,
 )
 
 logger = logging.getLogger(__name__)
@@ -45,9 +45,7 @@ async def get_current_user(
     if token is None or token == "":
         raise HTTPException(status_code=404, detail="Access token not found")
 
-    signature_application: str = request.headers.get(
-        BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER
-    )
+    signature_application: str = request.headers.get(BUGOUT_APPLICATION_ID_HEADER)
     application_id = None
     if signature_application is not None:
         try:
@@ -143,9 +141,7 @@ async def get_current_user_with_groups(
     if token is None or token == "":
         raise HTTPException(status_code=404, detail="Access token not found")
 
-    signature_application: str = request.headers.get(
-        BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER
-    )
+    signature_application: str = request.headers.get(BUGOUT_APPLICATION_ID_HEADER)
     application_id = None
     if signature_application is not None:
         try:

brood/settings.py

@@ -98,14 +98,8 @@ def group_invite_link_from_env(code: str, email: Optional[str] = None) -> str:
     BROOD_OPENAPI_LIST = BROOD_OPENAPI_LIST_RAW.split(",")
 
 # Web3 signature
-BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER_RAW = os.environ.get(
-    "BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER"
-)
-if BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER_RAW is not None:
-    BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER = (
-        BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER_RAW
-    )
+BUGOUT_APPLICATION_ID_HEADER_RAW = os.environ.get("BUGOUT_APPLICATION_ID_HEADER")
+if BUGOUT_APPLICATION_ID_HEADER_RAW is not None:
+    BUGOUT_APPLICATION_ID_HEADER = BUGOUT_APPLICATION_ID_HEADER_RAW
 else:
-    raise ValueError(
-        "BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER environment variable must be set"
-    )
+    raise ValueError("BUGOUT_APPLICATION_ID_HEADER environment variable must be set")

configs/sample.env

@@ -14,7 +14,7 @@ export BUGOUT_BOT_INSTALLATION_TOKEN="<token_for_autogenerated_users>"
 export BUGOUT_BOT_INSTALLATION_TOKEN_HEADER="<bugout_installation_token_header>"
 
 # Web3 signature variables
-export BUGOUT_WEB3_SIGNATURE_APPLICATION_HEADER="x-bugout-web3-signature-application"
+export BUGOUT_APPLICATION_ID_HEADER="x-bugout-application-id"
 
 # Set the following variables in the most reasonable manner for your development environment
 export STRIPE_SECRET_KEY="<Stripe_API_secret_key>"