From a9e98e5d9310150a89eca9f2379dc948c168cb95 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Sun, 11 Feb 2024 21:05:43 +0100 Subject: [PATCH] Remove `set_private_key` (#15) --- typhon-core/src/lib.rs | 1 - typhon-core/src/projects.rs | 9 --------- typhon-types/src/lib.rs | 1 - typhon/src/api.rs | 7 ------- 4 files changed, 18 deletions(-) diff --git a/typhon-core/src/lib.rs b/typhon-core/src/lib.rs index 8a4ddbc7..cacebe25 100644 --- a/typhon-core/src/lib.rs +++ b/typhon-core/src/lib.rs @@ -164,7 +164,6 @@ pub fn handle_request_aux( requests::Project::Info => return Ok(Response::ProjectInfo(project.info(conn)?)), requests::Project::Refresh => project.refresh(conn)?, requests::Project::SetDecl(decl) => project.set_decl(conn, decl)?, - requests::Project::SetPrivateKey(key) => project.set_private_key(conn, &key)?, requests::Project::UpdateJobsets => project.update_jobsets(conn)?, }; Response::Ok diff --git a/typhon-core/src/projects.rs b/typhon-core/src/projects.rs index e7c86142..b5cef38a 100644 --- a/typhon-core/src/projects.rs +++ b/typhon-core/src/projects.rs @@ -228,15 +228,6 @@ impl Project { Ok(()) } - pub fn set_private_key(&self, conn: &mut Conn, key: &String) -> Result<(), Error> { - let _ = age::x25519::Identity::from_str(key).map_err(|_| Error::Todo)?; - diesel::update(&self.project) - .set(schema::projects::key.eq(key)) - .execute(conn)?; - log_event(Event::ProjectUpdated(self.handle())); - Ok(()) - } - pub fn update_jobsets(&self, conn: &mut Conn) -> Result<(), Error> { // run action `jobsets` let action = self.new_action( diff --git a/typhon-types/src/lib.rs b/typhon-types/src/lib.rs index 4637900a..cb4c0299 100644 --- a/typhon-types/src/lib.rs +++ b/typhon-types/src/lib.rs @@ -315,7 +315,6 @@ pub mod requests { Info, Refresh, SetDecl(ProjectDecl), - SetPrivateKey(String), UpdateJobsets, } diff --git a/typhon/src/api.rs b/typhon/src/api.rs index c3204e47..a1ae226b 100644 --- a/typhon/src/api.rs +++ b/typhon/src/api.rs @@ -145,12 +145,6 @@ r!( Project::SetDecl(body.into_inner()), ); - project_set_private_key(path: web::Path, body: web::Json) => - Request::Project( - handles::project(path.into_inner()), - Project::SetPrivateKey(body.into_inner()), - ); - project_update_jobsets(path: web::Path) => Request::Project( handles::project(path.into_inner()), @@ -353,7 +347,6 @@ pub fn config(cfg: &mut web::ServiceConfig) { .route("/refresh", web::post().to(project_refresh)) .route("/update_jobsets", web::post().to(project_update_jobsets)) .route("/set_decl", web::post().to(project_set_decl)) - .route("/set_private_key", web::post().to(project_set_private_key)) .route("/webhook", web::post().to(webhook)) .service( web::scope("/jobsets/{jobset}")