SKU sdk - update credential matching logic (uplift to 1.58.x) (#20199)

Uplift of #20192 (squashed) to release
brave · Sep 20, 2023 · 12b6d88 · 12b6d88
1 parent c42f5e8
commit 12b6d88
Show file tree

Hide file tree

Showing 2 changed files with 144 additions and 162 deletions.
diff --git a/components/skus/browser/rs/lib/src/sdk/credentials/mod.rs b/components/skus/browser/rs/lib/src/sdk/credentials/mod.rs
@@ -2,7 +2,7 @@ mod fetch;
 mod present;
 
 use chrono::Utc;
-use tracing::instrument;
+use tracing::{error, instrument};
 
 use crate::errors::{InternalError, SkusError};
 use crate::models::*;
@@ -49,9 +49,10 @@ where
                     if let Some(expires_at) = expires_at {
                         // attempt to refresh credentials if we're within 5 days of expiry
                         if Utc::now().naive_utc() > (expires_at - chrono::Duration::days(5)) {
+                            error!("Within 5 days of expiry; refreshing order credentials.");
                             let refreshed = self.refresh_order_credentials(order_id).await;
                             if refreshed.is_err() {
-                                continue;
+                                error!("Error refreshing order credentials.");
                             }
                         }
                     }
@@ -70,6 +71,8 @@ where
                             active,
                         }));
                     }
+
+                    error!("No matches found for credential summary.");
                 }
                 CredentialType::SingleUse => {
                     let wrapped_creds = self.client.get_single_use_item_creds(&item.id).await?;
@@ -101,23 +104,24 @@ where
                     if let Some(expires_at) = expires_at {
                         // attempt to refresh credentials if we're within 5 days of expiry
                         if Utc::now().naive_utc() > (expires_at - chrono::Duration::days(5)) {
+                            error!("Within 5 days of expiry; refreshing order credentials.");
                             let refreshed = self.refresh_order_credentials(order_id).await;
                             if refreshed.is_err() {
-                                continue;
+                                error!("Error refreshing order credentials.");
                             }
                         }
                     }
-                    let active = matches!(
-                        self.matching_time_limited_credential(&item.id).await,
-                        Ok(Some(_))
-                    );
-
-                    return Ok(Some(CredentialSummary {
-                        order,
-                        remaining_credential_count: 1,
-                        expires_at,
-                        active,
-                    }));
+
+                    if let Ok(Some(_)) = self.matching_time_limited_credential(&item.id).await {
+                        return Ok(Some(CredentialSummary {
+                            order,
+                            remaining_credential_count: 1,
+                            expires_at,
+                            active: true,
+                        }));
+                    }
+
+                    error!("No matches found for credential summary.");
                 }
             };
         } // for