fix path slash issue.

synapse/config/sso.py

@@ -103,8 +103,8 @@ def read_config(self, config, **kwargs):
         # the client's.
 
         _b_url = self.root.server.public_baseurl or "/"
-        if not _b_url.endswith("/"):
-            _b_url = _b_url + "/"
+        if _b_url.endswith("/"):
+            _b_url = _b_url[:-1]
         login_fallback_url = (
             _b_url + "_matrix/static/client/login"
         )

synapse/handlers/oidc.py

@@ -283,8 +283,8 @@ def __init__(
         # We'll insert this into the Path= parameter of any session cookies we set.
         public_baseurl_path = urlparse(hs.config.server.public_baseurl).path
         _b_url = public_baseurl_path
-        if not _b_url.endswith("/"):
-            _b_url = _b_url + "/"
+        if _b_url.endswith("/"):
+            _b_url = _b_url[:-1]
         self._callback_path_prefix = (
             _b_url.encode("utf-8") + b"_synapse/client/oidc"
         )

synapse/module_api/__init__.py

@@ -354,8 +354,8 @@ def public_baseurl(self) -> str:
         Added in Synapse v1.39.0.
         """
         _b_url = self._hs.config.server.public_baseurl
-        if not _b_url.endswith("/"):
-            _b_url = _b_url + "/"
+        if _b_url.endswith("/"):
+            _b_url = _b_url[:-1]
         return _b_url
 
     @property

synapse/rest/client/auth.py

@@ -68,8 +68,8 @@ async def on_GET(self, request: SynapseRequest, stagetype: str) -> None:
             )
         elif stagetype == LoginType.TERMS:
             _b_url = self.hs.config.server.public_baseurl
-            if not _b_url.endswith("/"):
-                _b_url = _b_url + "/"
+            if _b_url.endswith("/"):
+                _b_url = _b_url[:-1]
             html = self.terms_template.render(
                 session=session,
                 terms_url="%s_matrix/consent?v=%s"

synapse/rest/well_known.py

@@ -38,8 +38,8 @@ def get_well_known(self) -> Optional[JsonDict]:
             return None
 
         _b_url = self._config.server.public_baseurl
-        if not _b_url.endswith("/"):
-            _b_url = _b_url + "/"
+        if _b_url.endswith("/"):
+            _b_url = _b_url[:-1]
 
         result = {"m.homeserver": {"base_url": _b_url, }}
 

tests/push/test_email.py

@@ -273,7 +273,7 @@ def test_room_notifications_include_avatar(self):
 
         # The other users send some messages.
         # TODO It seems that two messages are required to trigger an email?
-        self.helper.send(room, body="Alpha", tok=self.others[0].token)
+        send_event = self.helper.send(room, body="Alpha", tok=self.others[0].token)
         self.helper.send(room, body="Beta", tok=self.others[1].token)
 
         # We should get emailed about those messages

tests/rest/test_well_known.py

@@ -29,13 +29,15 @@ def create_test_resource(self):
         {
             "public_baseurl": "https://tesths",
             "default_identity_server": "https://testis",
+            "serve_server_wellknown": True,
         }
     )
     def test_client_well_known(self):
         channel = self.make_request(
             "GET", "/.well-known/matrix/client", shorthand=False
         )
 
+        # import ipdb; ipdb.set_trace()
         self.assertEqual(channel.code, 200)
         self.assertEqual(
             channel.json_body,

tests/server.py

@@ -278,7 +278,7 @@ def make_request(
     ):
         if path.startswith(b"/"):
             path = path[1:]
-        path = b"/_matrix/client/r0/" + path
+        path = b"_matrix/client/r0/" + path
 
     if not path.startswith(b"/"):
         path = b"/" + path
@@ -323,6 +323,7 @@ def make_request(
     req.requestReceived(method, path, b"1.1")
 
     if await_result:
+        import ipdb; ipdb.set_trace()
         channel.await_result()
 
     return channel