Merge branch 'main' into theo/fix-access-token

livekit · Dec 4, 2023 · c1c573e · c1c573e
2 parents 61ec6a0 + 2352d08
commit c1c573e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/livekit-api/livekit/api/access_token.py b/livekit-api/livekit/api/access_token.py
@@ -18,7 +18,7 @@
 import datetime
 import os
 import jwt
-from typing import List
+from typing import Optional, List
 
 DEFAULT_TTL = datetime.timedelta(hours=6)
 DEFAULT_LEEWAY = datetime.timedelta(minutes=1)
@@ -75,14 +75,18 @@ class Claims:
 class AccessToken:
     def __init__(
         self,
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
     ) -> None:
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
         self.api_key = api_key  # iss
         self.api_secret = api_secret
         self.claims = Claims()
-        if not api_key or not api_secret:
-            raise ValueError("api_key and api_secret must be set")
 
         # default jwt claims
         self.identity = ""  # sub
@@ -138,11 +142,17 @@ def to_jwt(self) -> str:
 class TokenVerifier:
     def __init__(
         self,
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
         *,
         leeway: datetime.timedelta = DEFAULT_LEEWAY,
     ) -> None:
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
         self.api_key = api_key
         self.api_secret = api_secret
         self._leeway = leeway

diff --git a/livekit-api/livekit/api/livekit_api.py b/livekit-api/livekit/api/livekit_api.py
@@ -3,17 +3,28 @@
 from .room_service import RoomService
 from .egress_service import EgressService
 from .ingress_service import IngressService
+from typing import Optional
 
 
 class LiveKitAPI:
     def __init__(
         self,
-        url: str = os.getenv("LIVEKIT_URL", "http://localhost:7880"),
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
+        url: Optional[str] = None,
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
         *,
         timeout: float = 60,  # 1 minutes by default
     ):
+        url = url or os.getenv("LIVEKIT_URL")
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not url:
+            raise ValueError("url must be set")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
         self._session = aiohttp.ClientSession(timeout=timeout)
         self._room = RoomService(url, api_key, api_secret, self._session)
         self._ingress = IngressService(url, api_key, api_secret, self._session)