Compare commits
6 Commits
996358be87
...
v0.1.9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11762728c9 | ||
|
|
ebb208baba | ||
|
|
7cba3d9eba | ||
|
|
35e2b6edc9 | ||
|
|
f3daa27ce7 | ||
|
|
46cc2459bd |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -19,6 +19,8 @@ target/
|
||||
*.sqlite-*
|
||||
.env
|
||||
.env.production
|
||||
.envrc
|
||||
.direnv/
|
||||
uploads/
|
||||
*.report.html
|
||||
favicon_io.zip
|
||||
|
||||
@@ -273,6 +273,24 @@ profile-title = My profile
|
||||
profile-intro = We'll use these details to prefill checkout.
|
||||
profile-saved = Profile saved.
|
||||
profile-save = Save profile
|
||||
profile-company-required = For a company account, please fill in company name, IČO and DIČ.
|
||||
account-type-locked = Account type can't be changed after registration.
|
||||
checkout-create-account = Create an account from this order
|
||||
checkout-create-account-hint = We'll email you a link to set your password. This order will be linked to your account.
|
||||
order-account-created = We created an account for you. Check your email to set your password.
|
||||
set-password-title = Set your password
|
||||
set-password-intro = Choose a password to finish setting up your account.
|
||||
set-password-new = New password
|
||||
set-password-confirm = Confirm password
|
||||
set-password-submit = Set password
|
||||
set-password-invalid = This link is invalid or has expired.
|
||||
set-password-weak = Password must be at least 8 characters.
|
||||
set-password-mismatch = Passwords don't match.
|
||||
resend-verification-title = Resend verification email
|
||||
resend-verification-intro = Enter your email and we'll send a fresh verification link.
|
||||
resend-verification-submit = Resend
|
||||
resend-verification-done = If that email belongs to an unverified account, we've sent a new verification link. Check your inbox (and spam). You can request another in a minute.
|
||||
login-resend = Didn't get the verification email? Resend it
|
||||
order-confirmed-title = Thank you for your order!
|
||||
order-confirmed-sub = We have received your order.
|
||||
order-number = Order number
|
||||
|
||||
@@ -273,6 +273,24 @@ profile-title = Môj profil
|
||||
profile-intro = Tieto údaje použijeme na predvyplnenie pokladne.
|
||||
profile-saved = Profil bol uložený.
|
||||
profile-save = Uložiť profil
|
||||
profile-company-required = Pri firemnom účte vyplňte názov firmy, IČO a DIČ.
|
||||
account-type-locked = Typ účtu sa po registrácii nedá zmeniť.
|
||||
checkout-create-account = Vytvoriť účet z tejto objednávky
|
||||
checkout-create-account-hint = Pošleme vám e-mail na nastavenie hesla. Objednávka sa priradí k vášmu účtu.
|
||||
order-account-created = Vytvorili sme vám účet. Skontrolujte si e-mail a nastavte si heslo.
|
||||
set-password-title = Nastavte si heslo
|
||||
set-password-intro = Zvoľte si heslo a dokončite vytvorenie účtu.
|
||||
set-password-new = Nové heslo
|
||||
set-password-confirm = Potvrďte heslo
|
||||
set-password-submit = Nastaviť heslo
|
||||
set-password-invalid = Odkaz je neplatný alebo vypršal.
|
||||
set-password-weak = Heslo musí mať aspoň 8 znakov.
|
||||
set-password-mismatch = Heslá sa nezhodujú.
|
||||
resend-verification-title = Znova odoslať overovací e-mail
|
||||
resend-verification-intro = Zadajte svoj e-mail a pošleme vám nový overovací odkaz.
|
||||
resend-verification-submit = Odoslať znova
|
||||
resend-verification-done = Ak k tomuto e-mailu patrí neoverený účet, poslali sme naň nový overovací odkaz. Skontrolujte si schránku aj priečinok so spamom. Ďalšiu žiadosť môžete odoslať o minútu.
|
||||
login-resend = Nedostali ste overovací e-mail? Poslať znova
|
||||
order-confirmed-title = Ďakujeme za objednávku!
|
||||
order-confirmed-sub = Vašu objednávku sme prijali.
|
||||
order-number = Číslo objednávky
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -13,38 +13,39 @@
|
||||
{{ t(key="profile-saved", lang=lang | default(value='sk')) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if error %}
|
||||
{{ ui::alert_danger(message=t(key="profile-company-required", lang=lang | default(value='sk')), extra="mt-4") }}
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action="/account/profile" hx-boost="false" class="mt-6 space-y-6"
|
||||
x-data="{ accountType: '{{ account_type | default(value='personal') }}' }">
|
||||
<!-- personal vs company: an account is exactly one of the two -->
|
||||
<fieldset class="space-y-3 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<form method="post" action="/account/profile" hx-boost="false" class="mt-6 space-y-6">
|
||||
<!-- account type is fixed at registration and shown read-only -->
|
||||
<fieldset class="space-y-2 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-type", lang=lang | default(value='sk')) }}</legend>
|
||||
<div class="grid gap-3 sm:grid-cols-2">
|
||||
<label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="account_type", value="personal", attrs='x-model="accountType"') }}
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-personal", lang=lang | default(value='sk')) }}</span>
|
||||
</label>
|
||||
<label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="account_type", value="company", attrs='x-model="accountType"') }}
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-company", lang=lang | default(value='sk')) }}</span>
|
||||
</label>
|
||||
<div class="flex items-center gap-2">
|
||||
{% if account_type == "company" %}
|
||||
{{ ui::badge(label=t(key="account-company", lang=lang | default(value='sk')), variant="primary") }}
|
||||
{% else %}
|
||||
{{ ui::badge(label=t(key="account-personal", lang=lang | default(value='sk')), variant="neutral") }}
|
||||
{% endif %}
|
||||
<span class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="account-type-locked", lang=lang | default(value='sk')) }}</span>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
{% if account_type == "company" %}
|
||||
<!-- company billing details (company accounts only) -->
|
||||
<fieldset x-show="accountType === 'company'" x-cloak class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-company-details", lang=lang | default(value='sk')) }}</legend>
|
||||
<div class="space-y-1.5">
|
||||
<label for="company_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-name", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="company_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-name", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="company_name", id="company_name", value=company_name | default(value=''), autocomplete="organization") }}
|
||||
</div>
|
||||
<div class="grid gap-4 sm:grid-cols-3">
|
||||
<div class="space-y-1.5">
|
||||
<label for="company_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-ico", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="company_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-ico", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="company_id", id="company_id", value=company_id | default(value='')) }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="tax_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-dic", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="tax_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-dic", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="tax_id", id="tax_id", value=tax_id | default(value='')) }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
@@ -53,6 +54,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
{% endif %}
|
||||
|
||||
<!-- contact (name/email are managed by the login) -->
|
||||
<fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
{% if error == "unverified" %}
|
||||
{{ ui::alert_danger(message=t(key="login-error-unverified", lang=lang | default(value='sk')), extra="mt-3") }}
|
||||
<p class="mt-2 text-sm text-on-surface dark:text-on-surface-dark">
|
||||
<a href="/resend-verification" class="font-medium text-primary underline-offset-2 hover:underline dark:text-primary-dark">{{ t(key="login-resend", lang=lang | default(value='sk')) }}</a>
|
||||
</p>
|
||||
{% elif error %}
|
||||
{{ ui::alert_danger(message=t(key="login-error", lang=lang | default(value='sk')), extra="mt-3") }}
|
||||
{% endif %}
|
||||
|
||||
@@ -27,6 +27,21 @@
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action="/register" hx-boost="false" class="mt-4 flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-type", lang=lang | default(value='sk')) }}</span>
|
||||
<div class="grid grid-cols-2 gap-2">
|
||||
<label class="flex cursor-pointer items-center gap-2 rounded-radius border border-outline px-3 py-2 text-sm transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="account_type", value="personal", checked=true) }}
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-personal", lang=lang | default(value='sk')) }}</span>
|
||||
</label>
|
||||
<label class="flex cursor-pointer items-center gap-2 rounded-radius border border-outline px-3 py-2 text-sm transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="account_type", value="company") }}
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-company", lang=lang | default(value='sk')) }}</span>
|
||||
</label>
|
||||
</div>
|
||||
<span class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="account-type-locked", lang=lang | default(value='sk')) }}</span>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-1">
|
||||
<label for="name"
|
||||
class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">
|
||||
|
||||
37
assets/views/auth/resend_verification.html
Normal file
37
assets/views/auth/resend_verification.html
Normal file
@@ -0,0 +1,37 @@
|
||||
{% extends "base.html" %}
|
||||
{% import "macros/ui.html" as ui %}
|
||||
|
||||
{% block title %}{{ t(key="resend-verification-title", lang=lang | default(value='sk')) }}{% endblock title %}
|
||||
|
||||
{% block content %}
|
||||
<div class="mx-auto mt-8 max-w-sm">
|
||||
<div class="rounded-radius border border-outline bg-surface-alt shadow-sm dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<div class="flex items-center justify-between border-b border-outline px-5 py-3 dark:border-outline-dark">
|
||||
<span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="brand", lang=lang | default(value='sk')) }}</span>
|
||||
{{ ui::badge(label=t(key="auth", lang=lang | default(value='sk')), variant="primary") }}
|
||||
</div>
|
||||
|
||||
<div class="p-5">
|
||||
<h1 class="text-xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="resend-verification-title", lang=lang | default(value='sk')) }}</h1>
|
||||
|
||||
{% if done %}
|
||||
<div class="mt-3 rounded-radius border border-success bg-success/10 px-4 py-3 text-sm text-success" role="status">
|
||||
{{ t(key="resend-verification-done", lang=lang | default(value='sk')) }}
|
||||
</div>
|
||||
<p class="mt-4 text-sm text-on-surface dark:text-on-surface-dark">
|
||||
<a href="/login" class="font-medium text-primary underline-offset-2 hover:underline dark:text-primary-dark">{{ t(key="nav-login", lang=lang | default(value='sk')) }}</a>
|
||||
</p>
|
||||
{% else %}
|
||||
<p class="mt-1 text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="resend-verification-intro", lang=lang | default(value='sk')) }}</p>
|
||||
<form method="post" action="/resend-verification" hx-boost="false" class="mt-4 flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1">
|
||||
<label for="email" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="login-email", lang=lang | default(value='sk')) }}</label>
|
||||
{{ ui::input(name="email", id="email", type="email", required=true, autocomplete="email", attrs="autofocus") }}
|
||||
</div>
|
||||
{{ ui::button(label=t(key="resend-verification-submit", lang=lang | default(value='sk')), type="submit", extra="mt-1 w-full") }}
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
47
assets/views/auth/set_password.html
Normal file
47
assets/views/auth/set_password.html
Normal file
@@ -0,0 +1,47 @@
|
||||
{% extends "base.html" %}
|
||||
{% import "macros/ui.html" as ui %}
|
||||
|
||||
{% block title %}{{ t(key="set-password-title", lang=lang | default(value='sk')) }}{% endblock title %}
|
||||
|
||||
{% block content %}
|
||||
<div class="mx-auto mt-8 max-w-sm">
|
||||
<div class="rounded-radius border border-outline bg-surface-alt shadow-sm dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<div class="flex items-center justify-between border-b border-outline px-5 py-3 dark:border-outline-dark">
|
||||
<span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="brand", lang=lang | default(value='sk')) }}</span>
|
||||
{{ ui::badge(label=t(key="auth", lang=lang | default(value='sk')), variant="primary") }}
|
||||
</div>
|
||||
|
||||
<div class="p-5">
|
||||
<h1 class="text-xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="set-password-title", lang=lang | default(value='sk')) }}</h1>
|
||||
|
||||
{% if not valid %}
|
||||
{{ ui::alert_danger(message=t(key="set-password-invalid", lang=lang | default(value='sk')), extra="mt-3") }}
|
||||
<p class="mt-4 text-sm text-on-surface dark:text-on-surface-dark">
|
||||
<a href="/login" class="font-medium text-primary underline-offset-2 hover:underline dark:text-primary-dark">{{ t(key="nav-login", lang=lang | default(value='sk')) }}</a>
|
||||
</p>
|
||||
{% else %}
|
||||
<p class="mt-1 text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="set-password-intro", lang=lang | default(value='sk')) }}</p>
|
||||
|
||||
{% if error == "mismatch" %}
|
||||
{{ ui::alert_danger(message=t(key="set-password-mismatch", lang=lang | default(value='sk')), extra="mt-3") }}
|
||||
{% elif error == "weak" %}
|
||||
{{ ui::alert_danger(message=t(key="set-password-weak", lang=lang | default(value='sk')), extra="mt-3") }}
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action="/set-password" hx-boost="false" class="mt-4 flex flex-col gap-4">
|
||||
<input type="hidden" name="token" value="{{ token }}">
|
||||
<div class="flex flex-col gap-1">
|
||||
<label for="password" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="set-password-new", lang=lang | default(value='sk')) }}</label>
|
||||
{{ ui::input(name="password", id="password", type="password", required=true, autocomplete="new-password", attrs="autofocus") }}
|
||||
</div>
|
||||
<div class="flex flex-col gap-1">
|
||||
<label for="password_confirm" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="set-password-confirm", lang=lang | default(value='sk')) }}</label>
|
||||
{{ ui::input(name="password_confirm", id="password_confirm", type="password", required=true, autocomplete="new-password") }}
|
||||
</div>
|
||||
{{ ui::button(label=t(key="set-password-submit", lang=lang | default(value='sk')), type="submit", extra="mt-1 w-full") }}
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
@@ -82,6 +82,11 @@
|
||||
{# Compact danger alert (form/inline errors). Adapted from
|
||||
penguinui/alert/default-alert.html (danger variant), trimmed to a single line
|
||||
with the danger icon. #}
|
||||
{# Required-field marker: a red asterisk appended to a field label. #}
|
||||
{% macro req() -%}
|
||||
<span class="ml-0.5 text-danger" aria-hidden="true">*</span>
|
||||
{%- endmacro req %}
|
||||
|
||||
{% macro alert_danger(message, extra="") -%}
|
||||
<div class="flex w-full items-center gap-2 overflow-hidden rounded-radius border border-danger bg-danger/10 px-3 py-2 text-sm text-danger {{ extra }}" role="alert">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5 shrink-0" aria-hidden="true">
|
||||
|
||||
@@ -32,9 +32,20 @@
|
||||
class="mt-6 grid gap-8 lg:grid-cols-3">
|
||||
|
||||
<div class="space-y-6 lg:col-span-2">
|
||||
<!-- personal vs company -->
|
||||
<!-- personal vs company. Fixed (read-only) for a logged-in account; a guest
|
||||
picks it and the choice will type any account they create. -->
|
||||
<fieldset class="space-y-3 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-type", lang=lang | default(value='sk')) }}</legend>
|
||||
{% if account_fixed %}
|
||||
<div class="flex items-center gap-2">
|
||||
{% if prefill_account_type == "company" %}
|
||||
{{ ui::badge(label=t(key="account-company", lang=lang | default(value='sk')), variant="primary") }}
|
||||
{% else %}
|
||||
{{ ui::badge(label=t(key="account-personal", lang=lang | default(value='sk')), variant="neutral") }}
|
||||
{% endif %}
|
||||
<span class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="account-type-locked", lang=lang | default(value='sk')) }}</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="grid gap-3 sm:grid-cols-2">
|
||||
<label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="account_type", value="personal", attrs='x-model="accountType"') }}
|
||||
@@ -45,22 +56,23 @@
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-company", lang=lang | default(value='sk')) }}</span>
|
||||
</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
</fieldset>
|
||||
|
||||
<!-- company billing details (company accounts only) -->
|
||||
<fieldset x-show="accountType === 'company'" x-cloak class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-company-details", lang=lang | default(value='sk')) }}</legend>
|
||||
<div class="space-y-1.5">
|
||||
<label for="company_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-name", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="company_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-name", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="company_name", id="company_name", value=prefill_company_name | default(value=''), autocomplete="organization") }}
|
||||
</div>
|
||||
<div class="grid gap-4 sm:grid-cols-3">
|
||||
<div class="space-y-1.5">
|
||||
<label for="company_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-ico", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="company_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-ico", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="company_id", id="company_id", value=prefill_company_id | default(value='')) }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="tax_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-dic", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="tax_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="company-dic", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="tax_id", id="tax_id", value=prefill_tax_id | default(value='')) }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
@@ -74,15 +86,15 @@
|
||||
<fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-contact", lang=lang | default(value='sk')) }}</legend>
|
||||
<div class="space-y-1.5">
|
||||
<label for="email" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-email", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="email" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-email", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="email", id="email", type="email", value=prefill_email | default(value=''), required=true, autocomplete="email") }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="customer_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-name", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="customer_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-name", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="customer_name", id="customer_name", value=prefill_name | default(value=''), required=true, autocomplete="name") }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="phone" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-phone", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="phone" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-phone", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
<div class="flex gap-2">
|
||||
<!-- editable combobox: type freely or pick from the dropdown -->
|
||||
<div class="relative w-28 shrink-0" @click.outside="prefixOpen = false"
|
||||
@@ -119,20 +131,20 @@
|
||||
<fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</legend>
|
||||
<div class="space-y-1.5">
|
||||
<label for="address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="address", id="address", value=prefill_address | default(value=''), required=true, autocomplete="street-address") }}
|
||||
</div>
|
||||
<div class="grid gap-4 sm:grid-cols-3">
|
||||
<div class="space-y-1.5">
|
||||
<label for="city" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-city", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="city" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-city", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="city", id="city", value=prefill_city | default(value=''), required=true, autocomplete="address-level2") }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="zip" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-zip", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="zip" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-zip", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
{{ ui::input(name="zip", id="zip", value=prefill_zip | default(value=''), required=true, autocomplete="postal-code") }}
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<label for="country" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-country", lang=lang | default(value='sk')) }}</label>
|
||||
<label for="country" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-country", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
|
||||
<div class="relative" @click.outside="countryOpen = false"
|
||||
x-data="{ countryOpen: false, country: '{{ prefill_country | default(value=t(key='country-sk', lang=lang | default(value='sk'))) }}', opts: [
|
||||
{ v: '{{ t(key='country-sk', lang=lang | default(value='sk')) }}', l: '🇸🇰 {{ t(key='country-sk', lang=lang | default(value='sk')) }}' },
|
||||
@@ -165,7 +177,7 @@
|
||||
|
||||
<!-- carrier -->
|
||||
<fieldset class="space-y-3 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-carrier", lang=lang | default(value='sk')) }}</legend>
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-carrier", lang=lang | default(value='sk')) }}{{ ui::req() }}</legend>
|
||||
{% for m in shipping_methods %}
|
||||
<label class="flex cursor-pointer items-center justify-between gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
<span class="flex items-center gap-3">
|
||||
@@ -201,7 +213,7 @@
|
||||
|
||||
<!-- payment -->
|
||||
<fieldset class="space-y-3 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-payment", lang=lang | default(value='sk')) }}</legend>
|
||||
<legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-payment", lang=lang | default(value='sk')) }}{{ ui::req() }}</legend>
|
||||
<label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
|
||||
{{ ui::radio(name="payment_method", value="cod", attrs='required x-model="paymentMethod"') }}
|
||||
<span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-cod", lang=lang | default(value='sk')) }}</span>
|
||||
@@ -221,6 +233,14 @@
|
||||
<!-- logged-in customers can persist this address to their profile for next time -->
|
||||
{{ ui::checkbox(name="save_profile", id="save_profile", label=t(key="checkout-save-profile", lang=lang | default(value='sk')), checked=true) }}
|
||||
{% endif %}
|
||||
|
||||
{% if can_create_account %}
|
||||
<!-- guests may turn this order into an account (typed by their choice above) -->
|
||||
<div class="space-y-1.5 rounded-radius border border-outline bg-surface p-4 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
{{ ui::checkbox(name="create_account", id="create_account", label=t(key="checkout-create-account", lang=lang | default(value='sk'))) }}
|
||||
<p class="pl-6 text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="checkout-create-account-hint", lang=lang | default(value='sk')) }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- summary -->
|
||||
|
||||
@@ -15,6 +15,12 @@
|
||||
<p class="mt-1 text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="order-confirmed-sub", lang=lang | default(value='sk')) }}</p>
|
||||
</div>
|
||||
|
||||
{% if account_created %}
|
||||
<div class="rounded-radius border border-primary/40 bg-primary/5 p-4 text-sm text-on-surface dark:border-primary-dark/40 dark:text-on-surface-dark" role="status">
|
||||
{{ t(key="order-account-created", lang=lang | default(value='sk')) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
|
||||
<div class="flex flex-wrap justify-between gap-2 border-b border-outline pb-3 dark:border-outline-dark">
|
||||
<span class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="order-number", lang=lang | default(value='sk')) }}</span>
|
||||
|
||||
@@ -45,19 +45,24 @@ workers:
|
||||
|
||||
# Mailer Configuration.
|
||||
mailer:
|
||||
# SMTP mailer configuration.
|
||||
# SMTP mailer configuration. Defaults target a local catcher (MailHog/Mailpit
|
||||
# on localhost:1025); set the SMTP_* env vars to point at a real server. The
|
||||
# auth block is only emitted when SMTP_PASSWORD is provided, so the secret is
|
||||
# never stored here — pass it in at launch (e.g. from `pass`).
|
||||
smtp:
|
||||
# Enable/Disable smtp mailer.
|
||||
enable: true
|
||||
enable: {{ get_env(name="SMTP_ENABLE", default="true") }}
|
||||
# SMTP server host. e.x localhost, smtp.gmail.com
|
||||
host: localhost
|
||||
host: "{{ get_env(name="SMTP_HOST", default="localhost") }}"
|
||||
# SMTP server port
|
||||
port: 1025
|
||||
port: {{ get_env(name="SMTP_PORT", default="1025") }}
|
||||
# Use secure connection (SSL/TLS).
|
||||
secure: false
|
||||
# auth:
|
||||
# user:
|
||||
# password:
|
||||
secure: {{ get_env(name="SMTP_SECURE", default="false") }}
|
||||
{% if get_env(name="SMTP_PASSWORD", default="") != "" %}
|
||||
auth:
|
||||
user: "{{ get_env(name="SMTP_USER", default="") }}"
|
||||
password: "{{ get_env(name="SMTP_PASSWORD", default="") }}"
|
||||
{% endif %}
|
||||
# Override the SMTP hello name (default is the machine's hostname)
|
||||
# hello_name:
|
||||
|
||||
|
||||
@@ -42,33 +42,58 @@ workers:
|
||||
|
||||
|
||||
# Mailer Configuration.
|
||||
# Defaults keep the whole suite on the in-memory stub mailer. The real-SMTP
|
||||
# smoke test (tests/mailer/smtp_send.rs) opts in by setting these env vars
|
||||
# before boot; nothing else in the suite sends real mail.
|
||||
mailer:
|
||||
stub: true
|
||||
stub: {{ get_env(name="MAILER_STUB", default="true") }}
|
||||
# SMTP mailer configuration.
|
||||
smtp:
|
||||
# Enable/Disable smtp mailer.
|
||||
enable: true
|
||||
enable: {{ get_env(name="SMTP_ENABLE", default="true") }}
|
||||
# SMTP server host. e.x localhost, smtp.gmail.com
|
||||
host: localhost
|
||||
host: "{{ get_env(name="SMTP_HOST", default="localhost") }}"
|
||||
# SMTP server port
|
||||
port: 1025
|
||||
port: {{ get_env(name="SMTP_PORT", default="1025") }}
|
||||
# Use secure connection (SSL/TLS).
|
||||
secure: false
|
||||
# auth:
|
||||
# user:
|
||||
# password:
|
||||
secure: {{ get_env(name="SMTP_SECURE", default="false") }}
|
||||
auth:
|
||||
user: "{{ get_env(name="SMTP_USER", default="") }}"
|
||||
password: "{{ get_env(name="SMTP_PASSWORD", default="") }}"
|
||||
|
||||
# Initializers Configuration
|
||||
# initializers:
|
||||
# oauth2:
|
||||
# authorization_code: # Authorization code grant type
|
||||
# - client_identifier: google # Identifier for the OAuth2 provider. Replace 'google' with your provider's name if different, must be unique within the oauth2 config.
|
||||
# ... other fields
|
||||
# OAuth2StoreInitializer requires this block to boot (it builds the client store
|
||||
# in after_routes). Static, non-secret placeholders: tests never perform a real
|
||||
# OAuth2 handshake, they just need the store to construct successfully.
|
||||
initializers:
|
||||
oauth2:
|
||||
# Private-cookie key: a ", "-separated list of >=64 byte values (not a
|
||||
# plain string). This is loco-oauth2's documented sample key; fine for tests.
|
||||
secret_key: "144, 76, 183, 1, 15, 184, 233, 174, 214, 251, 190, 186, 122, 61, 74, 84, 225, 110, 189, 115, 10, 251, 133, 128, 52, 46, 15, 66, 85, 1, 245, 73, 27, 113, 189, 15, 209, 205, 61, 100, 73, 31, 18, 58, 235, 105, 141, 36, 70, 92, 231, 151, 27, 32, 243, 117, 30, 244, 110, 89, 233, 196, 137, 130"
|
||||
authorization_code:
|
||||
- client_identifier: google
|
||||
client_credentials:
|
||||
client_id: test-client-id
|
||||
client_secret: test-client-secret
|
||||
url_config:
|
||||
auth_url: https://accounts.google.com/o/oauth2/auth
|
||||
token_url: https://www.googleapis.com/oauth2/v3/token
|
||||
redirect_url: http://localhost:5150/api/oauth2/google/callback
|
||||
profile_url: https://openidconnect.googleapis.com/v1/userinfo
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/userinfo.email
|
||||
- https://www.googleapis.com/auth/userinfo.profile
|
||||
cookie_config:
|
||||
protected_url: http://localhost:5150/
|
||||
timeout_seconds: 600
|
||||
|
||||
# Database Configuration
|
||||
database:
|
||||
# Database connection URI
|
||||
uri: {{ get_env(name="DATABASE_URL", default="postgres://uni_loco_web_user:3@localhost:5432/kompress_eshop_test") }}
|
||||
# Database connection URI. Pinned to the throwaway test DB and intentionally
|
||||
# NOT read from `DATABASE_URL`: the app loads `.env` on boot (app.rs
|
||||
# `load_config`), and this config has `dangerously_recreate: true`, so honoring
|
||||
# an env override here would let `cargo test` recreate the dev/prod database.
|
||||
uri: "postgres://uni_loco_web_user:3@localhost:5432/kompress_eshop_test"
|
||||
# When enabled, the sql query will be logged.
|
||||
enable_logging: false
|
||||
# Set the timeout duration when acquiring a connection.
|
||||
|
||||
@@ -33,6 +33,7 @@ mod m20260617_000003_add_phone_to_orders;
|
||||
mod m20260618_000001_o_auth2_sessions;
|
||||
mod m20260618_000002_customer_profiles;
|
||||
mod m20260618_000003_account_type;
|
||||
mod m20260618_000004_account_ownership;
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
@@ -70,6 +71,7 @@ impl MigratorTrait for Migrator {
|
||||
Box::new(m20260618_000001_o_auth2_sessions::Migration),
|
||||
Box::new(m20260618_000002_customer_profiles::Migration),
|
||||
Box::new(m20260618_000003_account_type::Migration),
|
||||
Box::new(m20260618_000004_account_ownership::Migration),
|
||||
// inject-above (do not remove this comment)
|
||||
]
|
||||
}
|
||||
|
||||
38
migration/src/m20260618_000004_account_ownership.rs
Normal file
38
migration/src/m20260618_000004_account_ownership.rs
Normal file
@@ -0,0 +1,38 @@
|
||||
use loco_rs::schema::*;
|
||||
use sea_orm_migration::prelude::*;
|
||||
|
||||
#[derive(DeriveMigrationName)]
|
||||
pub struct Migration;
|
||||
|
||||
// Account type becomes a permanent property of the *user* (chosen at
|
||||
// registration, never switchable), so it moves off `customer_profiles`. Orders
|
||||
// gain a nullable `user_id` linking them to the account that placed them
|
||||
// (null for guest orders that didn't create an account).
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
|
||||
add_column(
|
||||
m,
|
||||
"users",
|
||||
"account_type",
|
||||
ColType::StringWithDefault("personal".to_string()),
|
||||
)
|
||||
.await?;
|
||||
add_column(m, "orders", "user_id", ColType::IntegerNull).await?;
|
||||
remove_column(m, "customer_profiles", "account_type").await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
|
||||
add_column(
|
||||
m,
|
||||
"customer_profiles",
|
||||
"account_type",
|
||||
ColType::StringWithDefault("personal".to_string()),
|
||||
)
|
||||
.await?;
|
||||
remove_column(m, "orders", "user_id").await?;
|
||||
remove_column(m, "users", "account_type").await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,10 @@
|
||||
//! fields prefill the checkout form. Gated to authenticated non-admin users:
|
||||
//! anonymous visitors are bounced to `/login`. Admins have their own area and
|
||||
//! are sent to the dashboard.
|
||||
//!
|
||||
//! The account *type* (personal vs company) is fixed at registration and lives
|
||||
//! on the user — it is shown here read-only and can never be changed. The
|
||||
//! profile only edits the type-specific details (company identity + address).
|
||||
|
||||
use axum_extra::extract::cookie::CookieJar;
|
||||
use loco_rs::prelude::*;
|
||||
@@ -10,13 +14,15 @@ use serde_json::json;
|
||||
|
||||
use crate::{
|
||||
controllers::i18n::current_lang,
|
||||
models::customer_profiles::{self, ProfileFields},
|
||||
models::{
|
||||
customer_profiles::{self, ProfileFields},
|
||||
users,
|
||||
},
|
||||
shared::guard,
|
||||
};
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct ProfileForm {
|
||||
account_type: Option<String>,
|
||||
company_name: Option<String>,
|
||||
company_id: Option<String>,
|
||||
tax_id: Option<String>,
|
||||
@@ -33,47 +39,58 @@ fn trimmed(value: Option<&str>) -> Option<String> {
|
||||
value.map(str::trim).filter(|v| !v.is_empty()).map(String::from)
|
||||
}
|
||||
|
||||
/// Normalize an account type to one of the two known values, defaulting to
|
||||
/// "personal" for anything unexpected.
|
||||
pub fn normalize_account_type(value: Option<&str>) -> String {
|
||||
match value.map(str::trim) {
|
||||
Some("company") => "company".to_string(),
|
||||
_ => "personal".to_string(),
|
||||
/// Build the persisted fields from the submitted form. Company identifiers are
|
||||
/// only kept for company accounts (a personal account can never carry them).
|
||||
fn fields_from_form(form: &ProfileForm, is_company: bool) -> ProfileFields {
|
||||
let company = |v: Option<&str>| if is_company { trimmed(v) } else { None };
|
||||
ProfileFields {
|
||||
company_name: company(form.company_name.as_deref()),
|
||||
company_id: company(form.company_id.as_deref()),
|
||||
tax_id: company(form.tax_id.as_deref()),
|
||||
vat_id: company(form.vat_id.as_deref()),
|
||||
phone_prefix: trimmed(form.phone_prefix.as_deref()),
|
||||
phone: trimmed(form.phone.as_deref()),
|
||||
address: trimmed(form.address.as_deref()),
|
||||
city: trimmed(form.city.as_deref()),
|
||||
zip: trimmed(form.zip.as_deref()),
|
||||
country: trimmed(form.country.as_deref()),
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ProfileForm> for ProfileFields {
|
||||
fn from(form: ProfileForm) -> Self {
|
||||
let is_company = normalize_account_type(form.account_type.as_deref()) == "company";
|
||||
// Company identifiers are only stored for company accounts, so switching
|
||||
// back to personal clears stale data.
|
||||
let company = |v: Option<&str>| if is_company { trimmed(v) } else { None };
|
||||
Self {
|
||||
account_type: normalize_account_type(form.account_type.as_deref()),
|
||||
company_name: company(form.company_name.as_deref()),
|
||||
company_id: company(form.company_id.as_deref()),
|
||||
tax_id: company(form.tax_id.as_deref()),
|
||||
vat_id: company(form.vat_id.as_deref()),
|
||||
phone_prefix: trimmed(form.phone_prefix.as_deref()),
|
||||
phone: trimmed(form.phone.as_deref()),
|
||||
address: trimmed(form.address.as_deref()),
|
||||
city: trimmed(form.city.as_deref()),
|
||||
zip: trimmed(form.zip.as_deref()),
|
||||
country: trimmed(form.country.as_deref()),
|
||||
}
|
||||
/// The profile fields held by a saved profile, for re-prefilling the form.
|
||||
fn fields_of(profile: Option<&customer_profiles::Model>) -> ProfileFields {
|
||||
match profile {
|
||||
Some(p) => ProfileFields {
|
||||
company_name: p.company_name.clone(),
|
||||
company_id: p.company_id.clone(),
|
||||
tax_id: p.tax_id.clone(),
|
||||
vat_id: p.vat_id.clone(),
|
||||
phone_prefix: p.phone_prefix.clone(),
|
||||
phone: p.phone.clone(),
|
||||
address: p.address.clone(),
|
||||
city: p.city.clone(),
|
||||
zip: p.zip.clone(),
|
||||
country: p.country.clone(),
|
||||
},
|
||||
None => ProfileFields::default(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Render the profile form for `profile` (which may be `None` for a customer
|
||||
/// who hasn't saved anything yet). `saved` shows the success banner after a
|
||||
/// POST.
|
||||
/// A company account must carry its invoicing identity (company name + IČO +
|
||||
/// DIČ; IČ DPH stays optional). Personal accounts have no such requirement.
|
||||
fn company_fields_missing(fields: &ProfileFields) -> bool {
|
||||
fields.company_name.is_none() || fields.company_id.is_none() || fields.tax_id.is_none()
|
||||
}
|
||||
|
||||
/// Render the profile form for `user`, prefilled from `fields`. `saved` shows
|
||||
/// the success banner; `error` shows the company-required validation message.
|
||||
fn profile_view(
|
||||
v: &TeraView,
|
||||
jar: &CookieJar,
|
||||
name: &str,
|
||||
email: &str,
|
||||
profile: Option<&customer_profiles::Model>,
|
||||
user: &users::Model,
|
||||
fields: &ProfileFields,
|
||||
saved: bool,
|
||||
error: bool,
|
||||
) -> Result<Response> {
|
||||
format::view(
|
||||
v,
|
||||
@@ -82,19 +99,20 @@ fn profile_view(
|
||||
"logged_in_admin": false,
|
||||
"logged_in_customer": true,
|
||||
"saved": saved,
|
||||
"name": name,
|
||||
"email": email,
|
||||
"account_type": profile.map_or("personal", |p| p.account_type.as_str()),
|
||||
"company_name": profile.and_then(|p| p.company_name.clone()),
|
||||
"company_id": profile.and_then(|p| p.company_id.clone()),
|
||||
"tax_id": profile.and_then(|p| p.tax_id.clone()),
|
||||
"vat_id": profile.and_then(|p| p.vat_id.clone()),
|
||||
"phone_prefix": profile.and_then(|p| p.phone_prefix.clone()),
|
||||
"phone": profile.and_then(|p| p.phone.clone()),
|
||||
"address": profile.and_then(|p| p.address.clone()),
|
||||
"city": profile.and_then(|p| p.city.clone()),
|
||||
"zip": profile.and_then(|p| p.zip.clone()),
|
||||
"country": profile.and_then(|p| p.country.clone()),
|
||||
"error": error,
|
||||
"name": user.name,
|
||||
"email": user.email,
|
||||
"account_type": user.account_type,
|
||||
"company_name": fields.company_name,
|
||||
"company_id": fields.company_id,
|
||||
"tax_id": fields.tax_id,
|
||||
"vat_id": fields.vat_id,
|
||||
"phone_prefix": fields.phone_prefix,
|
||||
"phone": fields.phone,
|
||||
"address": fields.address,
|
||||
"city": fields.city,
|
||||
"zip": fields.zip,
|
||||
"country": fields.country,
|
||||
"lang": current_lang(jar),
|
||||
}),
|
||||
)
|
||||
@@ -113,7 +131,7 @@ async fn profile_page(
|
||||
return format::redirect("/admin/dashboard");
|
||||
}
|
||||
let profile = customer_profiles::Model::find_for_user(&ctx.db, user.id).await?;
|
||||
profile_view(&v, &jar, &user.name, &user.email, profile.as_ref(), false)
|
||||
profile_view(&v, &jar, &user, &fields_of(profile.as_ref()), false, false)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
@@ -129,8 +147,14 @@ async fn save_profile(
|
||||
if guard::is_admin(&ctx, &user) {
|
||||
return format::redirect("/admin/dashboard");
|
||||
}
|
||||
let profile = customer_profiles::Model::upsert(&ctx.db, user.id, form.into()).await?;
|
||||
profile_view(&v, &jar, &user.name, &user.email, Some(&profile), true)
|
||||
let fields = fields_from_form(&form, user.is_company());
|
||||
// A company account's profile is rejected (and re-shown with the entered
|
||||
// values) until it carries its required identifiers.
|
||||
if user.is_company() && company_fields_missing(&fields) {
|
||||
return profile_view(&v, &jar, &user, &fields, false, true);
|
||||
}
|
||||
customer_profiles::Model::upsert(&ctx.db, user.id, fields.clone()).await?;
|
||||
profile_view(&v, &jar, &user, &fields, true, false)
|
||||
}
|
||||
|
||||
pub fn routes() -> Routes {
|
||||
|
||||
@@ -185,6 +185,127 @@ fn verified_view(v: &TeraView, jar: &CookieJar, ok: bool) -> Result<Response> {
|
||||
)
|
||||
}
|
||||
|
||||
/// Resend the email-verification link. Throttled per account (see
|
||||
/// [`users::Model::verification_resend_wait_secs`]) so it can't be used to spam
|
||||
/// an inbox, and always returns the same neutral message so it can't be used to
|
||||
/// probe which addresses are registered.
|
||||
#[derive(Debug, serde::Deserialize)]
|
||||
struct ResendVerificationForm {
|
||||
email: String,
|
||||
}
|
||||
|
||||
fn resend_verification_view(v: &TeraView, jar: &CookieJar, done: bool) -> Result<Response> {
|
||||
format::view(
|
||||
v,
|
||||
"auth/resend_verification.html",
|
||||
json!({
|
||||
"done": done,
|
||||
"logged_in_admin": false,
|
||||
"lang": current_lang(jar),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn resend_verification_page(
|
||||
jar: CookieJar,
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
) -> Result<Response> {
|
||||
resend_verification_view(&v, &jar, false)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn resend_verification(
|
||||
jar: CookieJar,
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
Form(form): Form<ResendVerificationForm>,
|
||||
) -> Result<Response> {
|
||||
// Resend only for a real, still-unverified account that is past its cooldown.
|
||||
// Anything else (unknown email, already verified, too soon) silently does
|
||||
// nothing — the response is identical either way.
|
||||
if let Ok(user) = users::Model::find_by_email(&ctx.db, form.email.trim()).await {
|
||||
if user.email_verified_at.is_none() && user.verification_resend_wait_secs() == 0 {
|
||||
match user.into_active_model().set_email_verification_sent(&ctx.db).await {
|
||||
Ok(user) => {
|
||||
if let Err(err) = AuthMailer::send_welcome(&ctx, &user).await {
|
||||
tracing::error!(error = %err, "failed to resend verification email");
|
||||
}
|
||||
}
|
||||
Err(err) => tracing::error!(error = %err, "failed to refresh verification token"),
|
||||
}
|
||||
} else {
|
||||
tracing::info!("verification resend skipped (already verified or within cooldown)");
|
||||
}
|
||||
}
|
||||
resend_verification_view(&v, &jar, true)
|
||||
}
|
||||
|
||||
/// Set-password form for accounts created during checkout (and any account that
|
||||
/// has a valid reset token). Reuses the password-reset token machinery.
|
||||
#[derive(Debug, serde::Deserialize)]
|
||||
struct SetPasswordForm {
|
||||
token: String,
|
||||
password: String,
|
||||
password_confirm: String,
|
||||
}
|
||||
|
||||
fn set_password_view(
|
||||
v: &TeraView,
|
||||
jar: &CookieJar,
|
||||
token: &str,
|
||||
valid: bool,
|
||||
error: Option<&str>,
|
||||
) -> Result<Response> {
|
||||
format::view(
|
||||
v,
|
||||
"auth/set_password.html",
|
||||
json!({
|
||||
"token": token,
|
||||
"valid": valid,
|
||||
"error": error,
|
||||
"logged_in_admin": false,
|
||||
"lang": current_lang(jar),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn set_password_page(
|
||||
jar: CookieJar,
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
Path(token): Path<String>,
|
||||
) -> Result<Response> {
|
||||
let valid = users::Model::find_by_reset_token(&ctx.db, &token).await.is_ok();
|
||||
set_password_view(&v, &jar, &token, valid, None)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn set_password(
|
||||
jar: CookieJar,
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
Form(form): Form<SetPasswordForm>,
|
||||
) -> Result<Response> {
|
||||
let Ok(user) = users::Model::find_by_reset_token(&ctx.db, &form.token).await else {
|
||||
return set_password_view(&v, &jar, &form.token, false, None);
|
||||
};
|
||||
if form.password != form.password_confirm {
|
||||
return set_password_view(&v, &jar, &form.token, true, Some("mismatch"));
|
||||
}
|
||||
if form.password.len() < 8 {
|
||||
return set_password_view(&v, &jar, &form.token, true, Some("weak"));
|
||||
}
|
||||
// Setting the password through an emailed link also proves email ownership,
|
||||
// so the account is marked verified here.
|
||||
let user = user.into_active_model().reset_password(&ctx.db, &form.password).await?;
|
||||
if user.email_verified_at.is_none() {
|
||||
user.into_active_model().verified(&ctx.db).await?;
|
||||
}
|
||||
format::redirect("/login")
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn logout() -> Result<Response> {
|
||||
format::render()
|
||||
@@ -211,6 +332,10 @@ pub fn routes() -> Routes {
|
||||
.add("/register", get(register_page))
|
||||
.add("/register", post(register))
|
||||
.add("/verify/{token}", get(verify))
|
||||
.add("/resend-verification", get(resend_verification_page))
|
||||
.add("/resend-verification", post(resend_verification))
|
||||
.add("/set-password/{token}", get(set_password_page))
|
||||
.add("/set-password", post(set_password))
|
||||
.add("/logout", post(logout))
|
||||
.add("/admin", get(admin_entry))
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
//! Public checkout flow: the checkout form, placing an order, and the order
|
||||
//! confirmation page.
|
||||
|
||||
use axum::extract::Query;
|
||||
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
|
||||
use loco_rs::prelude::*;
|
||||
use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QueryOrder};
|
||||
@@ -9,9 +10,13 @@ use serde_json::json;
|
||||
use time::Duration as TimeDuration;
|
||||
|
||||
use crate::{
|
||||
controllers::account::normalize_account_type,
|
||||
controllers::cart::{resolve_cart, CART_COOKIE},
|
||||
models::{customer_profiles::{self, ProfileFields}, order_items, orders, shipping_methods},
|
||||
mailers::auth::AuthMailer,
|
||||
models::{
|
||||
customer_profiles::{self, ProfileFields},
|
||||
order_items, orders, shipping_methods,
|
||||
users::{self, normalize_account_type},
|
||||
},
|
||||
controllers::i18n::current_lang,
|
||||
shared::{guard, money::format_price, settings},
|
||||
views::checkout as view,
|
||||
@@ -41,6 +46,8 @@ struct CheckoutForm {
|
||||
pickup_point_name: Option<String>,
|
||||
// Present (as "on") only when a logged-in customer ticks "save my address".
|
||||
save_profile: Option<String>,
|
||||
// Present only when a guest ticks "create an account from this order".
|
||||
create_account: Option<String>,
|
||||
}
|
||||
|
||||
fn trimmed(value: &str) -> Option<String> {
|
||||
@@ -119,9 +126,13 @@ async fn checkout_page(
|
||||
"packeta_api_key": settings::get(&ctx, "packeta_api_key").unwrap_or(""),
|
||||
"logged_in_admin": is_admin,
|
||||
"logged_in_customer": is_customer,
|
||||
// A logged-in customer's account type is fixed; only guests pick it
|
||||
// and may opt to create an account from the order.
|
||||
"account_fixed": is_customer,
|
||||
"can_create_account": user.is_none(),
|
||||
"prefill_email": user.as_ref().filter(|_| is_customer).map(|u| u.email.clone()),
|
||||
"prefill_name": user.as_ref().filter(|_| is_customer).map(|u| u.name.clone()),
|
||||
"prefill_account_type": profile.as_ref().map_or("personal", |x| x.account_type.as_str()),
|
||||
"prefill_account_type": user.as_ref().filter(|_| is_customer).map_or("personal", |u| u.account_type.as_str()),
|
||||
"prefill_company_name": p(|x| x.company_name.clone()),
|
||||
"prefill_company_id": p(|x| x.company_id.clone()),
|
||||
"prefill_tax_id": p(|x| x.tax_id.clone()),
|
||||
@@ -169,9 +180,20 @@ async fn place_order(
|
||||
let zip = require(&form.zip, "zip")?;
|
||||
let country = require(&form.country, "country")?;
|
||||
|
||||
// The account type is fixed for a logged-in customer (taken from their
|
||||
// account, never the form); a guest picks it on the form. Admins are treated
|
||||
// as guests here.
|
||||
let current_user = guard::current_user(&ctx, &jar).await;
|
||||
let logged_in_customer = current_user
|
||||
.as_ref()
|
||||
.filter(|u| !guard::is_admin(&ctx, u));
|
||||
let account_type = match logged_in_customer {
|
||||
Some(u) => u.account_type.clone(),
|
||||
None => normalize_account_type(form.account_type.as_deref()),
|
||||
};
|
||||
|
||||
// Company purchases must carry the invoicing identifiers (IČO + DIČ
|
||||
// required, IČ DPH optional). Personal orders carry none.
|
||||
let account_type = normalize_account_type(form.account_type.as_deref());
|
||||
let (company_name, company_id, tax_id, vat_id) = if account_type == "company" {
|
||||
(
|
||||
Some(require(form.company_name.as_deref().unwrap_or(""), "company name")?),
|
||||
@@ -207,29 +229,70 @@ async fn place_order(
|
||||
(None, None)
|
||||
};
|
||||
|
||||
// If a logged-in customer opted in, persist this address to their profile
|
||||
// so the next checkout is prefilled. Phone is stored split (prefix + number)
|
||||
// to match the profile/checkout fields. Best-effort: a failure here is logged
|
||||
// but must not block the order.
|
||||
if form.save_profile.is_some() {
|
||||
if let Some(user) = guard::current_user(&ctx, &jar).await {
|
||||
if !guard::is_admin(&ctx, &user) {
|
||||
let fields = ProfileFields {
|
||||
account_type: account_type.clone(),
|
||||
company_name: company_name.clone(),
|
||||
company_id: company_id.clone(),
|
||||
tax_id: tax_id.clone(),
|
||||
vat_id: vat_id.clone(),
|
||||
phone_prefix: trimmed(&form.phone_prefix),
|
||||
phone: Some(number.clone()),
|
||||
address: Some(address.clone()),
|
||||
city: Some(city.clone()),
|
||||
zip: Some(zip.clone()),
|
||||
country: Some(country.clone()),
|
||||
};
|
||||
if let Err(err) = customer_profiles::Model::upsert(&ctx.db, user.id, fields).await {
|
||||
tracing::error!(error = %err, user_id = user.id, "failed to save checkout profile");
|
||||
// The address/contact captured here, ready to seed a profile (for the
|
||||
// logged-in "save my address" opt-in or a freshly created guest account).
|
||||
let entered_profile = || ProfileFields {
|
||||
company_name: company_name.clone(),
|
||||
company_id: company_id.clone(),
|
||||
tax_id: tax_id.clone(),
|
||||
vat_id: vat_id.clone(),
|
||||
phone_prefix: trimmed(&form.phone_prefix),
|
||||
phone: Some(number.clone()),
|
||||
address: Some(address.clone()),
|
||||
city: Some(city.clone()),
|
||||
zip: Some(zip.clone()),
|
||||
country: Some(country.clone()),
|
||||
};
|
||||
|
||||
// Resolve the account that will own this order. A logged-in customer always
|
||||
// owns their orders. A guest may opt to create an account from the order;
|
||||
// the new account's type matches what they bought as, its profile is seeded
|
||||
// from the entered details, and a "set your password" link is emailed. If
|
||||
// the email already belongs to an account we silently fall back to a guest
|
||||
// order (no hijacking an existing account).
|
||||
let mut order_user_id = logged_in_customer.map(|u| u.id);
|
||||
let mut account_created = false;
|
||||
if order_user_id.is_none() && form.create_account.is_some() {
|
||||
match users::Model::create_guest_account(&ctx.db, &email, &customer_name, &account_type)
|
||||
.await
|
||||
{
|
||||
Ok(new_user) => {
|
||||
if let Err(err) =
|
||||
customer_profiles::Model::upsert(&ctx.db, new_user.id, entered_profile()).await
|
||||
{
|
||||
tracing::error!(error = %err, user_id = new_user.id, "failed to seed guest profile");
|
||||
}
|
||||
let user_id = new_user.id;
|
||||
match new_user.into_active_model().set_forgot_password_sent(&ctx.db).await {
|
||||
Ok(user) => {
|
||||
if let Err(err) = AuthMailer::send_set_password(&ctx, &user).await {
|
||||
tracing::error!(error = %err, "failed to send set-password email");
|
||||
}
|
||||
order_user_id = Some(user_id);
|
||||
account_created = true;
|
||||
}
|
||||
Err(err) => {
|
||||
tracing::error!(error = %err, "failed to issue set-password token");
|
||||
order_user_id = Some(user_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(ModelError::EntityAlreadyExists {}) => {
|
||||
tracing::info!(email = %email, "checkout account-create skipped: email already registered");
|
||||
}
|
||||
Err(err) => tracing::error!(error = %err, "failed to create checkout account"),
|
||||
}
|
||||
}
|
||||
|
||||
// If a logged-in customer opted in, persist this address to their profile so
|
||||
// the next checkout is prefilled. Best-effort: a failure here is logged but
|
||||
// must not block the order.
|
||||
if form.save_profile.is_some() {
|
||||
if let Some(user) = logged_in_customer {
|
||||
if let Err(err) =
|
||||
customer_profiles::Model::upsert(&ctx.db, user.id, entered_profile()).await
|
||||
{
|
||||
tracing::error!(error = %err, user_id = user.id, "failed to save checkout profile");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -241,6 +304,7 @@ async fn place_order(
|
||||
email,
|
||||
phone,
|
||||
customer_name: Some(customer_name),
|
||||
user_id: order_user_id,
|
||||
account_type,
|
||||
company_name,
|
||||
company_id,
|
||||
@@ -259,9 +323,14 @@ async fn place_order(
|
||||
)
|
||||
.await?;
|
||||
|
||||
let target = if account_created {
|
||||
format!("/orders/{}?account_created=1", order.order_number)
|
||||
} else {
|
||||
format!("/orders/{}", order.order_number)
|
||||
};
|
||||
format::render()
|
||||
.cookies(&[cleared_cart_cookie()])?
|
||||
.redirect(&format!("/orders/{}", order.order_number))
|
||||
.redirect(&target)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
@@ -269,6 +338,7 @@ async fn order_confirmation(
|
||||
jar: CookieJar,
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
Path(order_number): Path<String>,
|
||||
Query(params): Query<std::collections::HashMap<String, String>>,
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let order = orders::Entity::find()
|
||||
@@ -281,6 +351,7 @@ async fn order_confirmation(
|
||||
.all(&ctx.db)
|
||||
.await?;
|
||||
let (logged_in_admin, logged_in_customer) = guard::chrome(&ctx, &jar).await;
|
||||
let account_created = params.contains_key("account_created");
|
||||
|
||||
format::view(
|
||||
&v,
|
||||
@@ -294,6 +365,7 @@ async fn order_confirmation(
|
||||
"items": view::items(&items),
|
||||
"logged_in_admin": logged_in_admin,
|
||||
"logged_in_customer": logged_in_customer,
|
||||
"account_created": account_created,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)
|
||||
|
||||
@@ -43,6 +43,7 @@ impl Initializer for AdminSeeder {
|
||||
email: email.clone(),
|
||||
password,
|
||||
name,
|
||||
account_type: None,
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
|
||||
@@ -9,10 +9,21 @@ use crate::models::users;
|
||||
static welcome: Dir<'_> = include_dir!("src/mailers/auth/welcome");
|
||||
static forgot: Dir<'_> = include_dir!("src/mailers/auth/forgot");
|
||||
static magic_link: Dir<'_> = include_dir!("src/mailers/auth/magic_link");
|
||||
static set_password: Dir<'_> = include_dir!("src/mailers/auth/set_password");
|
||||
|
||||
#[allow(clippy::module_name_repetitions)]
|
||||
pub struct AuthMailer {}
|
||||
impl Mailer for AuthMailer {}
|
||||
impl Mailer for AuthMailer {
|
||||
/// Override the framework default (`System <system@example.com>`), which any
|
||||
/// real MX rejects (`example.com` is nullMX). Must be a sender the SMTP
|
||||
/// account is allowed to send as.
|
||||
fn opts() -> mailer::MailerOpts {
|
||||
mailer::MailerOpts {
|
||||
from: "Kompress <info@kompress.sk>".to_string(),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
}
|
||||
impl AuthMailer {
|
||||
/// Sending welcome email the the given user
|
||||
///
|
||||
@@ -62,6 +73,31 @@ impl AuthMailer {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Sends a "set your password" email to a checkout-created account. Reuses
|
||||
/// the reset token; the link lands on the HTML `/set-password/{token}` page.
|
||||
///
|
||||
/// # Errors
|
||||
///
|
||||
/// When email sending is failed
|
||||
pub async fn send_set_password(ctx: &AppContext, user: &users::Model) -> Result<()> {
|
||||
Self::mail_template(
|
||||
ctx,
|
||||
&set_password,
|
||||
mailer::Args {
|
||||
to: user.email.to_string(),
|
||||
locals: json!({
|
||||
"name": user.name,
|
||||
"resetToken": user.reset_token,
|
||||
"domain": ctx.config.server.full_url()
|
||||
}),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Sends a magic link authentication email to the user.
|
||||
///
|
||||
/// # Errors
|
||||
|
||||
10
src/mailers/auth/set_password/html.t
Normal file
10
src/mailers/auth/set_password/html.t
Normal file
@@ -0,0 +1,10 @@
|
||||
<html>
|
||||
|
||||
<body>
|
||||
Hey {{name}},
|
||||
Thanks for your order! We created an account for you. Set your password to finish, then you can track your orders:
|
||||
<a href="{{domain}}/set-password/{{resetToken}}">Set your password</a>
|
||||
If you didn't place this order, you can ignore this email.
|
||||
</body>
|
||||
|
||||
</html>
|
||||
1
src/mailers/auth/set_password/subject.t
Normal file
1
src/mailers/auth/set_password/subject.t
Normal file
@@ -0,0 +1 @@
|
||||
Set your password
|
||||
7
src/mailers/auth/set_password/text.t
Normal file
7
src/mailers/auth/set_password/text.t
Normal file
@@ -0,0 +1,7 @@
|
||||
Hey {{name}},
|
||||
|
||||
Thanks for your order! We created an account for you. Set your password to finish, then you can track your orders:
|
||||
|
||||
{{domain}}/set-password/{{resetToken}}
|
||||
|
||||
If you didn't place this order, you can ignore this email.
|
||||
@@ -13,7 +13,6 @@ pub struct Model {
|
||||
pub id: i32,
|
||||
#[sea_orm(unique)]
|
||||
pub user_id: i32,
|
||||
pub account_type: String,
|
||||
pub company_name: Option<String>,
|
||||
pub company_id: Option<String>,
|
||||
pub tax_id: Option<String>,
|
||||
|
||||
@@ -18,6 +18,7 @@ pub struct Model {
|
||||
pub status: String,
|
||||
pub total_cents: i64,
|
||||
pub currency: String,
|
||||
pub user_id: Option<i32>,
|
||||
pub account_type: String,
|
||||
pub company_name: Option<String>,
|
||||
pub company_id: Option<String>,
|
||||
|
||||
@@ -25,6 +25,7 @@ pub struct Model {
|
||||
pub magic_link_token: Option<String>,
|
||||
pub magic_link_expiration: Option<DateTimeWithTimeZone>,
|
||||
pub theme: String,
|
||||
pub account_type: String,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||
|
||||
@@ -9,11 +9,10 @@ use sea_orm::{ActiveValue, IntoActiveModel, QueryFilter, TryIntoModel};
|
||||
pub type CustomerProfiles = Entity;
|
||||
|
||||
/// The editable profile fields, shared by the profile page and the checkout
|
||||
/// "save my address" path. `account_type` is "personal" or "company"; the
|
||||
/// `company_*` fields are only meaningful for company accounts.
|
||||
/// "save my address" path. The `company_*` fields are only meaningful for
|
||||
/// company accounts (account type now lives on `users`, fixed at registration).
|
||||
#[derive(Debug, Default, Clone)]
|
||||
pub struct ProfileFields {
|
||||
pub account_type: String,
|
||||
pub company_name: Option<String>,
|
||||
pub company_id: Option<String>,
|
||||
pub tax_id: Option<String>,
|
||||
@@ -59,7 +58,6 @@ impl Model {
|
||||
..Default::default()
|
||||
},
|
||||
};
|
||||
active.account_type = ActiveValue::set(fields.account_type);
|
||||
active.company_name = ActiveValue::set(fields.company_name);
|
||||
active.company_id = ActiveValue::set(fields.company_id);
|
||||
active.tax_id = ActiveValue::set(fields.tax_id);
|
||||
|
||||
@@ -14,6 +14,9 @@ pub struct Checkout {
|
||||
pub email: String,
|
||||
pub phone: String,
|
||||
pub customer_name: Option<String>,
|
||||
/// The account that owns this order, if any (a logged-in buyer or a guest
|
||||
/// who created an account during checkout). `None` for pure guest orders.
|
||||
pub user_id: Option<i32>,
|
||||
pub account_type: String,
|
||||
pub company_name: Option<String>,
|
||||
pub company_id: Option<String>,
|
||||
@@ -75,6 +78,7 @@ pub async fn place(ctx: &AppContext, items: &[(i32, i32)], details: Checkout) ->
|
||||
status: Set("pending".to_string()),
|
||||
total_cents: Set(subtotal + details.method.price_cents),
|
||||
currency: Set(currency),
|
||||
user_id: Set(details.user_id),
|
||||
account_type: Set(details.account_type),
|
||||
company_name: Set(details.company_name),
|
||||
company_id: Set(details.company_id),
|
||||
|
||||
@@ -13,6 +13,9 @@ pub use crate::models::_entities::users::{self, ActiveModel, Entity, Model};
|
||||
pub const MAGIC_LINK_LENGTH: i8 = 32;
|
||||
pub const MAGIC_LINK_EXPIRATION_MIN: i8 = 5;
|
||||
|
||||
/// Minimum gap between verification-email resends for one account, in seconds.
|
||||
pub const VERIFICATION_RESEND_COOLDOWN_SECS: i64 = 60;
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize)]
|
||||
pub struct LoginParams {
|
||||
pub email: String,
|
||||
@@ -24,6 +27,21 @@ pub struct RegisterParams {
|
||||
pub email: String,
|
||||
pub password: String,
|
||||
pub name: String,
|
||||
/// "personal" or "company"; permanent for the account. Optional on the wire
|
||||
/// (older/JSON callers omit it) and normalized via [`normalize_account_type`].
|
||||
#[serde(default)]
|
||||
pub account_type: Option<String>,
|
||||
}
|
||||
|
||||
/// Normalize an account type to one of the two permanent values, defaulting to
|
||||
/// "personal" for anything missing or unexpected. An account's type is chosen
|
||||
/// once at registration and never changes.
|
||||
#[must_use]
|
||||
pub fn normalize_account_type(value: Option<&str>) -> String {
|
||||
match value.map(str::trim) {
|
||||
Some("company") => "company".to_string(),
|
||||
_ => "personal".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Validate, Deserialize)]
|
||||
@@ -216,6 +234,29 @@ impl Model {
|
||||
hash::verify_password(password, &self.password)
|
||||
}
|
||||
|
||||
/// Whether this is a company account (vs a personal one). Fixed at
|
||||
/// registration.
|
||||
#[must_use]
|
||||
pub fn is_company(&self) -> bool {
|
||||
self.account_type == "company"
|
||||
}
|
||||
|
||||
/// Seconds the user must still wait before another verification email may be
|
||||
/// sent — 0 means a resend is allowed now. Throttling resends off the last
|
||||
/// `email_verification_sent_at` keeps the endpoint from being an easy way to
|
||||
/// spam someone's inbox.
|
||||
#[must_use]
|
||||
pub fn verification_resend_wait_secs(&self) -> i64 {
|
||||
match self.email_verification_sent_at {
|
||||
Some(sent) => {
|
||||
let elapsed =
|
||||
(chrono::Utc::now() - sent.with_timezone(&chrono::Utc)).num_seconds();
|
||||
(VERIFICATION_RESEND_COOLDOWN_SECS - elapsed).max(0)
|
||||
}
|
||||
None => 0,
|
||||
}
|
||||
}
|
||||
|
||||
/// Asynchronously creates a user with a password and saves it to the
|
||||
/// database.
|
||||
///
|
||||
@@ -247,6 +288,7 @@ impl Model {
|
||||
email: ActiveValue::set(params.email.to_string()),
|
||||
password: ActiveValue::set(password_hash),
|
||||
name: ActiveValue::set(params.name.to_string()),
|
||||
account_type: ActiveValue::set(normalize_account_type(params.account_type.as_deref())),
|
||||
..Default::default()
|
||||
}
|
||||
.insert(&txn)
|
||||
@@ -257,6 +299,41 @@ impl Model {
|
||||
Ok(user)
|
||||
}
|
||||
|
||||
/// Creates an account on behalf of a checkout guest. The user never picks a
|
||||
/// password here (a strong random one satisfies the NOT NULL column, as in
|
||||
/// the OAuth path); they receive a "set your password" link by email. Errors
|
||||
/// with [`ModelError::EntityAlreadyExists`] if the email is already taken.
|
||||
///
|
||||
/// # Errors
|
||||
///
|
||||
/// When the email already exists or the insert fails.
|
||||
pub async fn create_guest_account(
|
||||
db: &DatabaseConnection,
|
||||
email: &str,
|
||||
name: &str,
|
||||
account_type: &str,
|
||||
) -> ModelResult<Self> {
|
||||
let password = PasswordGenerator::new()
|
||||
.length(16)
|
||||
.numbers(true)
|
||||
.lowercase_letters(true)
|
||||
.uppercase_letters(true)
|
||||
.symbols(true)
|
||||
.strict(true)
|
||||
.generate_one()
|
||||
.map_err(|e| ModelError::Any(e.into()))?;
|
||||
Self::create_with_password(
|
||||
db,
|
||||
&RegisterParams {
|
||||
email: email.to_string(),
|
||||
password,
|
||||
name: name.to_string(),
|
||||
account_type: Some(account_type.to_string()),
|
||||
},
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Creates a JWT
|
||||
///
|
||||
/// # Errors
|
||||
|
||||
1
tests/mailer/mod.rs
Normal file
1
tests/mailer/mod.rs
Normal file
@@ -0,0 +1 @@
|
||||
mod smtp_send;
|
||||
104
tests/mailer/smtp_send.rs
Normal file
104
tests/mailer/smtp_send.rs
Normal file
@@ -0,0 +1,104 @@
|
||||
//! Real-SMTP smoke test.
|
||||
//!
|
||||
//! Sends an actual email through the live SMTP server using the real
|
||||
//! `AuthMailer` pipeline (config -> Loco mailer -> templates -> SMTP). The test
|
||||
//! PASSES when the SMTP server accepts the message (the send returns `Ok`);
|
||||
//! confirm real delivery by checking the recipient's inbox.
|
||||
//!
|
||||
//! It is `#[ignore]`d so it never runs in CI or a normal `cargo test` (it opens
|
||||
//! a real network connection, uses real credentials, and sends a real email).
|
||||
//! Run it explicitly, inside `nix develop` so `SMTP_PASSWORD` is present:
|
||||
//!
|
||||
//! ```sh
|
||||
//! nix develop -c cargo test --test mod -- --ignored mailer::smtp_send
|
||||
//! # optional: choose the recipient (defaults to the address below)
|
||||
//! MAILER_TEST_TO=you@example.com \
|
||||
//! nix develop -c cargo test --test mod -- --ignored mailer::smtp_send
|
||||
//! ```
|
||||
|
||||
use kompress_eshop::{
|
||||
app::App,
|
||||
mailers::auth::AuthMailer,
|
||||
models::users::{Model, RegisterParams},
|
||||
};
|
||||
use loco_rs::testing::prelude::*;
|
||||
use sea_orm::IntoActiveModel;
|
||||
use serial_test::serial;
|
||||
|
||||
// Non-secret production SMTP settings (mirror `.env`). The password is
|
||||
// intentionally NOT here: it is supplied at runtime via `SMTP_PASSWORD`
|
||||
// (direnv -> `pass`), and never committed.
|
||||
// Dial the name the TLS cert is actually valid for. `smtp.kompress.sk` is a
|
||||
// DNS alias for the same server (213.215.124.101) but the cert only lists
|
||||
// smtp.euronet.sk, so connecting via the alias fails certificate validation.
|
||||
const SMTP_HOST: &str = "smtp.euronet.sk";
|
||||
const SMTP_PORT: &str = "587";
|
||||
const SMTP_USER: &str = "kompres";
|
||||
const SMTP_SECURE: &str = "true";
|
||||
|
||||
// Where the test email is sent. Override with `MAILER_TEST_TO`.
|
||||
const DEFAULT_RECIPIENT: &str = "filippriec@tutanota.com";
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
#[ignore = "sends a real email via live SMTP; run explicitly with --ignored"]
|
||||
async fn sends_real_email() {
|
||||
// The actual secret must come from the environment (direnv -> `pass`).
|
||||
// Fail loudly with guidance rather than silently sending nothing.
|
||||
let password = std::env::var("SMTP_PASSWORD").unwrap_or_default();
|
||||
assert!(
|
||||
!password.is_empty(),
|
||||
"SMTP_PASSWORD is not set. Run inside `nix develop` so direnv loads it from `pass`."
|
||||
);
|
||||
|
||||
let recipient =
|
||||
std::env::var("MAILER_TEST_TO").unwrap_or_else(|_| DEFAULT_RECIPIENT.to_string());
|
||||
|
||||
// Flip the booted context onto the real SMTP transport. `config/test.yaml`
|
||||
// reads these via `get_env` at boot. We deliberately do NOT load `.env`
|
||||
// here: it carries `DATABASE_URL`, and `test.yaml` has
|
||||
// `dangerously_recreate: true`, so loading it would recreate the real DB.
|
||||
// Leaving `DATABASE_URL` untouched keeps boot on the throwaway test DB.
|
||||
//
|
||||
// SAFETY: edition 2024 marks `set_var` as unsafe. This test is `#[serial]`,
|
||||
// so no other test mutates the process environment concurrently.
|
||||
unsafe {
|
||||
std::env::set_var("MAILER_STUB", "false");
|
||||
std::env::set_var("SMTP_ENABLE", "true");
|
||||
std::env::set_var("SMTP_HOST", SMTP_HOST);
|
||||
std::env::set_var("SMTP_PORT", SMTP_PORT);
|
||||
std::env::set_var("SMTP_USER", SMTP_USER);
|
||||
std::env::set_var("SMTP_SECURE", SMTP_SECURE);
|
||||
}
|
||||
|
||||
let boot = boot_test::<App>()
|
||||
.await
|
||||
.expect("Failed to boot test application");
|
||||
|
||||
// A real user whose address is the recipient, so `send_welcome` targets it.
|
||||
let user = Model::create_with_password(
|
||||
&boot.app_context.db,
|
||||
&RegisterParams {
|
||||
email: recipient.clone(),
|
||||
password: "smtp-smoke-test".to_string(),
|
||||
name: "SMTP smoke test".to_string(),
|
||||
account_type: Some("personal".to_string()),
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("failed to create test user");
|
||||
|
||||
// Give the welcome email a realistic verification token/link.
|
||||
user.into_active_model()
|
||||
.set_email_verification_sent(&boot.app_context.db)
|
||||
.await
|
||||
.expect("failed to set email verification token");
|
||||
let user = Model::find_by_email(&boot.app_context.db, &recipient)
|
||||
.await
|
||||
.expect("failed to reload test user");
|
||||
|
||||
// The assertion: the live SMTP server must accept the message.
|
||||
AuthMailer::send_welcome(&boot.app_context, &user)
|
||||
.await
|
||||
.unwrap_or_else(|e| panic!("real SMTP send to {recipient} failed: {e:?}"));
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
mod mailer;
|
||||
mod models;
|
||||
mod requests;
|
||||
mod tasks;
|
||||
|
||||
@@ -50,6 +50,7 @@ async fn can_create_with_password() {
|
||||
email: "test@framework.com".to_string(),
|
||||
password: "1234".to_string(),
|
||||
name: "framework".to_string(),
|
||||
account_type: Some("personal".to_string()),
|
||||
};
|
||||
|
||||
let res = Model::create_with_password(&boot.app_context.db, ¶ms).await;
|
||||
@@ -78,6 +79,7 @@ async fn handle_create_with_password_with_duplicate() {
|
||||
email: "user1@example.com".to_string(),
|
||||
password: "1234".to_string(),
|
||||
name: "framework".to_string(),
|
||||
account_type: Some("personal".to_string()),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
|
||||
Reference in New Issue
Block a user