From 4a852fa915226d43301d17a9f2bd9cf4a5cfe2bc Mon Sep 17 00:00:00 2001 From: EETagent Date: Tue, 25 Oct 2022 16:44:08 +0200 Subject: [PATCH] refactor: dry decode token --- core/src/token/mod.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/src/token/mod.rs b/core/src/token/mod.rs index 53f9f0d..e6df692 100644 --- a/core/src/token/mod.rs +++ b/core/src/token/mod.rs @@ -11,6 +11,7 @@ use jsonwebtoken::{Header, Validation}; use admin_token::AdminToken; use candidate_token::CandidateToken; +use serde::Deserialize; const ONE_WEEK: i64 = 60 * 60 * 24 * 7; @@ -46,20 +47,20 @@ pub fn generate_admin_token(_admin: admin::Model) -> String { .unwrap() } -pub fn decode_candidate_token(token: String) -> Result> { - jsonwebtoken::decode::( +pub fn decode_token Deserialize<'a>>(token: String) -> Result> { + jsonwebtoken::decode::( &token, &DecodingKey::from_secret(include_bytes!("secret.key")), &Validation::default(), ) } +pub fn decode_candidate_token(token: String) -> Result> { + decode_token(token) +} + pub fn decode_admin_token(token: String) -> Result> { - jsonwebtoken::decode::( - &token, - &DecodingKey::from_secret(include_bytes!("secret.key")), - &Validation::default(), - ) + decode_token(token) } /*pub fn verify_token(token_data: &TokenData, conn: &DbConn) -> bool {