Merge branch 'main' 1.2.12dev into production

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "b3desk"
-version = "1.2.11"
+version = "1.2.12"
 description = "Outil de visioconférence pour les agents de l'Education Nationale et de l'Etat en général."
 authors = ["Your Name <[email protected]>"]
 readme = "README.md"

web/b3desk/__init__.py

@@ -29,7 +29,7 @@
 from .utils import enum_converter
 from .utils import model_converter
 
-__version__ = "1.2.11"
+__version__ = "1.2.12"
 
 LANGUAGES = ["en", "fr"]
 

web/b3desk/models/bbb.py

@@ -198,7 +198,11 @@ def create(self):
         data = self.bbb_response(request)
 
         # non default files are sent later
-        if self.meeting.non_default_files:
+        if (
+            self.meeting.non_default_files
+            and "returncode" in data
+            and data["returncode"] == "SUCCESS"
+        ):
             xml = self.meeting_file_addition_xml(self.meeting.non_default_files)
             request = self.bbb_request(
                 "insertDocument", params={"meetingID": self.meeting.meetingID}
@@ -320,7 +324,9 @@ def meeting_file_addition_xml(self, meeting_files):
                     f"{current_app.config['SECRET_KEY']}-0-{meeting_file.id}-{current_app.config['SECRET_KEY']}".encode()
                 ).hexdigest()
                 current_app.logger.info(
-                    "Add document on BigBLueButton room creation for file %s",
+                    "Add document on BigBLueButton room %s %s creation for file %s",
+                    self.meeting.name,
+                    self.meeting.id,
                     meeting_file.title,
                 )
                 url = url_for(

web/b3desk/models/meetings.py

@@ -204,6 +204,9 @@ def get_join_url(
             not is_meeting_available and (meeting_role == Role.moderator) and create
         )
         if should_create_room:
+            current_app.logger.info(
+                "Request BBB room creation %s %s", self.name, self.id
+            )
             data = self.create_bbb()
             if "returncode" in data and data["returncode"] == "SUCCESS":
                 is_meeting_available = True