Merge remote-tracking branch 'origin/main' into mobile-app

moneymgr_backend/src/connections/s3_connection.rs

@@ -30,7 +30,7 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
             log::warn!("The bucket does not seem to exists, trying to create it!")
         }
         Err(e) => {
-            log::error!("Got unexpected error when querying bucket info: {}", e);
+            log::error!("Got unexpected error when querying bucket info: {e}");
             return Err(BucketServiceError::FailedFetchBucketInfo.into());
         }
     }

moneymgr_backend/src/extractors/account_extractor.rs

@@ -50,7 +50,7 @@ impl FromRequest for AccountInPath {
             Self::load_account_from_path(&auth, account_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract account ID from URL! {}", e);
+                    log::error!("Failed to extract account ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch account information!")
                 })
         })

moneymgr_backend/src/extractors/auth_extractor.rs

@@ -165,13 +165,13 @@ impl FromRequest for AuthExtractor {
                 // Update last use (if needed)
                 if token.shall_update_time_used() {
                     if let Err(e) = tokens_service::update_time_used(&token).await {
-                        log::error!("Failed to refresh last usage of token! {}", e);
+                        log::error!("Failed to refresh last usage of token! {e}");
                     }
                 }
 
                 // Handle tokens expiration
                 if token.is_expired() {
-                    log::error!("Attempted to use expired token! {:?}", token);
+                    log::error!("Attempted to use expired token! {token:?}");
                     return Err(actix_web::error::ErrorBadRequest("Token has expired!"));
                 }
 

moneymgr_backend/src/extractors/file_id_extractor.rs

@@ -47,7 +47,7 @@ impl FromRequest for FileIdExtractor {
             Self::load_file_from_path(&auth, file_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract file ID from URL! {}", e);
+                    log::error!("Failed to extract file ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch file information!")
                 })
         })

moneymgr_backend/src/extractors/inbox_entry_extractor.rs

@@ -50,7 +50,7 @@ impl FromRequest for InboxEntryInPath {
             Self::load_inbox_entry_from_path(&auth, entry_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract inbox entry ID from URL! {}", e);
+                    log::error!("Failed to extract inbox entry ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch inbox entry information!")
                 })
         })

moneymgr_backend/src/extractors/movement_extractor.rs

@@ -57,7 +57,7 @@ impl FromRequest for MovementInPath {
             Self::load_movement_from_path(&auth, account_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract movement ID from URL! {}", e);
+                    log::error!("Failed to extract movement ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch movement information!")
                 })
         })

moneymgr_web/src/api/ApiClient.ts

@@ -31,12 +31,21 @@ export class APIClient {
     return URL;
   }
 
+  /**
+   * Get the full URL at which the backend can be contacted
+   */
+  static ActualBackendURL(): string {
+    const backendURL = this.backendURL();
+    if (backendURL.startsWith("/")) return `${location.origin}${backendURL}`;
+    else return backendURL;
+  }
+
   /**
    * Check out whether the backend is accessed through
    * HTTPS or not
    */
   static IsBackendSecure(): boolean {
-    return this.backendURL().startsWith("https");
+    return this.ActualBackendURL().startsWith("https");
   }
 
   /**

moneymgr_web/src/routes/TokensRoute.tsx

@@ -268,7 +268,7 @@ function CreatedToken(p: { token: TokenWithSecret }): React.ReactElement {
           <div style={{ padding: "15px", backgroundColor: "white" }}>
             <QRCodeCanvas
               value={`moneymgr://api=${encodeURIComponent(
-                APIClient.backendURL()
+                APIClient.ActualBackendURL()
               )}&id=${p.token.id}&secret=${p.token.token}`}
             />
           </div>