alex/uplifting-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extractors for jwt and user id

Browse Source
This commit is contained in:
Alexander Ng
2024-12-10 14:48:03 -08:00
parent ef722fe0d8
commit 0ecd7c8a4c
11 changed files with 168 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/v1/auth/login.rs
View File

@@ -3,11 +3,9 @@ use argon2::{
password_hash::{PasswordHash, PasswordVerifier},
Argon2,
};
use hmac::{Hmac, Mac};
use jwt::SignWithKey;
use sha2::Sha256;
use sqlx::query;
use std::collections::BTreeMap;
use util::auth::JWTClaims;
#[derive(Serialize, Deserialize, ToSchema)]
pub struct LoginBody {
@@ -40,14 +38,11 @@ pub async fn login(
return Err(AppError::Error(Errors::Unauthorized));
}
let key: Hmac<Sha256> =
Hmac::new_from_slice(state.jwt_secret.as_bytes()).context("Failed to create HMAC")?;
let mut claims = BTreeMap::new();
claims.insert("id", user.id.to_string());
claims.insert("username", user.username);
claims.insert("real_name", user.real_name);
claims.insert("email", user.email);
let token_str = claims.sign_with_key(&key).context("Failed to sign JWT")?;
let claims = JWTClaims::new(user.id, user.username, user.real_name, user.email);
let token_str = claims
.sign_with_key(&state.jwt_key)
.context("Failed to sign JWT")?;
Ok(token_str)
}

17
src/v1/auth/signup.rs
View File

@@ -6,10 +6,8 @@ use argon2::{
Argon2,
};
use hmac::{Hmac, Mac};
use jwt::SignWithKey;
use sha2::Sha256;
use std::collections::BTreeMap;
use util::auth::JWTClaims;
#[derive(Serialize, Deserialize, ToSchema)]
pub struct SignupBody {
@@ -45,14 +43,11 @@ pub async fn signup(
.fetch_one(&*state.db)
.await?;
let key: Hmac<Sha256> =
Hmac::new_from_slice(state.jwt_secret.as_bytes()).context("Failed to create HMAC")?;
let mut claims = BTreeMap::new();
claims.insert("id", user.id.to_string());
claims.insert("username", user.username);
claims.insert("real_name", user.real_name);
claims.insert("email", user.email);
let token_str = claims.sign_with_key(&key).context("Failed to sign JWT")?;
let claims = JWTClaims::new(user.id, user.username, user.real_name, user.email);
let token_str = claims
.sign_with_key(&state.jwt_key)
.context("Failed to sign JWT")?;
Ok(token_str)
}