Permet de fermer les inscriptions via REGISTRATION_ENABLED

- Chargement du fichier .env au démarrage (dotenvy).
- REGISTRATION_ENABLED=false refuse l'inscription côté serveur, masque
  le lien « Créer un compte » et remplace le formulaire par un message.
- Ajout de .env.example ; .env ignoré par git.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Romulus21andClaude Opus 5.5 committed 2026-10-09 13:34:15 +02:00
1 parent cbda09ed40
commit cbaab7234b
8 files changed
+88 -35

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
# Base SQLite (créée si absente)
DATABASE_URL=sqlite://lisette.db
# Mettre à false pour fermer les inscriptions (ouvertes par défaut)
REGISTRATION_ENABLED=true
+1
View File
@@ -1,2 +1,3 @@
/target /target
lisette.db* lisette.db*
.env
Generated
+1
View File
@@ -1395,6 +1395,7 @@ dependencies = [
"argon2", "argon2",
"axum", "axum",
"console_error_panic_hook", "console_error_panic_hook",
"dotenvy",
"hex", "hex",
"leptos", "leptos",
"leptos_axum", "leptos_axum",
+2
View File
@@ -18,6 +18,7 @@ argon2 = { version = "0.5", optional = true }
rand_core = { version = "0.6", features = ["getrandom"], optional = true } rand_core = { version = "0.6", features = ["getrandom"], optional = true }
sha2 = { version = "0.10", optional = true } sha2 = { version = "0.10", optional = true }
hex = { version = "0.4", optional = true } hex = { version = "0.4", optional = true }
dotenvy = { version = "0.15", optional = true }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
wasm-bindgen = { version = "=0.2.128", optional = true } wasm-bindgen = { version = "=0.2.128", optional = true }
console_error_panic_hook = { version = "0.1", optional = true } console_error_panic_hook = { version = "0.1", optional = true }
@@ -33,6 +34,7 @@ ssr = [
"dep:rand_core", "dep:rand_core",
"dep:sha2", "dep:sha2",
"dep:hex", "dep:hex",
"dep:dotenvy",
"leptos/ssr", "leptos/ssr",
"leptos_meta/ssr", "leptos_meta/ssr",
"leptos_router/ssr", "leptos_router/ssr",
+8
View File
@@ -92,9 +92,17 @@ pub async fn get_me() -> Result<Option<User>, ServerFnError> {
crate::auth::current_user(&pool()?).await.map_err(db_err) crate::auth::current_user(&pool()?).await.map_err(db_err)
} }
#[server]
pub async fn registration_enabled() -> Result<bool, ServerFnError> {
Ok(crate::auth::registration_enabled())
}
#[server] #[server]
pub async fn register(name: String, email: String, password: String) -> Result<(), ServerFnError> { pub async fn register(name: String, email: String, password: String) -> Result<(), ServerFnError> {
use server::*; use server::*;
if !crate::auth::registration_enabled() {
return Err(ServerFnError::new("Les inscriptions sont fermées."));
}
let pool = pool()?; let pool = pool()?;
let name = clean_name(&name, 40)?; let name = clean_name(&name, 40)?;
let email = clean_email(&email)?; let email = clean_email(&email)?;
+62 -35
View File
@@ -3,7 +3,7 @@ use leptos_router::components::{A, Redirect};
use super::sheets::Sheet; use super::sheets::Sheet;
use super::{Ctx, error_message}; use super::{Ctx, error_message};
use crate::api::{Login, Logout, Register, get_me}; use crate::api::{Login, Logout, Register, get_me, registration_enabled};
use crate::model::User; use crate::model::User;
/// Session state shared by the whole app. /// Session state shared by the whole app.
@@ -13,6 +13,8 @@ pub struct Auth {
pub login: ServerAction<Login>, pub login: ServerAction<Login>,
pub register: ServerAction<Register>, pub register: ServerAction<Register>,
pub logout: ServerAction<Logout>, pub logout: ServerAction<Logout>,
/// Whether sign-ups are open (`REGISTRATION_ENABLED`).
pub registration: Resource<Result<bool, ServerFnError>>,
} }
impl Auth { impl Auth {
@@ -24,7 +26,8 @@ impl Auth {
move || (login.version().get(), register.version().get(), logout.version().get()), move || (login.version().get(), register.version().get(), logout.version().get()),
|_| get_me(), |_| get_me(),
); );
let auth = Auth { me, login, register, logout }; let registration = Resource::new(|| (), |_| registration_enabled());
let auth = Auth { me, login, register, logout, registration };
provide_context(auth); provide_context(auth);
auth auth
} }
@@ -115,12 +118,21 @@ pub fn LoginPage() -> impl IntoView {
</Field> </Field>
<SubmitButton pending=auth.login.pending() label="Se connecter" /> <SubmitButton pending=auth.login.pending() label="Se connecter" />
</ActionForm> </ActionForm>
<p class="mt-6 text-center text-ink/70"> <Suspense>
"Pas encore de compte ? " {move || Suspend::new(async move {
<A href="/inscription" attr:class="font-semibold text-ink underline"> matches!(auth.registration.await, Ok(true))
"Créer un compte" .then(|| {
</A> view! {
</p> <p class="mt-6 text-center text-ink/70">
"Pas encore de compte ? "
<A href="/inscription" attr:class="font-semibold text-ink underline">
"Créer un compte"
</A>
</p>
}
})
})}
</Suspense>
</AuthLayout> </AuthLayout>
} }
} }
@@ -130,33 +142,48 @@ pub fn RegisterPage() -> impl IntoView {
let auth = expect_context::<Auth>(); let auth = expect_context::<Auth>();
view! { view! {
<AuthLayout title="Créer un compte"> <AuthLayout title="Créer un compte">
<ActionForm action=auth.register attr:class="mt-5 flex flex-col gap-4"> <Suspense>
<FormError error=Signal::derive(move || auth.register.value().get().and_then(Result::err).map(error_message)) /> {move || Suspend::new(async move {
<Field label="Prénom ou pseudo"> if !matches!(auth.registration.await, Ok(true)) {
<input return view! {
class="field" <p class="mt-4 text-lg text-ink/70">
name="name" "Les inscriptions sont fermées pour le moment."
required </p>
maxlength="40" }
autocomplete="given-name" .into_any();
/> }
</Field> view! {
<Field label="Email"> <ActionForm action=auth.register attr:class="mt-5 flex flex-col gap-4">
<input class="field" type="email" name="email" required autocomplete="email" /> <FormError error=Signal::derive(move || auth.register.value().get().and_then(Result::err).map(error_message)) />
</Field> <Field label="Prénom ou pseudo">
<Field label="Mot de passe (8 caractères min.)"> <input
<input class="field"
class="field" name="name"
type="password" required
name="password" maxlength="40"
required autocomplete="given-name"
minlength="8" />
maxlength="128" </Field>
autocomplete="new-password" <Field label="Email">
/> <input class="field" type="email" name="email" required autocomplete="email" />
</Field> </Field>
<SubmitButton pending=auth.register.pending() label="Créer mon compte" /> <Field label="Mot de passe (8 caractères min.)">
</ActionForm> <input
class="field"
type="password"
name="password"
required
minlength="8"
maxlength="128"
autocomplete="new-password"
/>
</Field>
<SubmitButton pending=auth.register.pending() label="Créer mon compte" />
</ActionForm>
}
.into_any()
})}
</Suspense>
<p class="mt-6 text-center text-ink/70"> <p class="mt-6 text-center text-ink/70">
"Déjà inscrit·e ? " "Déjà inscrit·e ? "
<A href="/connexion" attr:class="font-semibold text-ink underline"> <A href="/connexion" attr:class="font-semibold text-ink underline">
+7
View File
@@ -16,6 +16,13 @@ use crate::model::User;
const COOKIE: &str = "lisette_session"; const COOKIE: &str = "lisette_session";
const SESSION_DAYS: i64 = 30; const SESSION_DAYS: i64 = 30;
/// `REGISTRATION_ENABLED=false` (env or `.env`) closes sign-ups; open by default.
pub fn registration_enabled() -> bool {
std::env::var("REGISTRATION_ENABLED")
.map(|value| !matches!(value.trim().to_lowercase().as_str(), "false" | "0" | "no" | "off"))
.unwrap_or(true)
}
pub fn hash_password(password: &str) -> Result<String, argon2::password_hash::Error> { pub fn hash_password(password: &str) -> Result<String, argon2::password_hash::Error> {
let salt = SaltString::generate(&mut OsRng); let salt = SaltString::generate(&mut OsRng);
Ok(Argon2::default().hash_password(password.as_bytes(), &salt)?.to_string()) Ok(Argon2::default().hash_password(password.as_bytes(), &salt)?.to_string())
+2
View File
@@ -6,6 +6,8 @@ async fn main() {
use leptos_axum::{LeptosRoutes, generate_route_list}; use leptos_axum::{LeptosRoutes, generate_route_list};
use lisette::app::{App, shell}; use lisette::app::{App, shell};
dotenvy::dotenv().ok();
let conf = get_configuration(None).expect("invalid Leptos configuration"); let conf = get_configuration(None).expect("invalid Leptos configuration");
let leptos_options = conf.leptos_options; let leptos_options = conf.leptos_options;
let addr = leptos_options.site_addr; let addr = leptos_options.site_addr;