chore(requirer): Don't exclude secret id

canonical · Aug 29, 2024 · e7e1beb · e7e1beb
1 parent f4496ef
commit e7e1beb
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/charms/matrix_plugins_lib/v0/matrix_plugin.py b/lib/charms/matrix_plugins_lib/v0/matrix_plugin.py
@@ -161,6 +161,7 @@ def to_relation_data(self, model: ops.Model, relation: ops.Relation) -> Dict[str
         dumped_model = self.model_dump(exclude_unset=True)
         dumped_data = {
             "shared_secret_id": dumped_model["shared_secret_id"],
+            "homeserver": dumped_model["homeserver"],
         }
         return dumped_data
 
@@ -197,7 +198,7 @@ class MatrixAuthRequirerData(BaseModel):
     """
 
     registration: Optional[SecretStr] = Field(default=None, exclude=True)
-    registration_secret_id: Optional[SecretStr] = Field(default=None, exclude=True)
+    registration_secret_id: Optional[SecretStr] = Field(default=None)
 
     def set_registration_id(self, model: ops.Model, relation: ops.Relation) -> None:
         """Store the app registration as a Juju secret.
@@ -367,25 +368,25 @@ def __init__(self, charm: ops.CharmBase, relation_name: str = DEFAULT_RELATION_N
         self.relation_name = relation_name
         self.framework.observe(charm.on[relation_name].relation_changed, self._on_relation_changed)
 
-    def get_remote_relation_data(self) -> Optional[MatrixAuthProviderData]:
+    def get_remote_relation_data(self) -> Optional[MatrixAuthRequirerData]:
         """Retrieve the remote relation data.
 
         Returns:
-            MatrixAuthProviderData: the relation data.
+            MatrixAuthRequirerData: the relation data.
         """
         relation = self.model.get_relation(self.relation_name)
         return self._get_remote_relation_data(relation) if relation else None
 
-    def _get_remote_relation_data(self, relation: ops.Relation) -> MatrixAuthProviderData:
+    def _get_remote_relation_data(self, relation: ops.Relation) -> MatrixAuthRequirerData:
         """Retrieve the remote relation data.
 
         Args:
             relation: the relation to retrieve the data from.
 
         Returns:
-            MatrixAuthProviderData: the relation data.
+            MatrixAuthRequirerData: the relation data.
         """
-        return MatrixAuthProviderData.from_relation(relation)
+        return MatrixAuthRequirerData.from_relation(relation=relation)
 
     def _is_remote_relation_data_valid(self, relation: ops.Relation) -> bool:
         """Validate the relation data.
@@ -478,7 +479,7 @@ def _get_remote_relation_data(
         Returns:
             the relation data and the processed entries for it.
         """
-        return MatrixAuthProviderData.from_relation(model, relation)
+        return MatrixAuthProviderData.from_relation(relation=relation)
 
     def _is_remote_relation_data_valid(self, relation: ops.Relation) -> bool:
         """Validate the relation data.