Issue #3354165: eca_access: Access events are not consistently providing entity info as token

modules/access/src/Event/CreateAccess.php

@@ -198,11 +198,16 @@ class CreateAccess extends Event implements AccessEventInterface, ConditionalApp
           'uid' => $this->getAccount()->id(),
           'context' => [],
         ];
-        foreach ($this->getContext() as $k => $v) {
+        $context = $this->getContext();
+        foreach ($context as $k => $v) {
           if (is_scalar($v)) {
             $data['context'][$k] = $v;
           }
         }
+        if (isset($context['entity_type_id'])) {
+          $data['entity-type'] = $context['entity_type_id'];
+        }
+        $data['entity-bundle'] = $this->getEntityBundle();
         $this->eventData = DataTransferObject::create($data);
       }