Merge pull request #19 from oxidecomputer/update-client-id-param

Allow client_id to be read as string param

Author: augustuswm

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "oidcx"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2024"
 
 [dependencies]

Cargo.toml

@@ -70,7 +70,7 @@ pub struct SettingsOxide {
 
 #[derive(Debug, Deserialize)]
 pub struct SettingsGitHubApp {
-    pub client_id: String,
+    pub client_id: StringParam,
     /// PEM-encoded GitHub App private key. May be provided inline or, more
     /// commonly, as a `{ path = "..." }` reference to a key file on the
     /// parameters volume.

src/settings.rs

@@ -129,7 +129,7 @@ impl GitHubTokens {
             Ok(GitHubTokens {
                 state: Some(Arc::new(State {
                     client: Client::new(),
-                    client_id: github.client_id.clone(),
+                    client_id: github.client_id.resolve(base)?.expose_secret().to_string(),
                     private_key: EncodingKey::from_rsa_pem(private_key.expose_secret().as_bytes())
                         .map_err(GitHubTokenError::LoadPrivateKey)?,
                 })),