Do not include port number when constructing HTTP base URLs

crates/http/src/auth/oauth/auth.rs

@@ -464,7 +464,7 @@ impl OAuthApiHandler for Server {
                 "urn:ietf:params:jmap:vacationresponse",
             ],
             code_challenge_methods_supported: &["S256"],
-            issuer: base_url,
+            issuer: base_url.to_string(),
         })
         .into_http_response())
     }

crates/http/src/auth/oauth/openid.rs

@@ -90,7 +90,7 @@ impl OpenIdHandler for Server {
                 "email_verified",
             ],
             code_challenge_methods_supported: &["S256"],
-            issuer: base_url,
+            issuer: base_url.to_string(),
         })
         .into_http_response())
     }

crates/http/src/auth/oauth/token.rs

@@ -64,7 +64,9 @@ impl TokenHandler for Server {
 
         let mut response = TokenResponse::error(ErrorType::InvalidGrant);
 
-        let issuer = HttpContext::new(&session, req).resolve_response_url(self);
+        let issuer = HttpContext::new(&session, req)
+            .resolve_response_url(self)
+            .to_string();
 
         if grant_type.eq_ignore_ascii_case("authorization_code") {
             response = if let (Some(code), Some(client_id), Some(redirect_uri)) = (

crates/http/src/request.rs

@@ -197,7 +197,7 @@ impl ParseHttp for Server {
                                 self.authenticate_headers(&req, &session).await?;
 
                             self.handle_session_resource(
-                                ctx.resolve_response_url(self),
+                                ctx.resolve_response_url(self).to_string(),
                                 &access_token,
                             )
                             .await