From 671a448fd77e2e3700b2149fc87e4a797e087269 Mon Sep 17 00:00:00 2001 From: Franklin Date: Sat, 27 Aug 2022 16:20:34 -0400 Subject: [PATCH] Changed auth_user_with_token to only accept an object --- Cargo.lock | 2 +- src/middleware/user_svc/user_service.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ded003c..71428a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,7 +99,7 @@ dependencies = [ [[package]] name = "dev-dtos" version = "0.1.0" -source = "git+https://backend:Eo1n1TPsyWV7wwo9uFwgUJGKKheMM6paM2mDkVPA4zqkh5dt6Q6XPkbtojzYQudQsM84vSwKmhHHTPjyn535d6NLBmA3meeGj0Gb8if4sceAwvySdmzedg5mN2P5zzQt@gitea.blancoinfante.com/blancoinfante_backend/dev-dtos-rust.git#d8e899e4f208be54d1e7f93a2948de55309e88f3" +source = "git+https://backend:Eo1n1TPsyWV7wwo9uFwgUJGKKheMM6paM2mDkVPA4zqkh5dt6Q6XPkbtojzYQudQsM84vSwKmhHHTPjyn535d6NLBmA3meeGj0Gb8if4sceAwvySdmzedg5mN2P5zzQt@gitea.blancoinfante.com/blancoinfante_backend/dev-dtos-rust.git#8c59fdee30acd9f7dbaafd28660e47f2d275eb61" dependencies = [ "chrono", "serde", diff --git a/src/middleware/user_svc/user_service.rs b/src/middleware/user_svc/user_service.rs index ebfe550..02e8185 100644 --- a/src/middleware/user_svc/user_service.rs +++ b/src/middleware/user_svc/user_service.rs @@ -6,8 +6,9 @@ use crate::middleware::client::perform_request; //TODO: Move this into a separate service const BASE_URL_USER_SVC: &str = "http://backend.blancoinfante.com"; -pub async fn authenticate_user_with_token(client: &Client, user: &UserForAuthenticationDto, user_id: &i32) -> Result { - perform_request::<&UserForAuthenticationDto, User>(BASE_URL_USER_SVC.to_string(), client, Method::POST, format!("/user/auth/token/{}", user_id), Some(user), 200, vec![(String::from("auth-token"), user.token.clone())]).await +pub async fn authenticate_user_with_token(client: &Client, user: &UserForAuthenticationDto) -> Result { + //TODO: Remove the need for a userdto, just get token and Id, dont send the body + perform_request::<&UserForAuthenticationDto, User>(BASE_URL_USER_SVC.to_string(), client, Method::POST, format!("/user/auth/token/{}", user.id), None, 200, vec![(String::from("auth-token"), user.token.clone())]).await } pub async fn create_user(client: &Client, user: &UserForCreationDto) -> Result { perform_request::<&UserForCreationDto, Token>(BASE_URL_USER_SVC.to_string(), client, Method::POST, "/user".to_string(), Some(user), 200, vec![]).await