Merge pull request #22 from SakaDream:update-dependencies

Update Dependencies

Author: SakaDream

Cargo.toml

@@ -5,20 +5,20 @@ authors = ["SakaDream <bahaimt@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-actix-web = "2.0.0"
+actix-web = "3.0.0"
 actix-rt = "1.1.1"
 actix-service = "1.0.6"
-actix-cors = "0.2.0"
+actix-cors = "0.3.0"
 log = "0.4.11"
 env_logger = "0.7.1"
 diesel_migrations = "1.4.0"
-serde = "1.0.115"
-serde_derive = "1.0.115"
+serde = "1.0.116"
+serde_derive = "1.0.116"
 serde_json = "1.0.57"
 dotenv = "0.15.0"
 futures = "0.3.5"
 failure = "0.1.8"
-derive_more = "0.99.9"
+derive_more = "0.99.10"
 jsonwebtoken = "7.2.0"
 bcrypt = "0.8.2"
 

src/middleware/authen_middleware.rs

@@ -1,9 +1,10 @@
 use crate::{config::db::Pool, constants, models::response::ResponseBody, utils::token_utils};
 use actix_service::{Service, Transform};
 use actix_web::{
-    http::{Method},
-    dev::{ServiceRequest, ServiceResponse},
     Error, HttpResponse,
+    dev::{ServiceRequest, ServiceResponse},
+    http::{Method, HeaderName, HeaderValue},
+    web::Data,
 };
 use futures::{
     future::{ok, Ready},
@@ -13,7 +14,6 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
-use actix_web::http::header::{HeaderName, HeaderValue};
 
 pub struct Authentication;
 
@@ -68,17 +68,17 @@ where
                 }
             }
             if !authenticate_pass {
-                if let Some(pool) = req.app_data::<Pool>() {
+                if let Some(pool) = req.app_data::<Data<Pool>>() {
                     info!("Connecting to database...");
-                    if let Some(authen_header) = req.headers_mut().get(constants::AUTHORIZATION) {
+                    if let Some(authen_header) = req.headers().get(constants::AUTHORIZATION) {
                         info!("Parsing authorization header...");
                         if let Ok(authen_str) = authen_header.to_str() {
                             if authen_str.starts_with("bearer") || authen_str.starts_with("Bearer") {
                                 info!("Parsing token...");
                                 let token = authen_str[6..authen_str.len()].trim();
                                 if let Ok(token_data) = token_utils::decode_token(token.to_string()) {
                                     info!("Decoding token...");
-                                    if token_utils::verify_token(&token_data, &pool).is_ok() {
+                                    if token_utils::verify_token(&token_data, pool).is_ok() {
                                         info!("Valid token");
                                         authenticate_pass = true;
                                     } else {