update readme & fix access token (#99)

Author: theomonnom

README.md

@@ -33,7 +33,8 @@ $ pip install livekit-api
 from livekit import api
 import os
 
-token = api.AccessToken(os.getenv('LIVEKIT_API_KEY'), os.getenv('LIVEKIT_API_SECRET')) \
+# will automatically use the LIVEKIT_API_KEY and LIVEKIT_API_SECRET env vars
+token = api.AccessToken() \
     .with_identity("python-bot") \
     .with_name("Python Bot") \
     .with_grants(api.VideoGrants(
@@ -51,18 +52,16 @@ from livekit import api
 import asyncio
 
 async def main():
-    room_service = api.RoomService(
+    lkapi = api.LiveKitAPI(
         'http://localhost:7880',
-        'devkey',
-        'secret',
     )
-    room_info = await room_service.create_room(
-        api.room.CreateRoomRequest(name="my-room"),
+    room_info = await lkapi.room.create_room(
+        api.CreateRoomRequest(name="my-room"),
     )
     print(room_info)
-    results = await room_service.list_rooms(api.room.ListRoomsRequest())
+    results = await lkapi.room.list_rooms(api.ListRoomsRequest())
     print(results)
-    await room_service.aclose()
+    await lkapi.aclose()
 
 asyncio.get_event_loop().run_until_complete(main())
 ```

livekit-api/livekit/api/access_token.py

@@ -64,11 +64,7 @@ class VideoGrants:
 
 @dataclasses.dataclass
 class Claims:
-    exp: int = 0
-    iss: str = ""  # api key
-    nbf: int = 0
-    sub: str = ""  # identity
-
+    identity: str = ""
     name: str = ""
     video: VideoGrants = dataclasses.field(default_factory=VideoGrants)
     metadata: str = ""
@@ -120,8 +116,10 @@ def to_jwt(self) -> str:
         if video.room_join and (not self.identity or not video.room):
             raise ValueError("identity and room must be set when joining a room")
 
-        claims = dataclasses.asdict(self.claims)
-        claims = {camel_to_snake(k): v for k, v in claims.items()}
+        claims = dataclasses.asdict(
+            self.claims,
+            dict_factory=lambda items: {snake_to_lower_camel(k): v for k, v in items},
+        )
         claims.update(
             {
                 "sub": self.identity,
@@ -156,17 +154,29 @@ def verify(self, token: str) -> Claims:
             algorithms=["HS256"],
             leeway=self._leeway.total_seconds(),
         )
-        c = Claims(**claims)
 
-        video = claims["video"]
-        video = {camel_to_snake(k): v for k, v in video.items()}
-        c.video = VideoGrants(**video)
+        video_dict = {camel_to_snake(k): v for k, v in claims["video"].items()}
+        video_dict = {
+            k: v for k, v in video_dict.items() if k in VideoGrants.__dataclass_fields__
+        }
+        video = VideoGrants(**video_dict)
+
+        c = Claims(
+            identity=claims["sub"],
+            name=claims["name"],
+            video=video,
+            metadata=claims["metadata"],
+            sha256=claims["sha256"],
+        )
+        c.identity = claims["sub"]
         return c
 
 
 def camel_to_snake(t: str):
     return re.sub(r"(?<!^)(?=[A-Z])", "_", t).lower()
 
 
-def snake_to_camel(t: str):
-    return "".join(x.title() for x in t.split("_"))
+def snake_to_lower_camel(t: str):
+    return "".join(
+        word.capitalize() if i else word for i, word in enumerate(t.split("_"))
+    )

livekit-api/tests/test_access_token.py

@@ -20,7 +20,7 @@ def test_verify_token():
     token_verifier = TokenVerifier(TEST_API_KEY, TEST_API_SECRET)
     claims = token_verifier.verify(token)
 
-    assert claims.sub == "test_identity"
+    assert claims.identity == "test_identity"
     assert claims.metadata == "test_metadata"
     assert claims.video == grants