mirror of https://github.com/realaravinth/gitpad
feat: register template renders errors
parent
5c9a96dfab
commit
2a8df0ebb8
|
@ -15,20 +15,45 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
use actix_web::http::header::ContentType;
|
use actix_web::http::header::ContentType;
|
||||||
|
use std::cell::RefCell;
|
||||||
|
use tera::Context;
|
||||||
|
|
||||||
|
use crate::data::api::v1::auth::Register as RegisterPayload;
|
||||||
|
use crate::pages::errors::*;
|
||||||
use crate::settings::Settings;
|
use crate::settings::Settings;
|
||||||
use crate::AppData;
|
use crate::AppData;
|
||||||
|
|
||||||
pub use super::*;
|
pub use super::*;
|
||||||
|
|
||||||
pub struct Register;
|
|
||||||
|
|
||||||
pub const REGISTER: &str = "register";
|
pub const REGISTER: &str = "register";
|
||||||
|
|
||||||
|
pub struct Register {
|
||||||
|
ctx: RefCell<Context>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CtxError for Register {
|
||||||
|
fn with_error(&self, e: &ReadableError) -> String {
|
||||||
|
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||||
|
self.render()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Register {
|
impl Register {
|
||||||
|
fn new(settings: &Settings, payload: Option<&RegisterPayload>) -> Self {
|
||||||
|
let ctx = RefCell::new(context(settings));
|
||||||
|
if let Some(payload) = payload {
|
||||||
|
ctx.borrow_mut().insert(PAYLOAD_KEY, payload);
|
||||||
|
}
|
||||||
|
Self { ctx }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn render(&self) -> String {
|
||||||
|
TEMPLATES.render(REGISTER, &self.ctx.borrow()).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn page(s: &Settings) -> String {
|
pub fn page(s: &Settings) -> String {
|
||||||
let ctx = context(s);
|
let p = Self::new(s, None);
|
||||||
TEMPLATES.render(REGISTER, &ctx).unwrap()
|
p.render()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,109 +68,26 @@ pub fn services(cfg: &mut web::ServiceConfig) {
|
||||||
cfg.service(get_register);
|
cfg.service(get_register);
|
||||||
}
|
}
|
||||||
|
|
||||||
//#[post(path = "PAGES.auth.login")]
|
#[cfg(test)]
|
||||||
//pub async fn login_submit(
|
mod tests {
|
||||||
// id: Identity,
|
use super::Register;
|
||||||
// payload: web::Form<runners::Login>,
|
use super::RegisterPayload;
|
||||||
// data: AppData,
|
use crate::errors::*;
|
||||||
//) -> PageResult<impl Responder> {
|
use crate::pages::errors::*;
|
||||||
// let payload = payload.into_inner();
|
use crate::settings::Settings;
|
||||||
// match runners::login_runner(&payload, &data).await {
|
|
||||||
// Ok(username) => {
|
#[test]
|
||||||
// id.remember(username);
|
fn register_page_renders() {
|
||||||
// Ok(HttpResponse::Found()
|
let settings = Settings::new().unwrap();
|
||||||
// .insert_header((header::LOCATION, PAGES.home))
|
Register::page(&settings);
|
||||||
// .finish())
|
let payload = RegisterPayload {
|
||||||
// }
|
username: "foo".into(),
|
||||||
// Err(e) => {
|
password: "foo".into(),
|
||||||
// let status = e.status_code();
|
confirm_password: "foo".into(),
|
||||||
// let heading = status.canonical_reason().unwrap_or("Error");
|
email: Some("foo".into()),
|
||||||
//
|
};
|
||||||
// Ok(HttpResponseBuilder::new(status)
|
let page = Register::new(&settings, Some(&payload));
|
||||||
// .content_type("text/html; charset=utf-8")
|
page.with_error(&ReadableError::new(&ServiceError::WrongPassword));
|
||||||
// .body(
|
page.render();
|
||||||
// IndexPage::new(heading, &format!("{}", e))
|
}
|
||||||
// .render_once()
|
}
|
||||||
// .unwrap(),
|
|
||||||
// ))
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//#[cfg(test)]
|
|
||||||
//mod tests {
|
|
||||||
// use actix_web::test;
|
|
||||||
//
|
|
||||||
// use super::*;
|
|
||||||
//
|
|
||||||
// use crate::api::v1::auth::runners::{Login, Register};
|
|
||||||
// use crate::data::Data;
|
|
||||||
// use crate::tests::*;
|
|
||||||
// use crate::*;
|
|
||||||
// use actix_web::http::StatusCode;
|
|
||||||
//
|
|
||||||
// #[actix_rt::test]
|
|
||||||
// async fn auth_form_works() {
|
|
||||||
// let data = Data::new().await;
|
|
||||||
// const NAME: &str = "testuserform";
|
|
||||||
// const PASSWORD: &str = "longpassword";
|
|
||||||
//
|
|
||||||
// let app = get_app!(data).await;
|
|
||||||
//
|
|
||||||
// delete_user(NAME, &data).await;
|
|
||||||
//
|
|
||||||
// // 1. Register with email == None
|
|
||||||
// let msg = Register {
|
|
||||||
// username: NAME.into(),
|
|
||||||
// password: PASSWORD.into(),
|
|
||||||
// confirm_password: PASSWORD.into(),
|
|
||||||
// email: None,
|
|
||||||
// };
|
|
||||||
// let resp = test::call_service(
|
|
||||||
// &app,
|
|
||||||
// post_request!(&msg, V1_API_ROUTES.auth.register).to_request(),
|
|
||||||
// )
|
|
||||||
// .await;
|
|
||||||
// assert_eq!(resp.status(), StatusCode::OK);
|
|
||||||
//
|
|
||||||
// // correct form login
|
|
||||||
// let msg = Login {
|
|
||||||
// login: NAME.into(),
|
|
||||||
// password: PASSWORD.into(),
|
|
||||||
// };
|
|
||||||
//
|
|
||||||
// let resp = test::call_service(
|
|
||||||
// &app,
|
|
||||||
// post_request!(&msg, PAGES.auth.login, FORM).to_request(),
|
|
||||||
// )
|
|
||||||
// .await;
|
|
||||||
// assert_eq!(resp.status(), StatusCode::FOUND);
|
|
||||||
// let headers = resp.headers();
|
|
||||||
// assert_eq!(headers.get(header::LOCATION).unwrap(), PAGES.home,);
|
|
||||||
//
|
|
||||||
// // incorrect form login
|
|
||||||
// let msg = Login {
|
|
||||||
// login: NAME.into(),
|
|
||||||
// password: NAME.into(),
|
|
||||||
// };
|
|
||||||
// let resp = test::call_service(
|
|
||||||
// &app,
|
|
||||||
// post_request!(&msg, PAGES.auth.login, FORM).to_request(),
|
|
||||||
// )
|
|
||||||
// .await;
|
|
||||||
// assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
|
|
||||||
//
|
|
||||||
// // non-existent form login
|
|
||||||
// let msg = Login {
|
|
||||||
// login: PASSWORD.into(),
|
|
||||||
// password: PASSWORD.into(),
|
|
||||||
// };
|
|
||||||
// let resp = test::call_service(
|
|
||||||
// &app,
|
|
||||||
// post_request!(&msg, PAGES.auth.login, FORM).to_request(),
|
|
||||||
// )
|
|
||||||
// .await;
|
|
||||||
// assert_eq!(resp.status(), StatusCode::NOT_FOUND);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
{% block title_name %}Sign Up {% endblock %}
|
{% block title_name %}Sign Up {% endblock %}
|
||||||
{% block login %}
|
{% block login %}
|
||||||
<h2>Sign Up</h2>
|
<h2>Sign Up</h2>
|
||||||
|
{% include "error_comp" %}
|
||||||
<form action="{{ page.auth.register }}" method="POST" class="form" accept-charset="utf-8">
|
<form action="{{ page.auth.register }}" method="POST" class="form" accept-charset="utf-8">
|
||||||
<label class="form__label" for="username">
|
<label class="form__label" for="username">
|
||||||
Username
|
Username
|
||||||
|
|
Loading…
Reference in New Issue