Revert "refactor: update keycloak_client to use upstream version"

This reverts commit d9e3f54.

Signed-off-by: Jan Zachmann <50990105+JanZachmann@users.noreply.github.com>

Author: JanZachmann

src/common.rs

@@ -98,7 +98,7 @@ pub fn create_frontend_config_file() -> Result<()> {
         .context("failed to create frontend config file")?;
 
     config_file
-        .write_all(keycloak_client::config().as_bytes())
+        .write_all(keycloak_client::KeycloakProvider::config().as_bytes())
         .context("failed to write frontend config file")
 }
 

src/keycloak_client.rs

@@ -3,7 +3,9 @@ use base64::{Engine, prelude::BASE64_STANDARD};
 use jwt_simple::prelude::{RS256PublicKey, RSAPublicKeyLike};
 #[cfg(feature = "mock")]
 use mockall::automock;
+use reqwest::Client;
 use serde::{Deserialize, Serialize};
+use trait_variant::make;
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct TokenClaims {
@@ -25,9 +27,9 @@ macro_rules! keycloak_url {
     }};
 }
 
+#[make(Send + Sync)]
 #[cfg_attr(feature = "mock", automock)]
-#[allow(async_fn_in_trait)]
-pub trait SingleSignOnProvider: Send + Sync {
+pub trait SingleSignOnProvider {
     async fn verify_token(&self, token: &str) -> anyhow::Result<TokenClaims>;
 }
 
@@ -39,12 +41,17 @@ pub struct KeycloakProvider {
 impl Default for KeycloakProvider {
     fn default() -> Self {
         Self {
-            client: reqwest::Client::new(),
+            client: Client::new(),
         }
     }
 }
 
 impl KeycloakProvider {
+    pub fn config() -> String {
+        let keycloak_url = &keycloak_url!();
+        format!("window.__APP_CONFIG__ = {{KEYCLOAK_URL:\"{keycloak_url}\"}};")
+    }
+
     async fn realm_public_key(&self) -> Result<RS256PublicKey> {
         let resp = self
             .client
@@ -71,8 +78,3 @@ impl SingleSignOnProvider for KeycloakProvider {
         Ok(claims.custom)
     }
 }
-
-pub fn config() -> String {
-    let keycloak_url = &keycloak_url!();
-    format!("window.__APP_CONFIG__ = {{KEYCLOAK_URL:\"{keycloak_url}\"}};")
-}

tests/validate_portal_token.rs

@@ -44,7 +44,10 @@ fn make_api(
     let mut single_sign_on_provider_mock = SingleSignOnProvider::default();
     single_sign_on_provider_mock
         .expect_verify_token()
-        .returning(move |_| Ok(claims.clone()));
+        .returning(move |_| {
+            let claims = claims.clone();
+            Box::pin(async move { Ok(claims) })
+        });
 
     Api {
         service_client: device_service_client_mock,