fix: update expiry date in db

Author: ChristianBeilschmidt

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "wildlive-token-refresher"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2024"
 publish = false
 authors = [

Cargo.toml

@@ -2,6 +2,7 @@ use std::time::Duration;
 
 use anyhow::Result;
 use indoc::indoc;
+use time::OffsetDateTime;
 use tokio_postgres::{Client, NoTls};
 use tracing::error;
 use uuid::Uuid;
@@ -32,7 +33,7 @@ impl Database {
     pub async fn get_refresh_tokens(
         &self,
         comparison_duration: Duration,
-    ) -> Result<Vec<IdTokenPair>> {
+    ) -> Result<Vec<ConnectorRefreshToken>> {
         let now = time::OffsetDateTime::now_utc();
         let comparison_duration = time::Duration::try_from(comparison_duration)?;
         let now_plus_duration = now.saturating_add(comparison_duration);
@@ -43,7 +44,8 @@ impl Database {
                 indoc! {"
                 SELECT
                     id,
-                    (((definition).wildlive_data_connector_definition).auth).refresh_token AS refresh_token
+                    (((definition).wildlive_data_connector_definition).auth).refresh_token AS refresh_token,
+                    (((definition).wildlive_data_connector_definition).auth).expiry_date AS expiry_date
                 FROM
                     layer_providers
                 WHERE
@@ -62,9 +64,10 @@ impl Database {
         results
             .iter()
             .map(|row| {
-                Ok(IdTokenPair {
+                Ok(ConnectorRefreshToken {
                     id: row.try_get("id")?,
                     refresh_token: row.try_get("refresh_token")?,
+                    expiry_date: row.try_get::<_, time::OffsetDateTime>("expiry_date")?,
                 })
             })
             .collect()
@@ -73,27 +76,33 @@ impl Database {
     // TODO: bulk insert multiple tokens at once
     pub async fn update_refresh_token(
         &self,
-        IdTokenPair { id, refresh_token }: IdTokenPair,
+        ConnectorRefreshToken {
+            id,
+            refresh_token,
+            expiry_date,
+        }: ConnectorRefreshToken,
     ) -> Result<()> {
         self.client
             .execute(
                 indoc! {"
                 UPDATE
                     layer_providers
                 SET
-                    definition.wildlive_data_connector_definition.auth.refresh_token = $2
+                    definition.wildlive_data_connector_definition.auth.refresh_token = $2,
+                    definition.wildlive_data_connector_definition.auth.expiry_date = $3
                 WHERE
                     id = $1
                 "},
-                &[&id, &refresh_token],
+                &[&id, &refresh_token, &expiry_date],
             )
             .await?;
         Ok(())
     }
 }
 
 #[derive(Debug)]
-pub struct IdTokenPair {
+pub struct ConnectorRefreshToken {
     pub id: Uuid,
     pub refresh_token: String,
+    pub expiry_date: OffsetDateTime,
 }

src/database.rs

@@ -1,6 +1,6 @@
 use crate::{
     config::CONFIG,
-    database::{Database, IdTokenPair},
+    database::{ConnectorRefreshToken, Database},
     oidc::{retrieve_access_and_refresh_token, retrieve_jwks},
 };
 use anyhow::{Context, Result};
@@ -166,12 +166,21 @@ async fn refresh_tokens(refresh_interval: Duration) -> Result<()> {
 
     let mut num_updated = 0;
 
-    for IdTokenPair { id, refresh_token } in database.get_refresh_tokens(refresh_interval).await? {
+    for ConnectorRefreshToken {
+        id,
+        refresh_token,
+        expiry_date,
+    } in database.get_refresh_tokens(refresh_interval).await?
+    {
         match refresh_tokens_for_provider(
             &database,
             &http_client,
             jwks.clone(),
-            IdTokenPair { id, refresh_token },
+            ConnectorRefreshToken {
+                id,
+                refresh_token,
+                expiry_date,
+            },
         )
         .await
         {
@@ -194,20 +203,29 @@ async fn refresh_tokens_for_provider(
     database: &Database,
     http_client: &reqwest::Client,
     jwks: JsonWebKeySet<CoreJsonWebKey>,
-    IdTokenPair { id, refresh_token }: IdTokenPair,
+    ConnectorRefreshToken {
+        id,
+        refresh_token,
+        expiry_date: _,
+    }: ConnectorRefreshToken,
 ) -> Result<()> {
-    let new_pair = IdTokenPair {
+    let token_response = retrieve_access_and_refresh_token(
+        http_client,
+        &CONFIG.oidc,
+        jwks.clone(),
+        &RefreshToken::new(refresh_token),
+    )
+    .await?;
+
+    let now = time::OffsetDateTime::now_utc();
+    let expiry_duration = time::Duration::seconds(token_response.expires_in as i64);
+    let expiry_date = now.saturating_add(expiry_duration);
+
+    let connector_refresh_token = ConnectorRefreshToken {
         id,
-        refresh_token: retrieve_access_and_refresh_token(
-            http_client,
-            &CONFIG.oidc,
-            jwks.clone(),
-            &RefreshToken::new(refresh_token),
-        )
-        .await?
-        .refresh_token
-        .into_secret(),
+        refresh_token: token_response.refresh_token.into_secret(),
+        expiry_date,
     };
 
-    database.update_refresh_token(new_pair).await
+    database.update_refresh_token(connector_refresh_token).await
 }