CodingSta
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/channel_validation.py
Lines changed: 4 additions & 2 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/channel_validation.py
Lines changed: 4 additions & 2 deletions
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/claims_identity.py
Lines changed: 3 additions & 3 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/claims_identity.py
Lines changed: 3 additions & 3 deletions
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/credential_provider.py
Lines changed: 7 additions & 7 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/credential_provider.py
Lines changed: 7 additions & 7 deletions
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/emulator_validation.py
Lines changed: 4 additions & 2 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/emulator_validation.py
Lines changed: 4 additions & 2 deletions
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/jwt_token_extractor.py
Lines changed: 9 additions & 8 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/jwt_token_extractor.py
Lines changed: 9 additions & 8 deletions
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/jwt_token_validation.py
Lines changed: 4 additions & 1 deletion b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/jwt_token_validation.py
Lines changed: 4 additions & 1 deletion
diff --git a/‎libraries/botframework-connector/microsoft/botframework/connector/auth/microsoft_app_credentials.py
Lines changed: 4 additions & 4 deletions b/‎libraries/botframework-connector/microsoft/botframework/connector/auth/microsoft_app_credentials.py
Lines changed: 4 additions & 4 deletions
@@ -3,6 +3,8 @@
 from .verify_options import VerifyOptions
 from .constants import Constants
 from .jwt_token_extractor import JwtTokenExtractor
+from .claims_identity import ClaimsIdentity
+from .credential_provider import CredentialProvider
 
 class ChannelValidation:
     # This claim is ONLY used in the Channel Validation, and not in the emulator validation
@@ -20,7 +22,7 @@ class ChannelValidation:
     )
 
     @staticmethod
-    async def authenticate_token_service_url(auth_header, credentials, service_url):
+    async def authenticate_token_service_url(auth_header: str, credentials: CredentialProvider, service_url: str) -> ClaimsIdentity:
         """ Validate the incoming Auth Header
 
         Validate the incoming Auth Header as a token sent from the Bot Framework Service.
@@ -47,7 +49,7 @@ async def authenticate_token_service_url(auth_header, credentials, service_url):
         return identity
 
     @staticmethod
-    async def authenticate_token(auth_header, credentials):
+    async def authenticate_token(auth_header: str, credentials: CredentialProvider) -> ClaimsIdentity:
         """ Validate the incoming Auth Header
 
         Validate the incoming Auth Header as a token sent from the Bot Framework Service.
 
@@ -1,12 +1,12 @@
 class Claim:
-    def __init__(self, claim_type, value):
+    def __init__(self, claim_type: str, value):
         self.type = claim_type
         self.value = value
 
 class ClaimsIdentity:
-    def __init__(self, claims, isAuthenticated):
+    def __init__(self, claims: dict, isAuthenticated: bool):
         self.claims = claims
         self.isAuthenticated = isAuthenticated
 
-    def get_claim_value(self, claim_type):
+    def get_claim_value(self, claim_type: str):
         return self.claims.get(claim_type)
@@ -7,7 +7,7 @@ class CredentialProvider:
     appid/password pair is valid.
     """
 
-    async def is_valid_appid(self, app_id):
+    async def is_valid_appid(self, app_id: str) -> bool:
         """Validate AppId.
 
         This method is async to enable custom implementations
@@ -18,7 +18,7 @@ async def is_valid_appid(self, app_id):
         """
         raise NotImplementedError
 
-    async def get_app_password(self, app_id):
+    async def get_app_password(self, app_id: str) -> str:
         """Get the app password for a given bot appId, if it is not a valid appId, return Null
 
         This method is async to enable custom implementations
@@ -29,7 +29,7 @@ async def get_app_password(self, app_id):
         """
         raise NotImplementedError
 
-    async def is_authentication_disabled(self):
+    async def is_authentication_disabled(self) -> bool:
         """Checks if bot authentication is disabled.
 
         Return true if bot authentication is disabled.
@@ -41,15 +41,15 @@ async def is_authentication_disabled(self):
         raise NotImplementedError
 
 class SimpleCredentialProvider(CredentialProvider):
-    def __init__(self, app_id, password):
+    def __init__(self, app_id: str, password: str):
         self.app_id = app_id
         self.password = password
 
-    async def is_valid_appid(self, app_id):
+    async def is_valid_appid(self, app_id: str) -> bool:
         return self.app_id == app_id
 
-    async def get_app_password(self, app_id):
+    async def get_app_password(self, app_id: str) -> str:
         return self.password if self.app_id == app_id else None
 
-    async def is_authentication_disabled(self):
+    async def is_authentication_disabled(self) -> bool:
         return not self.app_id
@@ -4,6 +4,8 @@
 from .jwt_token_extractor import JwtTokenExtractor
 from .verify_options import VerifyOptions
 from .constants import Constants
+from .credential_provider import CredentialProvider
+from .claims_identity import ClaimsIdentity
 
 class EmulatorValidation:
     APP_ID_CLAIM = "appid"
@@ -28,7 +30,7 @@ class EmulatorValidation:
     )
 
     @staticmethod
