builds: Expose token name via API

flatpak · Nov 2, 2023 · aa7b6a4 · aa7b6a4
1 parent ed4e0a0
commit aa7b6a4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/migrations/2023-11-02-164215_build_expose_token_name/down.sql b/migrations/2023-11-02-164215_build_expose_token_name/down.sql
@@ -0,0 +1 @@
+ALTER TABLE builds DROP COLUMN token_name;
diff --git a/migrations/2023-11-02-164215_build_expose_token_name/up.sql b/migrations/2023-11-02-164215_build_expose_token_name/up.sql
@@ -0,0 +1 @@
+ALTER TABLE builds ADD token_name TEXT;
diff --git a/src/api/build.rs b/src/api/build.rs
@@ -134,12 +134,23 @@ async fn create_build_async(
  .public_download
  .unwrap_or_else(|| args.app_id.is_none());
 
+ let token_name = if let Some(ref claims) = req.get_claims() {
+ if let Some(ref name) = claims.name {
+ name.clone()
+ } else {
+ "-".to_string()
+ }
+ } else {
+ "-".to_string()
+ };
+
  let build = db
  .new_build(NewBuild {
  repo: args.repo.clone(),
  app_id: args.app_id.clone(),
  public_download,
  build_log_url: args.build_log_url.clone(),
+ token_name: Some(token_name),
  })
  .await?;
  let build_repo_path = config.build_repo_base.join(build.id.to_string());

diff --git a/src/models.rs b/src/models.rs
@@ -13,6 +13,7 @@ pub struct NewBuild {
  pub app_id: Option<String>,
  pub public_download: bool,
  pub build_log_url: Option<String>,
+ pub token_name: Option<String>,
 }
 
 #[derive(Identifiable, Serialize, Queryable, Debug, Eq, PartialEq)]
@@ -34,6 +35,7 @@ pub struct Build {
  pub app_id: Option<String>,
  pub public_download: bool,
  pub build_log_url: Option<String>,
+ pub token_name: Option<String>,
 }
 
 #[derive(Deserialize, Debug, Eq, PartialEq)]

diff --git a/src/schema.rs b/src/schema.rs
@@ -25,6 +25,7 @@ diesel::table! {
  app_id -> Nullable<Text>,
  public_download -> Bool,
  build_log_url -> Nullable<Text>,
+ token_name -> Nullable<Text>,
  }
 }