Compare commits
3 Commits
9b14a28d86
...
renovate/e
Author | SHA1 | Date | |
---|---|---|---|
be62a19a7e | |||
1781318fdf | |||
2560962684 |
@ -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());
|
||||
}
|
||||
}
|
||||
|
@ -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!")
|
||||
})
|
||||
})
|
||||
|
@ -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!"));
|
||||
}
|
||||
|
||||
|
@ -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!")
|
||||
})
|
||||
})
|
||||
|
@ -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!")
|
||||
})
|
||||
})
|
||||
|
@ -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!")
|
||||
})
|
||||
})
|
||||
|
1008
moneymgr_web/package-lock.json
generated
1008
moneymgr_web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -36,7 +36,7 @@
|
||||
"@types/react": "^19.1.8",
|
||||
"@types/react-dom": "^19.1.6",
|
||||
"@vitejs/plugin-react": "^4.6.0",
|
||||
"eslint": "^9.26.0",
|
||||
"eslint": "^9.30.1",
|
||||
"eslint-plugin-react-dom": "^1.49.0",
|
||||
"eslint-plugin-react-hooks": "^5.2.0",
|
||||
"eslint-plugin-react-refresh": "^00.4.20",
|
||||
|
@ -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");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user