Merge branch 'main' into feat/logger

Author: exaby73

src/firebase_functions/identity_fn.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Cloud functions to handle Eventarc events."""
 
-# pylint: disable=protected-access
+# pylint: disable=protected-access,cyclic-import
 import typing as _typing
 import functools as _functools
 import datetime as _dt
@@ -59,7 +59,7 @@ class AuthUserMetadata:
     creation_time: _dt.datetime
     """The date the user was created."""
 
-    last_sign_in_time: _dt.datetime
+    last_sign_in_time: _typing.Optional[_dt.datetime]
     """The date the user last signed in."""
 
 
@@ -345,7 +345,7 @@ def example(event: identity_fn.AuthBlockingEvent) -> identity_fn.BeforeSignInRes
     :param \\*\\*kwargs: Options.
     :type \\*\\*kwargs: as :exc:`firebase_functions.options.BlockingOptions`
     :rtype: :exc:`typing.Callable`
-            \\[ \\[ :exc:`firebase_functions.identity_fn.AuthBlockingEvent` \\], 
+            \\[ \\[ :exc:`firebase_functions.identity_fn.AuthBlockingEvent` \\],
             :exc:`firebase_functions.identity_fn.BeforeSignInResponse` \\| `None` \\]
             A function that takes a AuthBlockingEvent and optionally returns BeforeSignInResponse.
     """
@@ -399,7 +399,7 @@ def example(event: identity_fn.AuthBlockingEvent) -> identity_fn.BeforeCreateRes
     :param \\*\\*kwargs: Options.
     :type \\*\\*kwargs: as :exc:`firebase_functions.options.BlockingOptions`
     :rtype: :exc:`typing.Callable`
-            \\[ \\[ :exc:`firebase_functions.identity_fn.AuthBlockingEvent` \\], 
+            \\[ \\[ :exc:`firebase_functions.identity_fn.AuthBlockingEvent` \\],
             :exc:`firebase_functions.identity_fn.BeforeCreateResponse` \\| `None` \\]
             A function that takes a AuthBlockingEvent and optionally returns BeforeCreateResponse.
     """

src/firebase_functions/private/_alerts_fn.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Internal utilities for Firebase Alert function types."""
 
-# pylint: disable=protected-access
+# pylint: disable=protected-access,cyclic-import
 import typing as _typing
 import datetime as _dt
 import cloudevents.http as _ce

src/firebase_functions/private/_identity_fn.py

@@ -64,12 +64,15 @@ def _auth_user_info_from_token_data(token_data: dict[str, _typing.Any]):
 
 def _auth_user_metadata_from_token_data(token_data: dict[str, _typing.Any]):
     from firebase_functions.identity_fn import AuthUserMetadata
-    return AuthUserMetadata(
-        creation_time=_dt.datetime.utcfromtimestamp(
-            token_data["creation_time"] / 1000.0),
-        last_sign_in_time=_dt.datetime.utcfromtimestamp(
-            token_data["last_sign_in_time"] / 1000.0),
-    )
+    creation_time = _dt.datetime.utcfromtimestamp(
+        int(token_data["creation_time"]) / 1000.0)
+    last_sign_in_time = None
+    if "last_sign_in_time" in token_data:
+        last_sign_in_time = _dt.datetime.utcfromtimestamp(
+            int(token_data["last_sign_in_time"]) / 1000.0)
+
+    return AuthUserMetadata(creation_time=creation_time,
+                            last_sign_in_time=last_sign_in_time)
 
 
 def _auth_multi_factor_info_from_token_data(token_data: dict[str, _typing.Any]):

src/firebase_functions/private/token_verifier.py

@@ -95,14 +95,14 @@ def verify(self, token, request):
                 'Firebase {0} has incorrect algorithm. Expected "RS256" but got '
                 '"{1}". {2}'.format(self.short_name, header.get('alg'),
                                     verify_id_token_msg))
-        elif self.expected_audience and self.expected_audience not in audience:
+        elif not emulated and self.expected_audience and self.expected_audience not in audience:
             error_message = (
                 'Firebase {0} has incorrect "aud" (audience) claim. Expected "{1}" but '
                 'got "{2}". {3} {4}'.format(self.short_name,
                                             self.expected_audience, audience,
                                             project_id_match_msg,
                                             verify_id_token_msg))
-        elif not self.expected_audience and audience != self.project_id:
+        elif not emulated and not self.expected_audience and audience != self.project_id:
             error_message = (
                 'Firebase {0} has incorrect "aud" (audience) claim. Expected "{1}" but '
                 'got "{2}". {3} {4}'.format(self.short_name, self.project_id,

src/firebase_functions/private/util.py

@@ -123,7 +123,7 @@ def _on_call_valid_body(request: _Request) -> bool:
     }
     if len(extra_keys) != 0:
         _logging.warning(
-            "Request body has extra fields: ",
+            "Request body has extra fields: %s",
             "".join(f"{key}: {value}," for (key, value) in extra_keys.items()),
         )
         return False
@@ -156,7 +156,7 @@ def _on_call_valid_content_type(request: _Request) -> bool:
 
     # Check that the Content-Type is JSON.
     if content_type.lower() != "application/json":
-        _logging.warning("Request has incorrect Content-Type.", content_type)
+        _logging.warning("Request has incorrect Content-Type: %s", content_type)
         return False
 
     return True
@@ -273,7 +273,7 @@ def on_call_check_tokens(request: _Request,) -> _OnCallTokenVerification:
         errs.append(("Auth token was rejected.", log_payload))
 
     if len(errs) == 0:
-        _logging.info("Callable request verification passed", log_payload)
+        _logging.info("Callable request verification passed: %s", log_payload)
     else:
         _logging.warning(f"Callable request verification failed: ${errs}",
                          log_payload)