Merge pull request #14 from FxQnLr/axum7

Axum7 & config changes

1 files changed, 8 insertions, 16 deletions

diff --git a/src/auth.rs b/src/auth.rs
index e4b1c2f..feca652 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -1,18 +1,15 @@
-use axum::headers::HeaderValue;
-use axum::http::StatusCode;
+use axum::http::{StatusCode, HeaderValue};
 use axum::http::header::ToStrError;
 use tracing::{debug, error, trace};
-use crate::auth::AuthError::{MissingSecret, WrongSecret};
-use crate::config::SETTINGS;
+use crate::auth::Error::{MissingSecret, WrongSecret};
+use crate::config::Config;
 
-pub fn auth(secret: Option<&HeaderValue>) -> Result<bool, AuthError> {
+pub fn auth(config: &Config, secret: Option<&HeaderValue>) -> Result<bool, Error> {
     debug!("auth request with secret {:?}", secret);
     if let Some(value) = secret {
         trace!("value exists");
-        let key = SETTINGS
-            .get_string("apikey")
-            .map_err(AuthError::Config)?;
-        if value.to_str().map_err(AuthError::HeaderToStr)? == key.as_str() {
+        let key = &config.apikey;
+        if value.to_str().map_err(Error::HeaderToStr)? == key.as_str() {
             debug!("successful auth");
             Ok(true)
         } else {
@@ -26,22 +23,17 @@ pub fn auth(secret: Option<&HeaderValue>) -> Result<bool, AuthError> {
 }
 
 #[derive(Debug)]
-pub enum AuthError {
+pub enum Error {
     WrongSecret,
     MissingSecret,
-    Config(config::ConfigError),
     HeaderToStr(ToStrError)
 }
 
-impl AuthError {
+impl Error {
     pub fn get(self) -> (StatusCode, &'static str) {
         match self {
             Self::WrongSecret => (StatusCode::UNAUTHORIZED, "Wrong credentials"),
             Self::MissingSecret => (StatusCode::BAD_REQUEST, "Missing credentials"),
-            Self::Config(err) => {
-                error!("server error: {}", err.to_string());
-                (StatusCode::INTERNAL_SERVER_ERROR, "Server Error")
-            },
             Self::HeaderToStr(err) => {
                 error!("server error: {}", err.to_string());
                 (StatusCode::INTERNAL_SERVER_ERROR, "Server Error")