Update dependencies + refactor code

Author: SakaDream

Cargo.toml

@@ -7,21 +7,20 @@ edition = "2018"
 [dependencies]
 actix-web = "2.0.0"
 actix-rt = "1.0.0"
-actix-service = "1.0.1"
+actix-service = "1.0.5"
 actix-cors = "0.2.0"
 log = "0.4.8"
 env_logger = "0.7.1"
 diesel_migrations = "1.4.0"
 serde = "1.0.104"
 serde_derive = "1.0.104"
-serde_json = "1.0.44"
+serde_json = "1.0.48"
 dotenv = "0.15.0"
-futures = "0.3.1"
+futures = "0.3.4"
 failure = "0.1.6"
-derive_more = "0.99.2"
-jsonwebtoken = "6.0.1"
+derive_more = "0.99.3"
+jsonwebtoken = "7.1.0"
 bcrypt = "0.6.1"
-time = "0.2.1"
 
 [dependencies.diesel]
 version = "1.4.3"

src/main.rs

@@ -23,7 +23,6 @@ extern crate derive_more;
 extern crate jsonwebtoken;
 extern crate uuid;
 extern crate bcrypt;
-extern crate time;
 
 mod api;
 mod config;

src/models/user_token.rs

@@ -1,9 +1,12 @@
 use crate::models::user::LoginInfoDTO;
-use jsonwebtoken::Header;
-use time::PrimitiveDateTime;
+use chrono::Utc;
+use jsonwebtoken::{
+    EncodingKey,
+    Header
+};
 
 pub static KEY: [u8; 16] = *include_bytes!("../secret.key");
-static ONE_WEEK: i64 = 60 * 60 * 24 * 7;
+static ONE_WEEK: i64 = 60 * 60 * 24 * 7; // in seconds
 
 #[derive(Serialize, Deserialize)]
 pub struct UserToken {
@@ -18,14 +21,14 @@ pub struct UserToken {
 
 impl UserToken {
     pub fn generate_token(login: LoginInfoDTO) -> String {
-        let now = PrimitiveDateTime::now().timestamp();
+        let now = Utc::now().timestamp_nanos() / 1_000_000_000; // nanosecond -> second
         let payload = UserToken {
             iat: now,
             exp: now + ONE_WEEK,
             user: login.username,
             login_session: login.login_session,
         };
 
-        jsonwebtoken::encode(&Header::default(), &payload, &KEY).unwrap()
+        jsonwebtoken::encode(&Header::default(), &payload, &EncodingKey::from_secret(&KEY)).unwrap()
     }
 }

src/utils/token_utils.rs

@@ -6,10 +6,10 @@ use crate::{
     },
 };
 use actix_web::web;
-use jsonwebtoken::{TokenData, Validation};
+use jsonwebtoken::{DecodingKey, TokenData, Validation};
 
 pub fn decode_token(token: String) -> jsonwebtoken::errors::Result<TokenData<UserToken>> {
-    jsonwebtoken::decode::<UserToken>(&token, &KEY, &Validation::default())
+    jsonwebtoken::decode::<UserToken>(&token, &DecodingKey::from_secret(&KEY), &Validation::default())
 }
 
 pub fn verify_token(token_data: &TokenData<UserToken>, pool: &web::Data<Pool>) -> Result<String, String> {