manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Corrige localización errores NOT_FOUND y FORBIDDEN

Browse source
This commit is contained in:
Manuel Cillero 2022-07-23 08:00:42 +02:00
parent aa3f0cf79a
commit bd5ccdef8a
2 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pagetop/src/app/application.rs
View file

@ -2,7 +2,7 @@ use super::{fatal_error::FatalError, AppTrait};
use crate::config::SETTINGS; use crate::config::SETTINGS;
use crate::core::{module, theme}; use crate::core::{module, theme};
use crate::html::Markup; use crate::html::Markup;
use crate::response::page::{Page, ResultPage}; use crate::response::page::ResultPage;
use crate::{base, trace, Lazy}; use crate::{base, trace, Lazy};
use actix_web::dev::Server; use actix_web::dev::Server;
@ -76,21 +76,5 @@ impl Application {
} }
async fn service_not_found() -> ResultPage<Markup, FatalError> { async fn service_not_found() -> ResultPage<Markup, FatalError> {
let mut page = Page::new(); Err(FatalError::NotFound)
let content_error = page.context().theme().error_404_not_found();
page
.with_title("Error RESOURCE NOT FOUND")
.using_template("error")
.add_to("content", content_error)
.render()
}
async fn _access_denied() -> ResultPage<Markup, FatalError> {
let mut page = Page::new();
let content_error = page.context().theme().error_403_access_denied();
page
.with_title("Error FORBIDDEN ACCESS")
.using_template("error")
.add_to("content", content_error)
.render()
} }

34
pagetop/src/app/fatal_error.rs
View file

@ -1,11 +1,13 @@
use crate::app::HttpResponse; use crate::app::HttpResponse;
use crate::app::http::{header::ContentType, StatusCode}; use crate::app::http::{header::ContentType, StatusCode};
use crate::response::ResponseError; use crate::response::{page::Page, ResponseError};
use std::fmt; use std::fmt;
#[derive(Debug)] #[derive(Debug)]
pub enum FatalError { pub enum FatalError {
NotFound,
AccessDenied,
InternalError, InternalError,
BadClientData, BadClientData,
Timeout, Timeout,
@ -14,6 +16,34 @@ pub enum FatalError {
impl fmt::Display for FatalError { impl fmt::Display for FatalError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self { match *self {
FatalError::NotFound => {
let mut error_page = Page::new();
let error_content = error_page.context().theme().error_404_not_found();
if let Ok(page) = error_page
.with_title("Error RESOURCE NOT FOUND")
.using_template("error")
.add_to("content", error_content)
.render()
{
write!(f, "{}", page.into_string())
} else {
write!(f, "Not Found")
}
},
FatalError::AccessDenied => {
let mut error_page = Page::new();
let error_content = error_page.context().theme().error_403_access_denied();
if let Ok(page) = error_page
.with_title("Error FORBIDDEN")
.using_template("error")
.add_to("content", error_content)
.render()
{
write!(f, "{}", page.into_string())
} else {
write!(f, "Access Denied")
}
},
FatalError::InternalError => write!(f, "Internal Error"), FatalError::InternalError => write!(f, "Internal Error"),
FatalError::BadClientData => write!(f, "Bad Client Data"), FatalError::BadClientData => write!(f, "Bad Client Data"),
FatalError::Timeout => write!(f, "Timeout"), FatalError::Timeout => write!(f, "Timeout"),
@ -30,6 +60,8 @@ impl ResponseError for FatalError {
fn status_code(&self) -> StatusCode { fn status_code(&self) -> StatusCode {
match *self { match *self {
FatalError::NotFound => StatusCode::NOT_FOUND,
FatalError::AccessDenied => StatusCode::FORBIDDEN,
FatalError::InternalError => StatusCode::INTERNAL_SERVER_ERROR, FatalError::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
FatalError::BadClientData => StatusCode::BAD_REQUEST, FatalError::BadClientData => StatusCode::BAD_REQUEST,
FatalError::Timeout => StatusCode::GATEWAY_TIMEOUT, FatalError::Timeout => StatusCode::GATEWAY_TIMEOUT,