Rename token fields

Author: rylev

site/src/github.rs

@@ -336,9 +336,9 @@ pub async fn create_ref(
     let timer_token = ctxt
         .config
         .keys
-        .github
+        .github_api_token
         .clone()
-        .expect("needs rust-timer token");
+        .expect("needs github API token");
     let url = format!("{}/git/refs", repository_url);
     let response = client
         .post(&url)
@@ -385,9 +385,9 @@ pub async fn create_pr(
     let timer_token = ctxt
         .config
         .keys
-        .github
+        .github_api_token
         .clone()
-        .expect("needs rust-timer token");
+        .expect("needs github API token");
     let url = format!("{}/pulls", repository_url);
     let response = client
         .post(&url)
@@ -432,9 +432,9 @@ pub async fn create_commit(
     let timer_token = ctxt
         .config
         .keys
-        .github
+        .github_api_token
         .clone()
-        .expect("needs rust-timer token");
+        .expect("needs github API token");
     let url = format!("{}/git/commits", repository_url);
     let commit_response = client
         .post(&url)
@@ -468,9 +468,9 @@ pub async fn get_commit(
     let timer_token = ctxt
         .config
         .keys
-        .github
+        .github_api_token
         .clone()
-        .expect("needs rust-timer token");
+        .expect("needs github API token");
     let url = format!("{}/commits/{}", repository_url, sha);
     let commit_response = client
         .get(&url)
@@ -574,7 +574,11 @@ where
     B: Into<String>,
 {
     let body = body.into();
-    let timer_token = cfg.keys.github.clone().expect("needs rust-timer token");
+    let timer_token = cfg
+        .keys
+        .github_api_token
+        .clone()
+        .expect("needs github API token");
     let client = reqwest::Client::new();
     let req = client
         .post(&format!(
@@ -595,7 +599,7 @@ where
 pub async fn post_finished(ctxt: &SiteCtxt) {
     // If the github token is not configured, do not run this -- we don't want
     // to mark things as complete without posting the comment.
-    if ctxt.config.keys.github.is_none() {
+    if ctxt.config.keys.github_api_token.is_none() {
         return;
     }
     let conn = ctxt.conn().await;

site/src/load.rs

@@ -60,9 +60,11 @@ impl TryCommit {
 #[derive(Debug, Default, Deserialize)]
 pub struct Keys {
     /// GitHub API token from the `GITHUB_API_TOKEN` env variable
-    pub github: Option<String>,
+    #[serde(rename = "github")]
+    pub github_api_token: Option<String>,
     /// GitHub webhook secret from the `GITHUB_WEBHOOK_SECRET` env variable
-    pub secret: Option<String>,
+    #[serde(rename = "secret")]
+    pub github_webhook_secret: Option<String>,
 }
 
 /// Site configuration
@@ -125,8 +127,8 @@ impl SiteCtxt {
         } else {
             Config {
                 keys: Keys {
-                    github: std::env::var("GITHUB_API_TOKEN").ok(),
-                    secret: std::env::var("GITHUB_WEBHOOK_SECRET").ok(),
+                    github_api_token: std::env::var("GITHUB_API_TOKEN").ok(),
+                    github_webhook_secret: std::env::var("GITHUB_WEBHOOK_SECRET").ok(),
                 },
             }
         };

site/src/server.rs

@@ -1303,7 +1303,7 @@ impl Server {
                 &mut Some(auth).into_iter(),
             )
             .unwrap();
-            if auth.0.token() == *ctxt.config.keys.secret.as_ref().unwrap() {
+            if auth.0.token() == *ctxt.config.keys.github_webhook_secret.as_ref().unwrap() {
                 return true;
             }
         }
@@ -1701,7 +1701,7 @@ fn verify_gh(config: &Config, req: &http::request::Parts, body: &[u8]) -> bool {
 fn verify_gh_sig(cfg: &Config, header: &str, body: &[u8]) -> Option<bool> {
     let key = hmac::Key::new(
         hmac::HMAC_SHA1_FOR_LEGACY_USE_ONLY,
-        cfg.keys.secret.as_ref().unwrap().as_bytes(),
+        cfg.keys.github_webhook_secret.as_ref().unwrap().as_bytes(),
     );
     let sha = header.get(5..)?; // strip sha1=
     let sha = hex::decode(sha).ok()?;