feat: create token helper to fix duplicate code

src/core/middlewares/auth.rs

@@ -2,7 +2,6 @@ use std::future::Future;
 use std::pin::Pin;
 
 use actix_web::dev::Payload;
-use actix_web::http::header::HeaderValue;
 use actix_web::{FromRequest, HttpRequest};
 use base64::engine::general_purpose;
 use base64::Engine;
@@ -26,6 +25,7 @@ use crate::{
             entity::user_response::UserResponse, repository::user_repository::UserRepositoryImpl,
         },
     },
+    utils::token_helper::{is_auth_header_valid, token_extractor},
 };
 
 pub struct AuthMiddleware {
@@ -35,7 +35,7 @@ pub struct AuthMiddleware {
 
 impl FromRequest for AuthMiddleware {
     type Error = APIError;
-    type Future = Pin<Box<dyn Future<Output = Result<AuthMiddleware, Self::Error>>>>;
+    type Future = Pin<Box<dyn Future<Output=Result<AuthMiddleware, Self::Error>>>>;
 
     // act as auth middleware
     fn from_request(request: &HttpRequest, _: &mut Payload) -> Self::Future {
@@ -98,19 +98,5 @@ pub fn decode_token(jwt: &str) -> AppResult<TokenData<AuthToken>> {
         &DecodingKey::from_rsa_pem(decoded_public_key.as_bytes()).unwrap(),
         &validation,
     )
-    .map_err(|_e| APIError::Unauthorized)
-}
-
-pub fn token_extractor(auth: &str) -> String {
-    let bearer_str = auth.split(' ').collect::<Vec<&str>>();
-    let token_prefix = bearer_str[1].split('.').collect::<Vec<&str>>();
-
-    token_prefix[1..].join(".")
-}
-
-pub fn is_auth_header_valid(auth_header: &HeaderValue) -> bool {
-    if let Ok(auth_str) = auth_header.to_str() {
-        return auth_str.starts_with("bearer") || auth_str.starts_with("Bearer");
-    }
-    false
+        .map_err(|_e| APIError::Unauthorized)
 }

src/core/middlewares/general.rs

@@ -2,7 +2,6 @@ use std::future::Future;
 use std::pin::Pin;
 
 use actix_web::dev::Payload;
-use actix_web::http::header::HeaderValue;
 use actix_web::{FromRequest, HttpRequest};
 use base64::engine::general_purpose;
 use base64::Engine;
@@ -12,6 +11,7 @@ use jsonwebtoken::{Algorithm, DecodingKey, TokenData, Validation};
 use crate::{
     core::{constants::AUTHORIZATION, error::APIError, types::AppResult},
     features::auth::data::models::general_token::GeneralToken,
+    utils::token_helper::{is_auth_header_valid, token_extractor},
 };
 
 #[allow(dead_code)]
@@ -21,7 +21,7 @@ pub struct GeneralMiddleware {
 
 impl FromRequest for GeneralMiddleware {
     type Error = APIError;
-    type Future = Pin<Box<dyn Future<Output = Result<GeneralMiddleware, Self::Error>>>>;
+    type Future = Pin<Box<dyn Future<Output=Result<GeneralMiddleware, Self::Error>>>>;
 
     // act as auth middleware
     fn from_request(request: &HttpRequest, _: &mut Payload) -> Self::Future {
@@ -64,19 +64,5 @@ pub fn decode_token(jwt: &str) -> AppResult<TokenData<GeneralToken>> {
         &DecodingKey::from_rsa_pem(decoded_public_key.as_bytes()).unwrap(),
         &validation,
     )
-    .map_err(|_| APIError::Unauthorized)
-}
-
-pub fn token_extractor(auth: &str) -> String {
-    let bearer_str = auth.split(' ').collect::<Vec<&str>>();
-    let token_prefix = bearer_str[1].split('.').collect::<Vec<&str>>();
-
-    token_prefix[1..].join(".")
-}
-
-pub fn is_auth_header_valid(auth_header: &HeaderValue) -> bool {
-    if let Ok(auth_str) = auth_header.to_str() {
-        return auth_str.starts_with("bearer") || auth_str.starts_with("Bearer");
-    }
-    false
+        .map_err(|_| APIError::Unauthorized)
 }

src/utils/mod.rs

@@ -1,2 +1,3 @@
 pub mod handler;
 pub mod macros;
+pub mod token_helper;

src/utils/token_helper.rs

@@ -0,0 +1,15 @@
+use actix_web::http::header::HeaderValue;
+
+pub fn token_extractor(auth: &str) -> String {
+    let bearer_str = auth.split(' ').collect::<Vec<&str>>();
+    let token_prefix = bearer_str[1].split('.').collect::<Vec<&str>>();
+
+    token_prefix[1..].join(".")
+}
+
+pub fn is_auth_header_valid(auth_header: &HeaderValue) -> bool {
+    if let Ok(auth_str) = auth_header.to_str() {
+        return auth_str.starts_with("bearer") || auth_str.starts_with("Bearer");
+    }
+    false
+}