Fix config

samply · Nov 7, 2023 · 8faa99e · 8faa99e
1 parent ea564c2
commit 8faa99e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/Dockerfile.local b/Dockerfile.local
@@ -19,5 +19,5 @@ COPY --from=proxy /usr/local/bin/beam /usr/local/bin/proxy
 COPY --from=builder /app/target/release/local /usr/local/bin/
 
 ENV APP_secret-sync_KEY=NotSecret
+ENV RUST_LOG=warn
 ENTRYPOINT ["sh", "-c", "/usr/local/bin/proxy & /usr/local/bin/local $@", "_"]
-# ENTRYPOINT [ "tail", "-f", "/dev/null" ]
diff --git a/central/src/config.rs b/central/src/config.rs
@@ -10,19 +10,15 @@ use crate::keycloak::{KeyCloakConfig, self};
 #[derive(Debug, Parser)]
 pub struct Config {
     /// Address the server should bind to
-    #[clap(env, default_value = "0.0.0.0:8080")]
+    #[clap(env, long, default_value = "0.0.0.0:8080")]
     pub bind_addr: SocketAddr,
 
     /// Url of the local beam proxy which is required to have sockets enabled
-    #[clap(env, default_value = "http://beam-proxy:8081")]
+    #[clap(env, long, default_value = "http://beam-proxy:8081")]
     pub beam_url: Url,
 
-    /// Url of the local Keycloak
-    #[clap(env, default_value = "http://keycloak:8080")] // TODO: Find the right default url
-    pub keycloak_url: Url,
-
     /// Beam api key
-    #[clap(env)]
+    #[clap(env, long)]
     pub beam_secret: String,
 
     /// The app id of this application

diff --git a/central/src/keycloak.rs b/central/src/keycloak.rs
@@ -25,18 +25,18 @@ async fn get_access_token(conf: &KeyCloakConfig) -> Result<String> {
     struct Token {
         access_token: String,
     }
-    dbg!(CLIENT
-            .post(&format!(
-                "{}/realms/{}/protocol/openid-connect/token",
-                conf.keycloak_url, conf.keycloak_realm
-            ))
-            .form(&json!({
-                "client_id": conf.keycloak_id,
-                "client_secret":  conf.keycloak_secret,
-                "grant_type": "client_credentials"
-            }))
-            .send()
-            .await?)
+    CLIENT
+        .post(&format!(
+            "{}/realms/{}/protocol/openid-connect/token",
+            conf.keycloak_url, conf.keycloak_realm
+        ))
+        .form(&json!({
+            "client_id": conf.keycloak_id,
+            "client_secret":  conf.keycloak_secret,
+            "grant_type": "client_credentials"
+        }))
+        .send()
+        .await?
         .json::<Token>()
         .await
         .map(|t| t.access_token)
@@ -66,6 +66,20 @@ async fn get_access_token_via_admin_login(conf: &KeyCloakConfig) -> Result<Strin
         .map(|t| t.access_token)
 }
 
+#[cfg(test)]
+async fn get_client(id: &str, token: &str, conf: &KeyCloakConfig) -> Result<serde_json::Value> {
+    dbg!(CLIENT
+            .get(&format!(
+                "{}/admin/realms/{}/clients/{id}",
+                conf.keycloak_url, conf.keycloak_realm
+            ))
+            .bearer_auth(token)
+            .send()
+            .await?)
+        .json()
+        .await
+}
+
 #[tokio::test]
 async fn test_create_client() -> Result<()> {
     let conf = KeyCloakConfig {
@@ -76,6 +90,7 @@ async fn test_create_client() -> Result<()> {
     };
     let token = get_access_token_via_admin_login(&conf).await?;
     dbg!(post_client(&token, "test", vec!["http://test.bk".into()], &conf).await?);
+    dbg!(get_client("test", &token, &conf).await.unwrap());
     Ok(())
 }
 
@@ -125,7 +140,7 @@ async fn post_client(
     match res.status() {
         StatusCode::CREATED => Ok(SecretResult::Created(secret)),
         StatusCode::CONFLICT => Ok(SecretResult::AlreadyValid),
-        s => unreachable!("Unexpected statuscode {s} while creating keycloak client")
+        s => unreachable!("Unexpected statuscode {s} while creating keycloak client"),
     }
 }
 
@@ -152,3 +167,10 @@ pub async fn create_client(
 ) -> Result<SecretResult> {
     post_client(&get_access_token(conf).await?, name, redirect_urls, conf).await
 }
+
+///         
+/// pw set? validate?
+/// pw create but what if it already exists?
+///
+///
+mod asdf {}
diff --git a/local/src/config.rs b/local/src/config.rs
@@ -53,9 +53,6 @@ impl FromStr for SecretArg {
         // Add new `SecretRequest` variants here
         let request = match secret_type {
             "OIDC" => {
-                // if CONFIG.oidc_provieder.is_none() {
-                //     return Err("Can not create OIDC client without the 'OIDC_PROVIDER' config option!".into());
-                // }
                 let redirect_urls = args.split(',').map(ToString::to_string).collect();
                 Ok(SecretRequest::OpenIdConnect { redirect_urls })
             },