Merge e9b3de2342 into cb3551dcd4

src/types/utils/jwt.rs

@@ -3,7 +3,10 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use crate::types::utils::Snowflake;
-use jsonwebtoken::{encode, EncodingKey, Header};
+use jsonwebtoken::errors::Error;
+use jsonwebtoken::{
+    decode, encode, Algorithm, DecodingKey, EncodingKey, Header, TokenData, Validation,
+};
 use serde::{Deserialize, Serialize};
 
 pub fn generate_token(id: &Snowflake, email: String, jwt_key: &str) -> String {
@@ -42,8 +45,13 @@ pub fn build_token(claims: &Claims, jwt_key: &str) -> Result<String, jsonwebtoke
     )
 }
 
-/*pub fn decode_token(token: &str) -> Result<TokenData<Claims>, Error> {
+pub fn decode_token(token: &str, jwt_secret: &str) -> Result<TokenData<Claims>, Error> {
     let mut validation = Validation::new(Algorithm::HS256);
-    validation.sub = Some("quartzauth".to_string());
-    decode(token, &DecodingKey::from_secret(JWT_SECRET), &validation)
-}*/
+    //TODO: What is this?
+    //validation.sub = Some("quartzauth".to_string());
+    decode(
+        token,
+        &DecodingKey::from_secret(jwt_secret.as_bytes()),
+        &validation,
+    )
+}