From 2905f2b5e6ca8b998ade30ff6293eee1fd963778 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 29 Nov 2019 09:51:27 +0100 Subject: [PATCH] update api macro example usage Signed-off-by: Wolfgang Bumiller --- src/api2/access.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/api2/access.rs b/src/api2/access.rs index f5cef5bf..9c911ab2 100644 --- a/src/api2/access.rs +++ b/src/api2/access.rs @@ -4,8 +4,7 @@ use serde_json::{json, Value}; use proxmox::sortable; use proxmox::api::{http_err, list_subdirs_api_method}; -use proxmox::api::{ApiMethod, Router, RpcEnvironment}; -use proxmox::api::router::SubdirMap; +use proxmox::api::router::{Router, SubdirMap}; use proxmox::api::api; use crate::tools; @@ -71,21 +70,13 @@ fn authenticate_user(username: &str, password: &str) -> Result<(), Error> { /// Create or verify authentication ticket. /// /// Returns: An authentication ticket with additional infos. -fn create_ticket( - param: Value, - _info: &ApiMethod, - _rpcenv: &mut dyn RpcEnvironment, -) -> Result { - - let username = tools::required_string_param(¶m, "username")?; - let password = tools::required_string_param(¶m, "password")?; - - match authenticate_user(username, password) { +fn create_ticket(username: String, password: String) -> Result { + match authenticate_user(&username, &password) { Ok(_) => { - let ticket = assemble_rsa_ticket( private_auth_key(), "PBS", Some(username), None)?; + let ticket = assemble_rsa_ticket( private_auth_key(), "PBS", Some(&username), None)?; - let token = assemble_csrf_prevention_token(csrf_secret(), username); + let token = assemble_csrf_prevention_token(csrf_secret(), &username); log::info!("successful auth for user '{}'", username);