-    def is_token_from_emulator(auth_header):
+    def is_token_from_emulator(auth_header: str) -> bool:
         """ Determines if a given Auth header is from the Bot Framework Emulator
 
         :param auth_header: Bearer Token, in the 'Bearer [Long String]' Format.
@@ -79,7 +81,7 @@ def is_token_from_emulator(auth_header):
         return True
 
     @staticmethod
-    async def authenticate_emulator_token(auth_header, credentials):
+    async def authenticate_emulator_token(auth_header: str, credentials: CredentialProvider) -> ClaimsIdentity:
         """ Validate the incoming Auth Header
 
         Validate the incoming Auth Header as a token sent from the Bot Framework Service.
 
@@ -5,33 +5,34 @@
 from jwt.algorithms import RSAAlgorithm
 import jwt
 from .claims_identity import ClaimsIdentity
+from .verify_options import VerifyOptions
 
 class JwtTokenExtractor:
     metadataCache = {}
 
-    def __init__(self, validationParams, metadata_url, allowedAlgorithms, validator=None):
+    def __init__(self, validationParams: VerifyOptions, metadata_url: str, allowedAlgorithms: list, validator=None):
         self.validation_parameters = validationParams
         self.validation_parameters.algorithms = allowedAlgorithms
         self.open_id_metadata = JwtTokenExtractor.get_open_id_metadata(metadata_url)
         self.validator = validator if validator is not None else lambda x: True
 
     @staticmethod
-    def get_open_id_metadata(metadata_url):
+    def get_open_id_metadata(metadata_url: str):
         metadata = JwtTokenExtractor.metadataCache.get(metadata_url, None)
         if metadata is None:
             metadata = _OpenIdMetadata(metadata_url)
             JwtTokenExtractor.metadataCache.setdefault(metadata_url, metadata)
         return metadata
 
-    async def get_identity_from_auth_header(self, auth_header):
+    async def get_identity_from_auth_header(self, auth_header: str) -> ClaimsIdentity:
         if not auth_header:
             return None
         parts = auth_header.split(" ")
         if len(parts) == 2:
             return await self.get_identity(parts[0], parts[1])
         return None
 
-    async def get_identity(self, schema, parameter):
+    async def get_identity(self, schema: str, parameter: str) -> ClaimsIdentity:
         # No header in correct scheme or no token
         if schema != "Bearer" or not parameter:
             return None
@@ -45,15 +46,15 @@ async def get_identity(self, schema, parameter):
         except:
             raise
 
-    def _has_allowed_issuer(self, jwt_token):
+    def _has_allowed_issuer(self, jwt_token: str) -> bool:
         decoded = jwt.decode(jwt_token, verify=False)
         issuer = decoded.get("iss", None)
         if issuer in self.validation_parameters.issuer:
             return True
 
         return issuer is self.validation_parameters.issuer
 
-    async def _validate_token(self, jwt_token):
+    async def _validate_token(self, jwt_token: str) -> ClaimsIdentity:
         headers = jwt.get_unverified_header(jwt_token)
 
         # Update the signing tokens from the last refresh
@@ -82,7 +83,7 @@ def __init__(self, url):
         self.keys = []
         self.last_updated = datetime.min
 
-    async def get(self, key_id):
+    async def get(self, key_id: str):
         # If keys are more than 5 days old, refresh them
         if self.last_updated < (datetime.now() + timedelta(days=5)):
             await self._refresh()
@@ -97,7 +98,7 @@ async def _refresh(self):
         self.last_updated = datetime.now()
         self.keys = response_keys.json()["keys"]
 
-    def _find(self, key_id):
+    def _find(self, key_id: str):
         if not self.keys:
             return None
         key = next(x for x in self.keys if x["kid"] == key_id)
 
@@ -1,11 +1,14 @@
+from microsoft.botbuilder.schema import Activity
+
 from .emulator_validation import EmulatorValidation
 from .channel_validation import ChannelValidation
 from .microsoft_app_credentials import MicrosoftAppCredentials
+from .credential_provider import CredentialProvider
 
 class JwtTokenValidation:
 
     @staticmethod
-    async def assert_valid_activity(activity, auth_header, credentials):
+    async def assert_valid_activity(activity: Activity, auth_header: str, credentials: CredentialProvider):
         """Validates the security tokens required by the Bot Framework Protocol. Throws on any exceptions.
         
         :param activity: The incoming Activity from the Bot Framework or the Emulator
 
@@ -48,7 +48,7 @@ class MicrosoftAppCredentials(Authentication):
     trustedHostNames = {}
     cache = {}
 
-    def __init__(self, appId, password):
+    def __init__(self, appId: str, password: str):
         self.microsoft_app_id = appId
         self.microsoft_app_password = password
         self.token_cache_key = appId + '-cache'
@@ -90,21 +90,21 @@ def refresh_token(self):
         return oauth_response
 
     @staticmethod
-    def trust_service_url(service_url, expiration=None):
+    def trust_service_url(service_url: str, expiration=None):
         if expiration is None:
             expiration = datetime.now() + timedelta(days=1)
         host = urlparse(service_url).hostname
         if host is not None:
             MicrosoftAppCredentials.trustedHostNames[host] = expiration
 
     @staticmethod
-    def is_trusted_service(service_url):
+    def is_trusted_service(service_url: str) -> bool:
         host = urlparse(service_url).hostname
         if host is not None:
             return MicrosoftAppCredentials.is_trusted_url(host)
         return False
 
     @staticmethod
-    def is_trusted_url(host):
+    def is_trusted_url(host: str) -> bool:
         expiration = MicrosoftAppCredentials.trustedHostNames.get(host, datetime.min)
         return expiration > (datetime.now() - timedelta(minutes=5))