feat: Make Event common object, using __dict__ to spread into AuthContext

Author: exaby73

src/firebase_functions/firestore_fn.py

@@ -88,7 +88,7 @@ class Event(_core.CloudEvent[_core.T]):
 _C2 = _typing.Callable[[_E2], None]
 
 AuthType = _typing.Literal["service_account", "api_key", "system",
-                           "unauthenticated", "unknown"]
+"unauthenticated", "unknown"]
 
 
 @_dataclass.dataclass(frozen=True)
@@ -106,10 +106,10 @@ class EventWithAuthContext(Event[_core.T]):
 
 
 def _firestore_endpoint_handler(
-    func: _C1 | _C2 | _C3 | _C4,
-    event_type: str,
-    document_pattern: _path_pattern.PathPattern,
-    raw: _ce.CloudEvent,
+        func: _C1 | _C2 | _C3 | _C4,
+        event_type: str,
+        document_pattern: _path_pattern.PathPattern,
+        raw: _ce.CloudEvent,
 ) -> None:
     event_attributes = raw._get_attributes()
     event_data: _typing.Any = raw.get_data()
@@ -189,30 +189,29 @@ def _firestore_endpoint_handler(
         **document_pattern.extract_matches(event_document),
     }
 
-    common_event_kwargs = {
-        "project": event_project,
-        "namespace": event_namespace,
-        "database": event_database,
-        "location": event_location,
-        "document": event_document,
-        "specversion": event_attributes["specversion"],
-        "id": event_attributes["id"],
-        "source": event_attributes["source"],
-        "type": event_attributes["type"],
-        "time": event_time,
-        "data": firestore_event_data,
-        "subject": event_attributes["subject"],
-        "params": params,
-    }
+    database_event = Event(
+        project=event_project,
+        namespace=event_namespace,
+        database=event_database,
+        location=event_location,
+        document=event_document,
+        specversion=event_attributes["specversion"],
+        id=event_attributes["id"],
+        source=event_attributes["source"],
+        type=event_attributes["type"],
+        time=event_time,
+        data=firestore_event_data,
+        subject=event_attributes["subject"],
+        params=params,
+    )
 
     if event_type.endswith(".withAuthContext"):
         database_event_with_auth_context = EventWithAuthContext(
-            **common_event_kwargs,
+            **vars(database_event),
             auth_type=event_auth_type,
             auth_id=event_auth_id)
         func(database_event_with_auth_context)
     else:
-        database_event = Event(**common_event_kwargs)
         # mypy cannot infer that the event type is correct, hence the cast
         _typing.cast(_C1 | _C2, func)(database_event)
 
@@ -267,7 +266,7 @@ def on_document_written_wrapped(raw: _ce.CloudEvent):
 
 @_util.copy_func_kwargs(FirestoreOptions)
 def on_document_written_with_auth_context(**kwargs
-                                         ) -> _typing.Callable[[_C1], _C1]:
+                                          ) -> _typing.Callable[[_C1], _C1]:
     """
     Event handler that triggers when a document is created, updated, or deleted in Firestore.
     This trigger will also provide the authentication context of the principal who triggered 
@@ -366,7 +365,7 @@ def on_document_updated_wrapped(raw: _ce.CloudEvent):
 
 @_util.copy_func_kwargs(FirestoreOptions)
 def on_document_updated_with_auth_context(**kwargs
-                                         ) -> _typing.Callable[[_C1], _C1]:
+                                          ) -> _typing.Callable[[_C1], _C1]:
     """
     Event handler that triggers when a document is updated in Firestore.
     This trigger will also provide the authentication context of the principal who triggered 
@@ -465,7 +464,7 @@ def on_document_created_wrapped(raw: _ce.CloudEvent):
 
 @_util.copy_func_kwargs(FirestoreOptions)
 def on_document_created_with_auth_context(**kwargs
-                                         ) -> _typing.Callable[[_C2], _C2]:
+                                          ) -> _typing.Callable[[_C2], _C2]:
     """
     Event handler that triggers when a document is created in Firestore.
     This trigger will also provide the authentication context of the principal who triggered 
@@ -564,7 +563,7 @@ def on_document_deleted_wrapped(raw: _ce.CloudEvent):
 
 @_util.copy_func_kwargs(FirestoreOptions)
 def on_document_deleted_with_auth_context(**kwargs
-                                         ) -> _typing.Callable[[_C2], _C2]:
+                                          ) -> _typing.Callable[[_C2], _C2]:
     """
     Event handler that triggers when a document is deleted in Firestore.
     This trigger will also provide the authentication context of the principal who triggered