Skip to content

Commit 80dd8e7

Browse files
authored
fix: correct jwt spec (#41)
1 parent c7f71f4 commit 80dd8e7

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/main.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,14 @@ async fn login(payload: Json<LoginPayload>) -> impl Responder {
223223
.unwrap();
224224

225225
if is_valid {
226-
let expiry_date = SystemTime::now()
226+
let exp = SystemTime::now()
227227
.duration_since(UNIX_EPOCH)
228228
.unwrap()
229-
.as_millis()
230-
+ 24 * 60 * 60 * 1000;
229+
.as_secs()
230+
+ 24 * 60 * 60;
231231
let claims = TokenClaims {
232232
id: database_user.id,
233-
expiry_date,
233+
exp,
234234
};
235235
let token_str = claims.sign_with_key(&jwt_secret).unwrap();
236236

@@ -849,13 +849,13 @@ mod tests {
849849
)
850850
.unwrap();
851851

852-
let expiry_date = SystemTime::now()
852+
let exp = SystemTime::now()
853853
.duration_since(UNIX_EPOCH)
854854
.unwrap()
855-
.as_millis()
856-
// 24 hours in present
857-
- 24 * 60 * 60 * 1000;
858-
let claims = TokenClaims { id: 1, expiry_date };
855+
.as_secs()
856+
// 24 hours in past
857+
- 24 * 60 * 60;
858+
let claims = TokenClaims { id: 1, exp };
859859
let token_str = claims.sign_with_key(&jwt_secret).unwrap();
860860

861861
let mut db = DataBase::new();
@@ -896,12 +896,12 @@ mod tests {
896896
)
897897
.unwrap();
898898

899-
let expiry_date = SystemTime::now()
899+
let exp = SystemTime::now()
900900
.duration_since(UNIX_EPOCH)
901901
.unwrap()
902-
.as_millis()
903-
+ 24 * 60 * 60 * 60 * 1000;
904-
let claims = TokenClaims { id: 1, expiry_date };
902+
.as_secs()
903+
+ 24 * 60 * 60;
904+
let claims = TokenClaims { id: 1, exp };
905905
let token_str = claims.sign_with_key(&jwt_secret).unwrap();
906906

907907
let mut db = DataBase::new();

src/middleware.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ pub async fn validator(
3939

4040
match claims {
4141
Ok(value) => {
42-
if value.expiry_date
42+
if value.exp
4343
< SystemTime::now()
4444
.duration_since(UNIX_EPOCH)
4545
.unwrap()
46-
.as_millis()
46+
.as_secs()
4747
{
4848
let config = Config::default().scope("");
4949

src/models.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ pub struct NewUser {
113113
#[derive(Serialize, Deserialize)]
114114
pub struct TokenClaims {
115115
pub id: i32,
116-
pub expiry_date: u128,
116+
pub exp: u64,
117117
}
118118

119119
#[derive(Serialize, Deserialize, Queryable, Debug)]

0 commit comments

Comments
 (0)