diff --git a/web/b3desk/models/meetings.py b/web/b3desk/models/meetings.py index f5525343..73a95248 100644 --- a/web/b3desk/models/meetings.py +++ b/web/b3desk/models/meetings.py @@ -277,7 +277,7 @@ def get_quick_meeting_from_user_and_random_string(user, random_string=None): ], logoutUrl=( current_app.config["QUICK_MEETING_LOGOUT_URL"] - or current_app.config["SERVER_FQDN"] + or url_for("routes.index", _external=True) ), ) meeting.fake_id = random_string @@ -323,7 +323,7 @@ def get_mail_meeting(random_string=None): moderatorOnlyMessage=current_app.config["MAIL_MODERATOR_WELCOME_MESSAGE"], logoutUrl=( current_app.config["QUICK_MEETING_LOGOUT_URL"] - or current_app.config["SERVER_FQDN"] + or url_for("routes.index", _external=True) ), ) meeting.fake_id = random_string diff --git a/web/b3desk/settings.py b/web/b3desk/settings.py index e0acdfc2..fe630177 100644 --- a/web/b3desk/settings.py +++ b/web/b3desk/settings.py @@ -461,7 +461,7 @@ def DOCUMENTATION_LINK(self) -> Dict[str, Any]: "label": self.DOCUMENTATION_LINK_LABEL, "is_external": self.DOCUMENTATION_LINK_URL and self.DOCUMENTATION_LINK_URL.lower().startswith( - ("/", self.SERVER_FQDN.lower()) + ("/", "http://", "https://") ), } diff --git a/web/tests/meeting/test_meeting.py b/web/tests/meeting/test_meeting.py index e31f0c06..119a5ffd 100644 --- a/web/tests/meeting/test_meeting.py +++ b/web/tests/meeting/test_meeting.py @@ -304,7 +304,7 @@ def test_create(client_app, meeting, mocker, bbb_response): "uploadExternalDescription": client_app.app.config[ "EXTERNAL_UPLOAD_DESCRIPTION" ], - "uploadExternalUrl": f"{client_app.app.config['SERVER_FQDN']}/meeting/{str(meeting.id)}/externalUpload", + "uploadExternalUrl": f"http://localhost:5000/meeting/{str(meeting.id)}/externalUpload", } assert mocked_background_upload.called