feat: port join page to tera
This commit is contained in:
parent
23330a29a7
commit
c645bf83a3
GPG key ID:
AD9F0F08E855ED88
3 changed files with 115 additions and 98 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
|
@ -14,76 +14,81 @@
|
|||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use actix_web::HttpResponseBuilder;
|
||||
use actix_web::{error::ResponseError, http::header, web, HttpResponse, Responder};
|
||||
use lazy_static::lazy_static;
|
||||
use sailfish::TemplateOnce;
|
||||
use actix_web::http::header::ContentType;
|
||||
use std::cell::RefCell;
|
||||
use tera::Context;
|
||||
|
||||
use crate::pages::errors::*;
|
||||
use crate::settings::Settings;
|
||||
|
||||
use actix_web::{http::header, web, HttpResponse, Responder};
|
||||
|
||||
use crate::api::v1::admin::auth::runners;
|
||||
use crate::errors::*;
|
||||
use crate::pages::errors::ErrorPage;
|
||||
use crate::AppData;
|
||||
use crate::PAGES;
|
||||
|
||||
#[derive(Clone, TemplateOnce)]
|
||||
#[template(path = "auth/join/index.html")]
|
||||
struct IndexPage<'a> {
|
||||
error: Option<ErrorPage<'a>>,
|
||||
pub use super::*;
|
||||
|
||||
pub const REGISTER: TemplateFile = TemplateFile::new("register", "auth/join/index.html");
|
||||
|
||||
pub struct Register {
|
||||
ctx: RefCell<Context>,
|
||||
}
|
||||
|
||||
const PAGE: &str = "Join";
|
||||
|
||||
impl<'a> Default for IndexPage<'a> {
|
||||
fn default() -> Self {
|
||||
IndexPage { error: None }
|
||||
impl CtxError for Register {
|
||||
fn with_error(&self, e: &ReadableError) -> String {
|
||||
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||
self.render()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IndexPage<'a> {
|
||||
pub fn new(title: &'a str, message: &'a str) -> Self {
|
||||
Self {
|
||||
error: Some(ErrorPage::new(title, message)),
|
||||
}
|
||||
impl Register {
|
||||
fn new(settings: &Settings) -> Self {
|
||||
let ctx = RefCell::new(context(settings, "Join"));
|
||||
Self { ctx }
|
||||
}
|
||||
|
||||
pub fn render(&self) -> String {
|
||||
TEMPLATES.render(REGISTER.name, &self.ctx.borrow()).unwrap()
|
||||
}
|
||||
|
||||
pub fn page(s: &Settings) -> String {
|
||||
let p = Self::new(s);
|
||||
p.render()
|
||||
}
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref INDEX: String = IndexPage::default().render_once().unwrap();
|
||||
#[actix_web_codegen_const_routes::get(path = "PAGES.auth.join")]
|
||||
#[tracing::instrument(name = "Serve registration page", skip(ctx))]
|
||||
pub async fn get_join(ctx: AppData) -> impl Responder {
|
||||
let login = Register::page(&ctx.settings);
|
||||
let html = ContentType::html();
|
||||
HttpResponse::Ok().content_type(html).body(login)
|
||||
}
|
||||
|
||||
#[my_codegen::get(path = "crate::PAGES.auth.join")]
|
||||
pub async fn join() -> impl Responder {
|
||||
HttpResponse::Ok()
|
||||
.content_type("text/html; charset=utf-8")
|
||||
.body(&*INDEX.as_str())
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(get_join);
|
||||
cfg.service(join_submit);
|
||||
}
|
||||
|
||||
#[my_codegen::post(path = "PAGES.auth.join")]
|
||||
#[actix_web_codegen_const_routes::post(path = "PAGES.auth.join")]
|
||||
#[tracing::instrument(name = "Process web UI registration", skip(data))]
|
||||
pub async fn join_submit(
|
||||
payload: web::Form<runners::Register>,
|
||||
data: AppData,
|
||||
) -> PageResult<impl Responder> {
|
||||
) -> PageResult<impl Responder, Register> {
|
||||
let mut payload = payload.into_inner();
|
||||
if payload.email.is_some() && payload.email.as_ref().unwrap().is_empty() {
|
||||
payload.email = None;
|
||||
}
|
||||
|
||||
match runners::register_runner(&payload, &data).await {
|
||||
Ok(()) => Ok(HttpResponse::Found()
|
||||
.insert_header((header::LOCATION, PAGES.auth.login))
|
||||
.finish()),
|
||||
Err(e) => {
|
||||
let status = e.status_code();
|
||||
let heading = status.canonical_reason().unwrap_or("Error");
|
||||
Ok(HttpResponseBuilder::new(status)
|
||||
.content_type("text/html; charset=utf-8")
|
||||
.body(
|
||||
IndexPage::new(heading, &format!("{}", e))
|
||||
.render_once()
|
||||
.unwrap(),
|
||||
))
|
||||
}
|
||||
}
|
||||
runners::register_runner(&payload, &data)
|
||||
.await
|
||||
.map_err(|e| PageError::new(Register::new(&data.settings), e))?;
|
||||
|
||||
Ok(HttpResponse::Found()
|
||||
.insert_header((header::LOCATION, PAGES.auth.login))
|
||||
.finish())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
@ -103,7 +108,8 @@ mod tests {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn auth_join_form_works() {
|
||||
let data = Data::new().await;
|
||||
let settings = Settings::new().unwrap();
|
||||
let data = Data::new(settings).await;
|
||||
const NAME: &str = "testuserformjoin";
|
||||
const NAME2: &str = "testuserformjoin2";
|
||||
const EMAIL: &str = "testuserformjoin@a.com";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
* Copyright (C) 2023 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
|
@ -14,21 +14,31 @@
|
|||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use actix_web::*;
|
||||
|
||||
pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
|
||||
|
||||
pub fn register_templates(t: &mut tera::Tera) {
|
||||
for template in [login::LOGIN, join::REGISTER].iter() {
|
||||
template.register(t).expect(template.name);
|
||||
}
|
||||
}
|
||||
|
||||
pub mod join;
|
||||
pub mod login;
|
||||
pub mod sudo;
|
||||
//pub mod sudo;
|
||||
|
||||
pub fn services(cfg: &mut actix_web::web::ServiceConfig) {
|
||||
cfg.service(login::login);
|
||||
cfg.service(login::login_submit);
|
||||
cfg.service(join::join);
|
||||
cfg.service(join::join_submit);
|
||||
login::services(cfg);
|
||||
join::services(cfg);
|
||||
}
|
||||
|
||||
pub mod routes {
|
||||
use actix_auth_middleware::GetLoginRoute;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
|
||||
pub struct Auth {
|
||||
pub login: &'static str,
|
||||
pub join: &'static str,
|
||||
|
|
|
|||
|
|
@ -1,48 +1,49 @@
|
|||
<. include!("../../components/base/top.html"); .>
|
||||
<body class="auth__body">
|
||||
<main class="auth__container">
|
||||
<img src="<.= crate::assets::LOGO.path .>" alt="logo" class="auth__logo" />
|
||||
<h1>Sign in</h1>
|
||||
<. include!("../../components/error/index.html"); .>
|
||||
<form
|
||||
action="<.= crate::PAGES.auth.login .>"
|
||||
method="POST"
|
||||
class="form"
|
||||
accept-charset="utf-8"
|
||||
>
|
||||
<label class="form__label" for="login">
|
||||
Username or Email
|
||||
<input
|
||||
class="form__input"
|
||||
name="login"
|
||||
required
|
||||
id="login"
|
||||
type="text"
|
||||
/>
|
||||
</label>
|
||||
{% extends 'base' %}
|
||||
|
||||
<label class="form__label" for="password">
|
||||
password
|
||||
<input
|
||||
class="form__input"
|
||||
name="password"
|
||||
required
|
||||
id="password"
|
||||
type="password"
|
||||
/>
|
||||
</label>
|
||||
{% block body %}
|
||||
<body class="auth__body">
|
||||
<main class="auth__container">
|
||||
<img src="{{ assets.logo.path }}" alt="logo" class="auth__logo" />
|
||||
<h1>Sign in</h1>
|
||||
{% include "error_comp" %}
|
||||
<form
|
||||
action="{{ page.auth.login }}"
|
||||
method="POST"
|
||||
class="form"
|
||||
accept-charset="utf-8"
|
||||
>
|
||||
<label class="form__label" for="login">
|
||||
Username or Email
|
||||
<input
|
||||
class="form__input"
|
||||
name="login"
|
||||
required
|
||||
id="login"
|
||||
type="text"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<div class="form__action-container">
|
||||
<a href="/forgot-password">Forgot password?</a>
|
||||
<button class="form__submit" type="submit">Login</button>
|
||||
</div>
|
||||
</form>
|
||||
<label class="form__label" for="password">
|
||||
password
|
||||
<input
|
||||
class="form__input"
|
||||
name="password"
|
||||
required
|
||||
id="password"
|
||||
type="password"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<p class="form__alt-action">
|
||||
New to mCaptcha Survey?
|
||||
<a href="<.= crate::PAGES.auth.join .>">Create an account </a>
|
||||
</p>
|
||||
</main>
|
||||
<. include!("../../components/footer/index.html"); .>
|
||||
</body>
|
||||
<. include!("../../components/base/bottom.html"); .>
|
||||
<div class="form__action-container">
|
||||
<a href="/forgot-password">Forgot password?</a>
|
||||
<button class="form__submit" type="submit">Login</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<p class="form__alt-action">
|
||||
New to mCaptcha Survey?
|
||||
<a href="{{ page.auth.join }}">Create an account </a>
|
||||
</p>
|
||||
</main>
|
||||
</body>
|
||||
{% endblock body %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue