merge

Author: heyitsaamir

packages/api/src/microsoft/teams/api/auth/__init__.py

@@ -3,13 +3,13 @@
 Licensed under the MIT License.
 """
 
-from .caller import CALLER_IDS, CallerType
+from .caller import CallerIds, CallerType
 from .credentials import ClientCredentials, Credentials, TokenCredentials
 from .json_web_token import JsonWebToken, JsonWebTokenPayload
 from .token import IToken
 
 __all__ = [
-    "CALLER_IDS",
+    "CallerIds",
     "CallerType",
     "ClientCredentials",
     "Credentials",

packages/api/src/microsoft/teams/api/auth/caller.py

@@ -3,12 +3,16 @@
 Licensed under the MIT License.
 """
 
+from enum import Enum
 from typing import Literal
 
-CallerType = Literal["azure", "gov", "bot"]
 
-CALLER_IDS = {
-    "azure": "urn:botframework:azure",
-    "gov": "urn:botframework:azureusgov",
-    "bot": "urn:botframework:aadappid",
-}
+class CallerIds(str, Enum):
+    """Enum for caller ID types."""
+
+    AZURE = "azure"
+    GOV = "gov"
+    BOT = "bot"
+
+
+CallerType = Literal["azure", "gov", "bot"]

packages/api/src/microsoft/teams/api/auth/credentials.py

@@ -5,7 +5,7 @@
 
 from typing import Awaitable, Callable, Optional, Union
 
-from ..custom_base_model import CustomBaseModel
+from ..models import CustomBaseModel
 
 
 class ClientCredentials(CustomBaseModel):

packages/api/src/microsoft/teams/api/auth/json_web_token.py

@@ -9,7 +9,7 @@
 import jwt
 from pydantic import BaseModel, ConfigDict
 
-from .caller import CALLER_IDS, CallerType
+from .caller import CallerIds, CallerType
 from .token import IToken
 
 
@@ -100,8 +100,8 @@ def from_(self) -> CallerType:
     def from_id(self) -> str:
         """The id of the activity sender."""
         if self.from_ == "bot":
-            return f"{CALLER_IDS['bot']}:{self.app_id}"
-        return CALLER_IDS["azure"]
+            return f"{CallerIds.BOT}:{self.app_id}"
+        return CallerIds.AZURE
 
     @property
     def expiration(self) -> Optional[int]:

packages/api/src/microsoft/teams/api/clients/bot/token_client.py

@@ -9,6 +9,7 @@
 from microsoft.teams.common.http import Client, ClientOptions
 
 from ...auth import Credentials, TokenCredentials
+from ...models import CustomBaseModel
 from ..base_client import BaseClient
 
 

packages/api/tests/unit/test_json_web_token.py

@@ -4,7 +4,7 @@
 """
 
 import jwt
-from microsoft.teams.api.auth import CALLER_IDS, JsonWebToken
+from microsoft.teams.api.auth import CallerIds, JsonWebToken
 
 
 def build_token(token_payload: str):
@@ -39,7 +39,7 @@ def test_should_be_from_bot(self):
         assert token.tenant_id == "789"
         assert token.version is None
         assert token.from_ == "bot"
-        assert token.from_id == f"{CALLER_IDS['bot']}:test"
+        assert token.from_id == f"{CallerIds.BOT}:test"
         assert token.service_url == "https://smba.test.com"
         assert str(token) == str_token
 
@@ -55,7 +55,7 @@ def test_should_be_from_azure(self):
         assert token is not None
         assert token.app_id == ""
         assert token.from_ == "azure"
-        assert token.from_id == CALLER_IDS["azure"]
+        assert token.from_id == CallerIds.AZURE
         assert token.service_url == "https://smba.test.com"
 
     def test_should_have_default_service_url(self):
@@ -68,7 +68,7 @@ def test_should_have_default_service_url(self):
         assert token is not None
         assert token.app_id == ""
         assert token.from_ == "azure"
-        assert token.from_id == CALLER_IDS["azure"]
+        assert token.from_id == CallerIds.AZURE
         assert token.service_url == "https://smba.trafficmanager.net/teams"
 
     def test_expiration_handling(self):