Fixes

Author: MatMaul

crates/cli/src/sync.rs

@@ -235,18 +235,16 @@ pub async fn config_sync(
                 }
             };
 
-            let response_mode = if let Some(response_mode) = provider.response_mode {
-                match response_mode {
+            let response_mode = provider
+                .response_mode
+                .map(|response_mode| match response_mode {
                     mas_config::UpstreamOAuth2ResponseMode::Query => {
-                        Some(mas_data_model::UpstreamOAuthProviderResponseMode::Query)
+                        mas_data_model::UpstreamOAuthProviderResponseMode::Query
                     }
                     mas_config::UpstreamOAuth2ResponseMode::FormPost => {
-                        Some(mas_data_model::UpstreamOAuthProviderResponseMode::FormPost)
+                        mas_data_model::UpstreamOAuthProviderResponseMode::FormPost
                     }
-                }
-            } else {
-                None
-            };
+                });
 
             if discovery_mode.is_disabled() {
                 if provider.authorization_endpoint.is_none() {

crates/handlers/src/oauth2/authorization/mod.rs

@@ -106,11 +106,11 @@ fn resolve_response_mode(
 ) -> Result<ResponseMode, RouteError> {
     use ResponseMode as M;
 
-        // If the response type includes either "token" or "id_token", the default
-        // response mode is "fragment" and the response mode "query" must not be
-        // used
+    // If the response type includes either "token" or "id_token", the default
+    // response mode is "fragment" and the response mode "query" must not be
+    // used
     if response_type.has_token() || response_type.has_id_token() {
-            match suggested_response_mode {
+        match suggested_response_mode {
             None => Ok(M::Fragment),
             Some(M::Query) => Err(RouteError::InvalidResponseMode),
             Some(mode) => Ok(mode),