fix: do not expose expiry_notification_at to the API

Author: 0xPoe

src/models/token.rs

@@ -30,8 +30,6 @@ pub struct ApiToken {
     pub endpoint_scopes: Option<Vec<EndpointScope>>,
     #[serde(with = "rfc3339::option")]
     pub expired_at: Option<NaiveDateTime>,
-    #[serde(with = "rfc3339::option")]
-    pub expiry_notification_at: Option<NaiveDateTime>,
 }
 
 impl ApiToken {
@@ -127,7 +125,6 @@ mod tests {
             crate_scopes: None,
             endpoint_scopes: None,
             expired_at: None,
-            expiry_notification_at: None,
         };
         let json = serde_json::to_string(&tok).unwrap();
         assert_some!(json

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__create__create_token_success.snap

@@ -1,14 +1,13 @@
 ---
 source: src/tests/routes/me/tokens/create.rs
-expression: response.json()
+expression: response.into_json()
 ---
 {
   "api_token": {
     "crate_scopes": null,
     "created_at": "[datetime]",
     "endpoint_scopes": null,
     "expired_at": null,
-    "expiry_notification_at": null,
     "id": "[id]",
     "last_used_at": "[datetime]",
     "name": "bar",

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__create__create_token_with_expiry_date.snap

@@ -1,14 +1,13 @@
 ---
 source: src/tests/routes/me/tokens/create.rs
-expression: response.json()
+expression: response.into_json()
 ---
 {
   "api_token": {
     "crate_scopes": null,
     "created_at": "[datetime]",
     "endpoint_scopes": null,
     "expired_at": "2024-12-24T07:34:56+00:00",
-    "expiry_notification_at": null,
     "id": "[id]",
     "last_used_at": "[datetime]",
     "name": "bar",

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__create__create_token_with_null_scopes.snap

@@ -1,14 +1,13 @@
 ---
 source: src/tests/routes/me/tokens/create.rs
-expression: response.json()
+expression: response.into_json()
 ---
 {
   "api_token": {
     "crate_scopes": null,
     "created_at": "[datetime]",
     "endpoint_scopes": null,
     "expired_at": null,
-    "expiry_notification_at": null,
     "id": "[id]",
     "last_used_at": "[datetime]",
     "name": "bar",

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__create__create_token_with_scopes.snap

@@ -1,6 +1,6 @@
 ---
 source: src/tests/routes/me/tokens/create.rs
-expression: response.json()
+expression: response.into_json()
 ---
 {
   "api_token": {
@@ -13,7 +13,6 @@ expression: response.json()
       "publish-update"
     ],
     "expired_at": null,
-    "expiry_notification_at": null,
     "id": "[id]",
     "last_used_at": "[datetime]",
     "name": "bar",

src/tests/routes/me/tokens/snapshots/all__routes__me__tokens__list__list_tokens.snap

@@ -1,6 +1,6 @@
 ---
 source: src/tests/routes/me/tokens/list.rs
-expression: response.json()
+expression: response.into_json()
 ---
 {
   "api_tokens": [
@@ -14,7 +14,6 @@ expression: response.json()
         "publish-update"
       ],
       "expired_at": null,
-      "expiry_notification_at": null,
       "id": "[id]",
       "last_used_at": "[datetime]",
       "name": "baz"
@@ -24,7 +23,6 @@ expression: response.json()
       "created_at": "[datetime]",
       "endpoint_scopes": null,
       "expired_at": null,
-      "expiry_notification_at": null,
       "id": "[id]",
       "last_used_at": "[datetime]",
       "name": "bar"

src/worker/jobs/expiry_notification.rs

@@ -183,11 +183,12 @@ mod tests {
         let sent = &sent_mail[0];
         assert_eq!(&sent.0.to(), &["[email protected]".parse::<Address>()?]);
         assert!(sent.1.contains("Your token is about to expire"));
-        let update_token = api_tokens::table
+        let updated_token = api_tokens::table
             .filter(api_tokens::id.eq(token.id))
+            .filter(api_tokens::expiry_notification_at.is_not_null())
             .select(ApiToken::as_select())
             .first::<ApiToken>(&mut conn)?;
-        assert!(update_token.expiry_notification_at.is_some());
+        assert_eq!(updated_token.name, "test_token".to_owned());
 
         // Check that the token is not about to expire.
         let tokens = api_tokens::table