From 5d062fb28080d6db3f6316fda43e079f0cc17eb5 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 11 Jan 2023 12:51:42 +0200
Subject: [PATCH 01/69] Login Page (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css              |  14 +++
 frontend/css/login_page.css                   |   4 +
 src/main/java/pm/axe/Endpoint.java            |   1 +
 src/main/java/pm/axe/ui/elements/AppMenu.java |   7 +-
 .../java/pm/axe/ui/layouts/AxeFormLayout.java | 114 ++++++++++++++++++
 .../java/pm/axe/ui/pages/user/LoginPage.java  |  80 ++++++++++--
 6 files changed, 210 insertions(+), 10 deletions(-)
 create mode 100644 frontend/css/axe_form_styles.css
 create mode 100644 frontend/css/login_page.css
 create mode 100644 src/main/java/pm/axe/ui/layouts/AxeFormLayout.java

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
new file mode 100644
index 000000000..456a18a10
--- /dev/null
+++ b/frontend/css/axe_form_styles.css
@@ -0,0 +1,14 @@
+.axe-form-title {
+    align-self: center;
+}
+
+.axe-compact-form {
+    background: var(--axe-compact-area-color);
+    max-width: min(761px, 97%);
+    align-self: center;
+    width: min-content !important;
+}
+
+.space-after-submit-button {
+    width: 100%;
+}
\ No newline at end of file
diff --git a/frontend/css/login_page.css b/frontend/css/login_page.css
new file mode 100644
index 000000000..61dea8dc8
--- /dev/null
+++ b/frontend/css/login_page.css
@@ -0,0 +1,4 @@
+.forgot-password-section {
+    text-align: center;
+    width: 100%;
+}
\ No newline at end of file
diff --git a/src/main/java/pm/axe/Endpoint.java b/src/main/java/pm/axe/Endpoint.java
index eab9b026c..efc7140c1 100644
--- a/src/main/java/pm/axe/Endpoint.java
+++ b/src/main/java/pm/axe/Endpoint.java
@@ -86,6 +86,7 @@ public static class UI {
         public static final String WELCOME_PAGE = "welcome";
         public static final String REGISTRATION_FAILED_PAGE = "registrationFailed";
         public static final String LOGIN_PAGE = "login";
+        public static final String REGISTRATION_PAGE = "register";
     }
 
     /**
diff --git a/src/main/java/pm/axe/ui/elements/AppMenu.java b/src/main/java/pm/axe/ui/elements/AppMenu.java
index 67fa68ff9..96c46ba3f 100644
--- a/src/main/java/pm/axe/ui/elements/AppMenu.java
+++ b/src/main/java/pm/axe/ui/elements/AppMenu.java
@@ -11,6 +11,7 @@
 import com.vaadin.flow.component.menubar.MenuBar;
 import com.vaadin.flow.component.menubar.MenuBarVariant;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import pm.axe.ui.pages.user.LoginPage;
 import pm.axe.utils.ErrorUtils;
 
 /**
@@ -18,6 +19,8 @@
  */
 public final class AppMenu extends Composite<MenuBar> {
 
+    private final Button loginButton = getLoginButton();
+
     /**
      * Creates menu, that should be shown to all visitors.
      *
@@ -58,7 +61,7 @@ private AppMenu(final boolean isUserMenu) {
         if (isUserMenu) {
             userMenuButtons.add(getLogoutButton());
         } else {
-            userMenuButtons.add(getLoginButton(), getRegisterButton());
+            userMenuButtons.add(loginButton, getRegisterButton());
         }
 
         //buttons
@@ -99,7 +102,7 @@ private void onLogoutButtonClicked(final ClickEvent<Button> event) {
     }
 
     private void onLoginButtonClicked(final ClickEvent<Button> event) {
-        showNotImplementedWarning();
+        loginButton.getUI().ifPresent(ui -> ui.navigate(LoginPage.class));
     }
 
     private void onRegisterButtonClicked(final ClickEvent<Button> event) {
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
new file mode 100644
index 000000000..dd336fa9c
--- /dev/null
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -0,0 +1,114 @@
+package pm.axe.ui.layouts;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.Hr;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import lombok.Getter;
+
+import java.util.stream.Stream;
+
+@CssImport(value = "./css/axe_form_styles.css")
+public class AxeFormLayout extends AxeBaseLayout {
+    protected static final String START_POINT = "1px";
+
+    private final VerticalLayout form = new VerticalLayout();
+    private final H2 formTitle = new H2();
+    private final Div formSubTitle = new Div();
+
+    private final Div fields = new Div();
+    private final Div spaceAfterFields = new Div();
+    private final Hr separator = new Hr();
+
+    @Getter
+    private final Button submitButton = new Button();
+    private final Div spaceAfterSubmitButton = new Div();
+
+    /**
+     * Initialise Layout elements and styles them.
+     */
+    public AxeFormLayout() {
+        init();
+        applyStyle();
+    }
+
+    protected void setCompactMode() {
+        form.addClassName("axe-compact-form");
+    }
+
+    protected void setFormTitle(final String title) {
+        formTitle.setText(title);
+        formTitle.setVisible(true);
+    }
+
+    protected void setFormSubTitle(final Component... components) {
+        formSubTitle.add(components);
+        formSubTitle.setVisible(true);
+    }
+
+    protected void setFormFields(final Component... components) {
+        fields.removeAll();
+        fields.add(components);
+        fields.setVisible(true);
+    }
+
+
+    protected void setComponentsAfterFields(final Component... components) {
+        spaceAfterFields.removeAll();
+        spaceAfterFields.add(components);
+        spaceAfterFields.setVisible(true);
+    }
+
+    protected void setSubmitButtonText(final String submitButtonText) {
+        separator.setVisible(true);
+        submitButton.setText(submitButtonText);
+        submitButton.setVisible(true);
+    }
+
+    protected void replaceSubmitButtonWithComponents(final Component... components) {
+        Div componentsBox = new Div(components);
+        form.replace(submitButton, componentsBox);
+    }
+
+    protected void setComponentsAfterSubmitButton(final Component... components) {
+        spaceAfterSubmitButton.removeAll();
+        spaceAfterSubmitButton.add(components);
+        spaceAfterSubmitButton.setVisible(true);
+    }
+
+    private void init() {
+        // by default all components are hidden
+        Stream<Component> formComponents =
+                Stream.of(formTitle, formSubTitle, fields, spaceAfterFields,
+                        separator, submitButton, spaceAfterSubmitButton);
+
+        formComponents.forEach(component -> {
+            component.setVisible(false);
+            form.add(component);
+        });
+
+        super.add(form);
+    }
+
+    private void applyStyle() {
+        form.setClassName("axe-form");
+        form.addClassName("border");
+
+        formTitle.setClassName("axe-form-title");
+        formSubTitle.setClassName("axe-form-subtitle");
+
+        fields.setClassName("axe-fields");
+
+        separator.addClassName("separator");
+
+        submitButton.addClassName("submit-button");
+        submitButton.setWidthFull();
+        submitButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+
+        spaceAfterSubmitButton.addClassName("space-after-submit-button");
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 92e884871..c040929be 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -1,23 +1,87 @@
 package pm.axe.ui.pages.user;
 
-import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.formlayout.FormLayout;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Section;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
 import pm.axe.Endpoint;
 import pm.axe.ui.MainView;
-import pm.axe.ui.layouts.AxeBaseLayout;
+import pm.axe.ui.layouts.AxeFormLayout;
+
 
 @SpringComponent
 @UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/login_page.css")
 @Route(value = Endpoint.UI.LOGIN_PAGE, layout = MainView.class)
 @PageTitle("Login Page - Axe.pm")
-public class LoginPage extends AxeBaseLayout {
-    /**
-     * Creates {@link LoginPage}.
-     */
-    public LoginPage() {
-        add(new H2("Login Page will be here soon."));
+public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
+    private final Span subTitleText = new Span();
+    private final Span spaceSpan = new Span();
+    private final Anchor subTitleLink = new Anchor();
+
+    private final FormLayout fields = new FormLayout();
+    private final TextField usernameInput = new TextField();
+    private final PasswordField passwordInput = new PasswordField();
+    private final Checkbox forgotMe = new Checkbox();
+
+    private final Section forgotPasswordSection = new Section();
+    private final Anchor forgotPasswordLink = new Anchor();
+
+    private boolean pageAlreadyInitialized = false;
+    @Override
+    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
+        if (pageAlreadyInitialized) return;
+        init();
+        pageAlreadyInitialized = true;
+    }
+
+    private void init() {
+        setCompactMode();
+        setFormTitle("Sign in to Axe");
+        subTitleText.setText("New to Axe?");
+        spaceSpan.setText(" ");
+        subTitleLink.setText("Register here");
+        subTitleLink.setHref(Endpoint.UI.REGISTRATION_PAGE);
+
+        setFormSubTitle(subTitleText, spaceSpan, subTitleLink);
+
+        fields.addFormItem(usernameInput, "Username/Email");
+        fields.addFormItem(passwordInput, "Password");
+        forgotMe.setLabel("Log me out after");
+        fields.add(forgotMe);
+        fields.setResponsiveSteps(new FormLayout.ResponsiveStep(START_POINT, 1));
+
+        setFormFields(fields);
+        setSubmitButtonText("Jump in");
+        getSubmitButton().addClickShortcut(Key.ENTER);
+        getSubmitButton().addClickListener(this::onLogin);
+
+        forgotPasswordLink.setHref(Endpoint.UI.PASSWORD_RESET_PAGE);
+        forgotPasswordLink.setText("Forgot your password?");
+        forgotPasswordLink.setClassName("forgot-password-link");
+        forgotPasswordSection.add(forgotPasswordLink);
+        forgotPasswordSection.setClassName("forgot-password-section");
+
+        setComponentsAfterSubmitButton(forgotPasswordSection);
+    }
+
+    private void onLogin(final ClickEvent<Button> event) {
+        Notification.show("Not implemented yet");
     }
 }

From 1c4daa4bde4d49a35f714f6d9818365a19ea1a4b Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 11 Jan 2023 15:01:29 +0200
Subject: [PATCH 02/69] Login Page. CSSex (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css              | 26 ++++++++++++++++++-
 src/main/java/pm/axe/Endpoint.java            |  1 +
 .../java/pm/axe/ui/pages/user/LoginPage.java  |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 456a18a10..195f2e9ba 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -4,11 +4,35 @@
 
 .axe-compact-form {
     background: var(--axe-compact-area-color);
-    max-width: min(761px, 97%);
+    max-width: min(761px, 95%);
     align-self: center;
     width: min-content !important;
 }
 
 .space-after-submit-button {
     width: 100%;
+}
+
+@media (max-width: 355px) {
+    vaadin-form-item vaadin-text-field, vaadin-password-field {
+        max-width: calc(100% - 2rem);
+    }
+}
+
+@media (min-width: 356px) and (max-width: 361px) {
+    vaadin-form-item vaadin-text-field, vaadin-password-field {
+        max-width: calc(100% - 1.7rem);
+    }
+}
+
+@media (min-width: 361px) and (max-width: 375px) {
+    vaadin-form-item vaadin-text-field, vaadin-password-field {
+        max-width: calc(100% - 1rem);
+    }
+}
+
+@media (min-width: 376px) and (max-width: 417px) {
+    vaadin-form-item vaadin-text-field, vaadin-password-field {
+        max-width: calc(100% - 0.5rem);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/pm/axe/Endpoint.java b/src/main/java/pm/axe/Endpoint.java
index efc7140c1..43afe1e9b 100644
--- a/src/main/java/pm/axe/Endpoint.java
+++ b/src/main/java/pm/axe/Endpoint.java
@@ -87,6 +87,7 @@ public static class UI {
         public static final String REGISTRATION_FAILED_PAGE = "registrationFailed";
         public static final String LOGIN_PAGE = "login";
         public static final String REGISTRATION_PAGE = "register";
+        public static final String FORGOT_PASSWORD_PAGE = "forgot-password";
     }
 
     /**
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index c040929be..0671d7511 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -72,7 +72,7 @@ private void init() {
         getSubmitButton().addClickShortcut(Key.ENTER);
         getSubmitButton().addClickListener(this::onLogin);
 
-        forgotPasswordLink.setHref(Endpoint.UI.PASSWORD_RESET_PAGE);
+        forgotPasswordLink.setHref(Endpoint.UI.FORGOT_PASSWORD_PAGE);
         forgotPasswordLink.setText("Forgot your password?");
         forgotPasswordLink.setClassName("forgot-password-link");
         forgotPasswordSection.add(forgotPasswordLink);

From 1352448b588622aa76340b1cdb287064df8de0eb Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 11 Jan 2023 16:19:12 +0200
Subject: [PATCH 03/69] Login Page. CSSex 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css                  | 4 ++--
 src/main/java/pm/axe/ui/pages/user/LoginPage.java | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 195f2e9ba..8d24de28c 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -27,12 +27,12 @@
 
 @media (min-width: 361px) and (max-width: 375px) {
     vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 1rem);
+        max-width: calc(100% - 1.2rem);
     }
 }
 
 @media (min-width: 376px) and (max-width: 417px) {
     vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 0.5rem);
+        max-width: calc(100% - 0.7rem);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 0671d7511..01e6cb56f 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -79,6 +79,11 @@ private void init() {
         forgotPasswordSection.setClassName("forgot-password-section");
 
         setComponentsAfterSubmitButton(forgotPasswordSection);
+
+        //TODO small screen only
+        getCentralLayout().getStyle().set("padding-left", "1px");
+        getCentralLayout().getStyle().set("padding-right", "1px");
+
     }
 
     private void onLogin(final ClickEvent<Button> event) {

From 33be3a57a2ad2e7f583e7be6a916419709e6efe0 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 01:46:16 +0200
Subject: [PATCH 04/69] Login Page. CSSex 3 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css              | 31 ++-----------------
 frontend/css/login_page.css                   |  5 +++
 .../java/pm/axe/ui/layouts/AxeFormLayout.java |  2 +-
 .../java/pm/axe/ui/pages/user/LoginPage.java  | 15 +++++----
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 8d24de28c..3ec5b8241 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -2,37 +2,10 @@
     align-self: center;
 }
 
-.axe-compact-form {
-    background: var(--axe-compact-area-color);
-    max-width: min(761px, 95%);
-    align-self: center;
-    width: min-content !important;
-}
-
 .space-after-submit-button {
     width: 100%;
 }
 
-@media (max-width: 355px) {
-    vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 2rem);
-    }
-}
-
-@media (min-width: 356px) and (max-width: 361px) {
-    vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 1.7rem);
-    }
-}
-
-@media (min-width: 361px) and (max-width: 375px) {
-    vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 1.2rem);
-    }
-}
-
-@media (min-width: 376px) and (max-width: 417px) {
-    vaadin-form-item vaadin-text-field, vaadin-password-field {
-        max-width: calc(100% - 0.7rem);
-    }
+.form-input {
+    min-width: min(70vw, 300px);
 }
\ No newline at end of file
diff --git a/frontend/css/login_page.css b/frontend/css/login_page.css
index 61dea8dc8..9d15db2f6 100644
--- a/frontend/css/login_page.css
+++ b/frontend/css/login_page.css
@@ -1,4 +1,9 @@
 .forgot-password-section {
     text-align: center;
     width: 100%;
+}
+
+.vertically-compact {
+    padding-top: 1px;
+    padding-bottom: 1px;
 }
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index dd336fa9c..e0fcf5494 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -37,7 +37,7 @@ public AxeFormLayout() {
     }
 
     protected void setCompactMode() {
-        form.addClassName("axe-compact-form");
+        form.addClassName("axe-compact");
     }
 
     protected void setFormTitle(final String title) {
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 01e6cb56f..fffd3ad0d 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -5,11 +5,11 @@
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.dependency.CssImport;
-import com.vaadin.flow.component.formlayout.FormLayout;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.Section;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.BeforeEnterEvent;
@@ -35,7 +35,7 @@ public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private final Span spaceSpan = new Span();
     private final Anchor subTitleLink = new Anchor();
 
-    private final FormLayout fields = new FormLayout();
+    private final VerticalLayout fields = new VerticalLayout();
     private final TextField usernameInput = new TextField();
     private final PasswordField passwordInput = new PasswordField();
     private final Checkbox forgotMe = new Checkbox();
@@ -61,13 +61,16 @@ private void init() {
 
         setFormSubTitle(subTitleText, spaceSpan, subTitleLink);
 
-        fields.addFormItem(usernameInput, "Username/Email");
-        fields.addFormItem(passwordInput, "Password");
+        usernameInput.setLabel("Username/Email");
+        passwordInput.setLabel("Password");
         forgotMe.setLabel("Log me out after");
-        fields.add(forgotMe);
-        fields.setResponsiveSteps(new FormLayout.ResponsiveStep(START_POINT, 1));
+        fields.add(usernameInput, passwordInput, forgotMe);
+        fields.getChildren().forEach(component -> component.getElement().setAttribute("class", "form-input"));
+        fields.setSpacing(false);
+        fields.addClassName("vertically-compact");
 
         setFormFields(fields);
+
         setSubmitButtonText("Jump in");
         getSubmitButton().addClickShortcut(Key.ENTER);
         getSubmitButton().addClickListener(this::onLogin);

From 928bcab43b5335fbfba07c6540076da8d0015000 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 11:38:37 +0200
Subject: [PATCH 05/69] ForgotPasswordPage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css              |  11 +-
 frontend/css/common_styles.css                |   4 +
 frontend/css/forgot_password_page.css         |   3 +
 frontend/css/login_page.css                   |   5 -
 .../java/pm/axe/ui/layouts/AxeFormLayout.java |   6 +-
 .../axe/ui/pages/user/ForgotPasswordPage.java | 140 ++++++++++++++++++
 .../java/pm/axe/ui/pages/user/LoginPage.java  |  13 +-
 7 files changed, 163 insertions(+), 19 deletions(-)
 create mode 100644 frontend/css/forgot_password_page.css
 create mode 100644 src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 3ec5b8241..2b90b52cb 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -6,6 +6,15 @@
     width: 100%;
 }
 
-.form-input {
+.vertically-compact {
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+
+.axe-fields > * {
     min-width: min(70vw, 300px);
+}
+
+.space-after-fields {
+    max-width: min(70vw, 300px);
 }
\ No newline at end of file
diff --git a/frontend/css/common_styles.css b/frontend/css/common_styles.css
index 1de36d8c9..eb42258ca 100644
--- a/frontend/css/common_styles.css
+++ b/frontend/css/common_styles.css
@@ -209,3 +209,7 @@ vaadin-drawer-toggle {
 vaadin-icon[icon="vaadin:sign-in"] {
     padding-left: 0 !important;
 }
+
+.green {
+    color: green;
+}
\ No newline at end of file
diff --git a/frontend/css/forgot_password_page.css b/frontend/css/forgot_password_page.css
new file mode 100644
index 000000000..eaad35b3c
--- /dev/null
+++ b/frontend/css/forgot_password_page.css
@@ -0,0 +1,3 @@
+.result-span {
+    padding-left: 1rem;
+}
\ No newline at end of file
diff --git a/frontend/css/login_page.css b/frontend/css/login_page.css
index 9d15db2f6..b206f55bb 100644
--- a/frontend/css/login_page.css
+++ b/frontend/css/login_page.css
@@ -2,8 +2,3 @@
     text-align: center;
     width: 100%;
 }
-
-.vertically-compact {
-    padding-top: 1px;
-    padding-bottom: 1px;
-}
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index e0fcf5494..6ae2b2ae9 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -20,7 +20,7 @@ public class AxeFormLayout extends AxeBaseLayout {
     private final H2 formTitle = new H2();
     private final Div formSubTitle = new Div();
 
-    private final Div fields = new Div();
+    private final VerticalLayout fields = new VerticalLayout();
     private final Div spaceAfterFields = new Div();
     private final Hr separator = new Hr();
 
@@ -102,6 +102,10 @@ private void applyStyle() {
         formSubTitle.setClassName("axe-form-subtitle");
 
         fields.setClassName("axe-fields");
+        fields.setSpacing(false);
+        fields.addClassName("vertically-compact");
+
+        spaceAfterFields.addClassName("space-after-fields");
 
         separator.addClassName("separator");
 
diff --git a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
new file mode 100644
index 000000000..2b7ec2ffb
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
@@ -0,0 +1,140 @@
+package pm.axe.ui.pages.user;
+
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.Axe;
+import pm.axe.Endpoint;
+import pm.axe.ui.MainView;
+import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.utils.AppUtils;
+
+@Slf4j
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/forgot_password_page.css")
+@Route(value = Endpoint.UI.FORGOT_PASSWORD_PAGE, layout = MainView.class)
+@PageTitle("Forgot Password - Axe.pm")
+public class ForgotPasswordPage extends AxeFormLayout implements BeforeEnterObserver {
+    private static final String TAG = "[" + ForgotPasswordPage.class.getSimpleName() + "]";
+    private final AppUtils appUtils;
+
+    private final TextField usernameInput = new TextField();
+    private Span contactKyberorgSpan;
+    private final Span successSpan = getSuccessSpan();
+
+    private Details nothingLinkedDetails;
+
+    private boolean pageAlreadyInitialized = false;
+
+    @Override
+    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
+        if (pageAlreadyInitialized) return;
+        pageInit();
+        applyState();
+        pageAlreadyInitialized = true;
+    }
+
+    private void pageInit() {
+        setCompactMode();
+        setFormTitle("Forgot Password?");
+
+        usernameInput.setLabel("Username/Email");
+        usernameInput.setClearButtonVisible(true);
+        setFormFields(usernameInput);
+
+        contactKyberorgSpan = getContactKyberorgSpan();
+        setComponentsAfterFields(getRecoveryNote());
+        setSubmitButtonText("Submit");
+        getSubmitButton().addClickShortcut(Key.ENTER);
+        getSubmitButton().addClickListener(this::onSubmit);
+    }
+
+    private void applyState() {
+        usernameInput.focus();
+        nothingLinkedDetails.setOpened(false);
+    }
+
+    private void onSubmit(final ClickEvent<Button> event) {
+        if (nothingLinkedDetails.isOpened()) nothingLinkedDetails.setOpened(false);
+
+        final String username = usernameInput.getValue();
+        if (StringUtils.isBlank(username)) {
+            usernameInput.setInvalid(true);
+            usernameInput.setErrorMessage("Please enter username");
+            return;
+        }
+        log.info("{} Password reset attempt. Username: '{}'", TAG, username);
+        cleanAnHideInput();
+        showSuccessMessage();
+    }
+
+    private void cleanAnHideInput() {
+        usernameInput.setValue("");
+        usernameInput.setVisible(false);
+    }
+
+    private void showSuccessMessage() {
+        replaceSubmitButtonWithComponents(successSpan);
+    }
+
+    private VerticalLayout getRecoveryNote() {
+        VerticalLayout recoveryNote = new VerticalLayout();
+        Span infoSpan = new Span("We will send password reset link to contact point (email etc.) " +
+                "linked with given account.");
+
+        VerticalLayout nothingLinkedContent = getAccordionContent();
+
+        nothingLinkedDetails = new Details("Nothing linked with account?", nothingLinkedContent);
+
+        recoveryNote.add(infoSpan, nothingLinkedDetails);
+        return recoveryNote;
+    }
+    private VerticalLayout getAccordionContent() {
+        VerticalLayout content = new VerticalLayout();
+        Span manualWaySpan = new Span("Manual way is an only way to recover it.");
+        content.add(manualWaySpan, contactKyberorgSpan);
+        return content;
+    }
+
+    private Span getContactKyberorgSpan() {
+        Span contact = new Span("Contact");
+        Span spaceSpan = new Span(" ");
+
+        String kyberorg = "kyberorg";
+        String telegramLink = String.format("%s%s", Axe.Telegram.TELEGRAM_URL, kyberorg);
+        Anchor tgLink = new Anchor(telegramLink, "@" + kyberorg);
+
+        Span dropEmailText = new Span("or drop email to");
+        String axeEmail = appUtils.getEmailFromAddress();
+        String mailTo = String.format("mailto:%s", axeEmail);
+        Anchor emailLink = new Anchor(mailTo, axeEmail);
+
+        return new Span(contact, spaceSpan, tgLink, spaceSpan, dropEmailText, spaceSpan, emailLink);
+    }
+
+    private Span getSuccessSpan() {
+        Span successSpan = new Span();
+        successSpan.setClassName("green");
+        successSpan.addClassName("result-span");
+        successSpan.setText("Sent");
+        return successSpan;
+    }
+}
+
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index fffd3ad0d..cd290f41b 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -9,7 +9,6 @@
 import com.vaadin.flow.component.html.Section;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.BeforeEnterEvent;
@@ -35,7 +34,6 @@ public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private final Span spaceSpan = new Span();
     private final Anchor subTitleLink = new Anchor();
 
-    private final VerticalLayout fields = new VerticalLayout();
     private final TextField usernameInput = new TextField();
     private final PasswordField passwordInput = new PasswordField();
     private final Checkbox forgotMe = new Checkbox();
@@ -64,12 +62,8 @@ private void init() {
         usernameInput.setLabel("Username/Email");
         passwordInput.setLabel("Password");
         forgotMe.setLabel("Log me out after");
-        fields.add(usernameInput, passwordInput, forgotMe);
-        fields.getChildren().forEach(component -> component.getElement().setAttribute("class", "form-input"));
-        fields.setSpacing(false);
-        fields.addClassName("vertically-compact");
 
-        setFormFields(fields);
+        setFormFields(usernameInput, passwordInput, forgotMe);
 
         setSubmitButtonText("Jump in");
         getSubmitButton().addClickShortcut(Key.ENTER);
@@ -82,11 +76,6 @@ private void init() {
         forgotPasswordSection.setClassName("forgot-password-section");
 
         setComponentsAfterSubmitButton(forgotPasswordSection);
-
-        //TODO small screen only
-        getCentralLayout().getStyle().set("padding-left", "1px");
-        getCentralLayout().getStyle().set("padding-right", "1px");
-
     }
 
     private void onLogin(final ClickEvent<Button> event) {

From 7859c1d209a82d8dbf5f5a94ba81321154922f50 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 11:44:42 +0200
Subject: [PATCH 06/69] ForgotPasswordPage 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/ForgotPasswordPage.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
index 2b7ec2ffb..a9652e72e 100644
--- a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
@@ -114,19 +114,17 @@ private VerticalLayout getAccordionContent() {
     }
 
     private Span getContactKyberorgSpan() {
-        Span contact = new Span("Contact");
-        Span spaceSpan = new Span(" ");
-
+        Span contact = new Span("Contact ");
         String kyberorg = "kyberorg";
         String telegramLink = String.format("%s%s", Axe.Telegram.TELEGRAM_URL, kyberorg);
         Anchor tgLink = new Anchor(telegramLink, "@" + kyberorg);
 
-        Span dropEmailText = new Span("or drop email to");
+        Span dropEmailText = new Span(" or drop email to ");
         String axeEmail = appUtils.getEmailFromAddress();
         String mailTo = String.format("mailto:%s", axeEmail);
         Anchor emailLink = new Anchor(mailTo, axeEmail);
 
-        return new Span(contact, spaceSpan, tgLink, spaceSpan, dropEmailText, spaceSpan, emailLink);
+        return new Span(contact, tgLink, dropEmailText, emailLink);
     }
 
     private Span getSuccessSpan() {

From 5e06a01932d1b95661f685bc6f5dc9defb47e4bc Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 12:49:46 +0200
Subject: [PATCH 07/69] ForgotPasswordPage 3 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/ForgotPasswordPage.java   |  1 +
 .../java/pm/axe/ui/pages/user/LoginPage.java    | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
index a9652e72e..a384d2e5d 100644
--- a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
@@ -45,6 +45,7 @@ public class ForgotPasswordPage extends AxeFormLayout implements BeforeEnterObse
 
     @Override
     public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
+        if (beforeEnterEvent.isRefreshEvent()) return;
         if (pageAlreadyInitialized) return;
         pageInit();
         applyState();
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index cd290f41b..ae08f4441 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -44,9 +44,13 @@ public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private boolean pageAlreadyInitialized = false;
     @Override
     public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
-        if (pageAlreadyInitialized) return;
-        init();
-        pageAlreadyInitialized = true;
+        if (beforeEnterEvent.isRefreshEvent()) return;
+        if (pageAlreadyInitialized) {
+           cleanInputs();
+        } else {
+            init();
+            pageAlreadyInitialized = true;
+        }
     }
 
     private void init() {
@@ -60,6 +64,7 @@ private void init() {
         setFormSubTitle(subTitleText, spaceSpan, subTitleLink);
 
         usernameInput.setLabel("Username/Email");
+        usernameInput.setClearButtonVisible(true);
         passwordInput.setLabel("Password");
         forgotMe.setLabel("Log me out after");
 
@@ -81,4 +86,10 @@ private void init() {
     private void onLogin(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
+
+    private void cleanInputs() {
+        usernameInput.clear();
+        passwordInput.clear();
+        forgotMe.clear();
+    }
 }

From 8d7d2f5d3cc8a70a6c1e50eed36b67619edddd24 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 15:34:33 +0200
Subject: [PATCH 08/69] RegistrationPage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/axe_form_styles.css              |   8 +-
 frontend/css/registration_page.css            |   3 +
 .../java/pm/axe/ui/layouts/AxeFormLayout.java |   1 -
 .../axe/ui/pages/user/RegistrationPage.java   | 118 ++++++++++++++++++
 4 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 frontend/css/registration_page.css
 create mode 100644 src/main/java/pm/axe/ui/pages/user/RegistrationPage.java

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 2b90b52cb..1514f8aa7 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -2,6 +2,9 @@
     align-self: center;
 }
 
+.axe-form-subtitle {
+    padding-left: 1rem;
+}
 .space-after-submit-button {
     width: 100%;
 }
@@ -12,9 +15,10 @@
 }
 
 .axe-fields > * {
-    min-width: min(70vw, 300px);
+    min-width: 99%;
 }
 
 .space-after-fields {
-    max-width: min(70vw, 300px);
+    padding-left: 1rem;
+    max-width: 99%;
 }
\ No newline at end of file
diff --git a/frontend/css/registration_page.css b/frontend/css/registration_page.css
new file mode 100644
index 000000000..f4bd7861e
--- /dev/null
+++ b/frontend/css/registration_page.css
@@ -0,0 +1,3 @@
+.email-input {
+    min-width: 99%;
+}
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index 6ae2b2ae9..42e073fb0 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -14,7 +14,6 @@
 
 @CssImport(value = "./css/axe_form_styles.css")
 public class AxeFormLayout extends AxeBaseLayout {
-    protected static final String START_POINT = "1px";
 
     private final VerticalLayout form = new VerticalLayout();
     private final H2 formTitle = new H2();
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
new file mode 100644
index 000000000..3eee035ae
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -0,0 +1,118 @@
+package pm.axe.ui.pages.user;
+
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.EmailField;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import pm.axe.Endpoint;
+import pm.axe.ui.MainView;
+import pm.axe.ui.layouts.AxeFormLayout;
+
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/registration_page.css")
+@Route(value = Endpoint.UI.REGISTRATION_PAGE, layout = MainView.class)
+@PageTitle("Registration - Axe.pm")
+public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserver {
+
+    private final Span subTitleText = new Span();
+    private final Anchor subTitleLink = new Anchor();
+
+    private final TextField usernameEmailInput = new TextField();
+    private final PasswordField passwordInput = new PasswordField();
+
+    private final Details contactPointDetails = new Details();
+    private final EmailField emailField = new EmailField();
+
+    private final VerticalLayout tfaLayout = new VerticalLayout();
+    private final Label tfaLabel = new Label();
+    private final Checkbox tfaBox = new Checkbox();
+
+    private final Span tosNote = createLegalInfo();
+
+    private boolean pageAlreadyInitialized = false;
+
+    @Override
+    public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
+        if (beforeEnterEvent.isRefreshEvent()) return;
+        if (pageAlreadyInitialized) {
+            cleanInputs();
+        } else {
+            pageInit();
+            pageAlreadyInitialized = true;
+        }
+    }
+    private void pageInit() {
+        setCompactMode();
+        setFormTitle("Become Axe User");
+
+        subTitleText.setText("Already have an account? ");
+
+        subTitleLink.setText("Log in");
+        subTitleLink.setHref(Endpoint.UI.LOGIN_PAGE);
+
+        setFormSubTitle(subTitleText, subTitleLink);
+
+        usernameEmailInput.setLabel("Username/Email");
+        usernameEmailInput.setClearButtonVisible(true);
+        passwordInput.setLabel("Password");
+
+        emailField.setLabel("Email");
+        emailField.setClassName("email-input");
+        contactPointDetails.setSummaryText("Contact point (optional)");
+        contactPointDetails.setOpened(false);
+        contactPointDetails.addContent(emailField);
+
+        tfaBox.setId("tfaBox");
+        tfaBox.setLabel("Protect my account with additional one time codes");
+        tfaLabel.setText("Two-Factor Authentication (2FA)");
+        tfaLayout.setPadding(false);
+        tfaLayout.add(tfaLabel, tfaBox);
+
+        setFormFields(usernameEmailInput, passwordInput, contactPointDetails, tfaLayout);
+
+        setComponentsAfterFields(tosNote);
+        setSubmitButtonText("Sign up");
+
+        getSubmitButton().addClickListener(this::onRegister);
+    }
+
+    private void cleanInputs() {
+        usernameEmailInput.clear();
+        passwordInput.clear();
+        emailField.clear();
+    }
+
+    private void onRegister(final ClickEvent<Button> event) {
+        Notification.show("Not implemented yet");
+    }
+
+    private Span createLegalInfo() {
+        Span tosStart = new Span("By signing up, you accept our ");
+        Anchor linkToTerms = new Anchor();
+        //TODO correct location when ready
+        linkToTerms.setHref(Endpoint.UI.APP_INFO_PAGE);
+        linkToTerms.setText("Terms of Service");
+
+        Span tosEnd = new Span(".");
+
+        return new Span(tosStart, linkToTerms, tosEnd);
+    }
+}

From 5f2f726101edfd8c1f003bd97f8e9c1967265041 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 15:37:40 +0200
Subject: [PATCH 09/69] TermsOfServicePage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/Endpoint.java            |  1 +
 .../axe/ui/pages/tos/TermsOfServicePage.java  | 21 +++++++++++++++++++
 .../axe/ui/pages/user/RegistrationPage.java   |  3 +--
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java

diff --git a/src/main/java/pm/axe/Endpoint.java b/src/main/java/pm/axe/Endpoint.java
index 43afe1e9b..d6dda19ee 100644
--- a/src/main/java/pm/axe/Endpoint.java
+++ b/src/main/java/pm/axe/Endpoint.java
@@ -88,6 +88,7 @@ public static class UI {
         public static final String LOGIN_PAGE = "login";
         public static final String REGISTRATION_PAGE = "register";
         public static final String FORGOT_PASSWORD_PAGE = "forgot-password";
+        public static final String TOS_PAGE = "terms-of-service";
     }
 
     /**
diff --git a/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java b/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java
new file mode 100644
index 000000000..3dab3ee8e
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java
@@ -0,0 +1,21 @@
+package pm.axe.ui.pages.tos;
+
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import pm.axe.Endpoint;
+import pm.axe.ui.MainView;
+import pm.axe.ui.layouts.AxeBaseLayout;
+
+@SpringComponent
+@UIScope
+@Route(value = Endpoint.UI.TOS_PAGE, layout = MainView.class)
+@PageTitle("Terms of Service - Axe.pm")
+public class TermsOfServicePage extends AxeBaseLayout {
+    public TermsOfServicePage() {
+        add(new Span("Here will be Axe Terms of Service"));
+    }
+
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 3eee035ae..42878b0af 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -107,8 +107,7 @@ private void onRegister(final ClickEvent<Button> event) {
     private Span createLegalInfo() {
         Span tosStart = new Span("By signing up, you accept our ");
         Anchor linkToTerms = new Anchor();
-        //TODO correct location when ready
-        linkToTerms.setHref(Endpoint.UI.APP_INFO_PAGE);
+        linkToTerms.setHref(Endpoint.UI.TOS_PAGE);
         linkToTerms.setText("Terms of Service");
 
         Span tosEnd = new Span(".");

From 2176b775b0bd08a06ad4036547b82b2eb7e701fb Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 16:18:47 +0200
Subject: [PATCH 10/69] CSS (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/layouts/AxeFormLayout.java | 4 +++-
 src/main/java/pm/axe/ui/pages/user/LoginPage.java  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index 42e073fb0..706dc71b2 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -8,6 +8,7 @@
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.html.Hr;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import lombok.AccessLevel;
 import lombok.Getter;
 
 import java.util.stream.Stream;
@@ -15,6 +16,7 @@
 @CssImport(value = "./css/axe_form_styles.css")
 public class AxeFormLayout extends AxeBaseLayout {
 
+    @Getter(value = AccessLevel.PROTECTED)
     private final VerticalLayout form = new VerticalLayout();
     private final H2 formTitle = new H2();
     private final Div formSubTitle = new Div();
@@ -23,7 +25,7 @@ public class AxeFormLayout extends AxeBaseLayout {
     private final Div spaceAfterFields = new Div();
     private final Hr separator = new Hr();
 
-    @Getter
+    @Getter(value = AccessLevel.PROTECTED)
     private final Button submitButton = new Button();
     private final Div spaceAfterSubmitButton = new Div();
 
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index ae08f4441..989f393cd 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -55,6 +55,8 @@ public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
 
     private void init() {
         setCompactMode();
+        getForm().getStyle().set("width", "100% !important"); //dirty fix for large screens
+
         setFormTitle("Sign in to Axe");
         subTitleText.setText("New to Axe?");
         spaceSpan.setText(" ");

From cd14eec9962b69aa0968e396d5a75e1bad056663 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 17:38:18 +0200
Subject: [PATCH 11/69] New stuff (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/elements/AppMenu.java       |  6 ++++--
 src/main/java/pm/axe/ui/layouts/AxeFormLayout.java  |  1 +
 .../pm/axe/ui/pages/user/ForgotPasswordPage.java    |  1 +
 .../java/pm/axe/ui/pages/user/RegistrationPage.java | 13 +++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/pm/axe/ui/elements/AppMenu.java b/src/main/java/pm/axe/ui/elements/AppMenu.java
index 96c46ba3f..3a328900b 100644
--- a/src/main/java/pm/axe/ui/elements/AppMenu.java
+++ b/src/main/java/pm/axe/ui/elements/AppMenu.java
@@ -12,6 +12,7 @@
 import com.vaadin.flow.component.menubar.MenuBarVariant;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import pm.axe.ui.pages.user.LoginPage;
+import pm.axe.ui.pages.user.RegistrationPage;
 import pm.axe.utils.ErrorUtils;
 
 /**
@@ -20,6 +21,7 @@
 public final class AppMenu extends Composite<MenuBar> {
 
     private final Button loginButton = getLoginButton();
+    private final Button registerButton = getRegisterButton();
 
     /**
      * Creates menu, that should be shown to all visitors.
@@ -61,7 +63,7 @@ private AppMenu(final boolean isUserMenu) {
         if (isUserMenu) {
             userMenuButtons.add(getLogoutButton());
         } else {
-            userMenuButtons.add(loginButton, getRegisterButton());
+            userMenuButtons.add(loginButton, registerButton);
         }
 
         //buttons
@@ -106,7 +108,7 @@ private void onLoginButtonClicked(final ClickEvent<Button> event) {
     }
 
     private void onRegisterButtonClicked(final ClickEvent<Button> event) {
-        showNotImplementedWarning();
+        registerButton.getUI().ifPresent(ui -> ui.navigate(RegistrationPage.class));
     }
 
     private void openUserProfilePage(final ClickEvent<MenuItem> event) {
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index 706dc71b2..2ed27b27b 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -22,6 +22,7 @@ public class AxeFormLayout extends AxeBaseLayout {
     private final Div formSubTitle = new Div();
 
     private final VerticalLayout fields = new VerticalLayout();
+    @Getter(value = AccessLevel.PROTECTED)
     private final Div spaceAfterFields = new Div();
     private final Hr separator = new Hr();
 
diff --git a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
index a384d2e5d..d9eea079d 100644
--- a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
@@ -61,6 +61,7 @@ private void pageInit() {
         setFormFields(usernameInput);
 
         contactKyberorgSpan = getContactKyberorgSpan();
+        getSpaceAfterFields().getStyle().set("padding-left", "0");
         setComponentsAfterFields(getRecoveryNote());
         setSubmitButtonText("Submit");
         getSubmitButton().addClickShortcut(Key.ENTER);
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 42878b0af..2d61d918f 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -6,10 +6,8 @@
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Anchor;
-import com.vaadin.flow.component.html.Label;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
@@ -41,8 +39,7 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private final Details contactPointDetails = new Details();
     private final EmailField emailField = new EmailField();
 
-    private final VerticalLayout tfaLayout = new VerticalLayout();
-    private final Label tfaLabel = new Label();
+    private final Details tfaDetails = new Details();
     private final Checkbox tfaBox = new Checkbox();
 
     private final Span tosNote = createLegalInfo();
@@ -82,11 +79,11 @@ private void pageInit() {
 
         tfaBox.setId("tfaBox");
         tfaBox.setLabel("Protect my account with additional one time codes");
-        tfaLabel.setText("Two-Factor Authentication (2FA)");
-        tfaLayout.setPadding(false);
-        tfaLayout.add(tfaLabel, tfaBox);
+        tfaDetails.setSummaryText("Two-Factor Authentication (2FA)");
+        tfaDetails.setOpened(true);
+        tfaDetails.addContent(tfaBox);
 
-        setFormFields(usernameEmailInput, passwordInput, contactPointDetails, tfaLayout);
+        setFormFields(usernameEmailInput, passwordInput, contactPointDetails, tfaDetails);
 
         setComponentsAfterFields(tosNote);
         setSubmitButtonText("Sign up");

From 6087deeaeb48396f94e61fbf37eab07b0f8be88d Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 12 Jan 2023 17:45:56 +0200
Subject: [PATCH 12/69] Tooltip test (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/pages/user/RegistrationPage.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 2d61d918f..0a0dfe4c3 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -69,7 +69,9 @@ private void pageInit() {
 
         usernameEmailInput.setLabel("Username/Email");
         usernameEmailInput.setClearButtonVisible(true);
+        usernameEmailInput.setTooltipText("Username here please");
         passwordInput.setLabel("Password");
+        passwordInput.setTooltipText("Password should be at least 3 chars");
 
         emailField.setLabel("Email");
         emailField.setClassName("email-input");

From 3086d28ff32374490ad94041c83aaa538df58df2 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 13:06:20 +0200
Subject: [PATCH 13/69] RegistrationPage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/registration_page.css            |   9 +-
 .../java/pm/axe/ui/pages/user/LoginPage.java  |   2 +-
 .../axe/ui/pages/user/RegistrationPage.java   | 127 ++++++++++++++----
 3 files changed, 107 insertions(+), 31 deletions(-)

diff --git a/frontend/css/registration_page.css b/frontend/css/registration_page.css
index f4bd7861e..e695a23d9 100644
--- a/frontend/css/registration_page.css
+++ b/frontend/css/registration_page.css
@@ -1,3 +1,8 @@
-.email-input {
-    min-width: 99%;
+.input {
+    flex-shrink: 0.3;
+    width: 100%;
+}
+
+.info-button {
+    border-radius: 100%;
 }
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 989f393cd..6bfdb113e 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -55,7 +55,7 @@ public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
 
     private void init() {
         setCompactMode();
-        getForm().getStyle().set("width", "100% !important"); //dirty fix for large screens
+        getForm().getStyle().set("width", "min(380px, 100%) !important"); //dirty fix for large screens
 
         setFormTitle("Sign in to Axe");
         subTitleText.setText("New to Axe?");
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 0a0dfe4c3..83457d109 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -2,13 +2,17 @@
 
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.ListItem;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.html.UnorderedList;
+import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.textfield.EmailField;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.shared.Tooltip;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.BeforeEnterEvent;
@@ -22,6 +26,8 @@
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeFormLayout;
 
+import java.util.stream.Stream;
+
 @SpringComponent
 @UIScope
 @RequiredArgsConstructor
@@ -33,14 +39,19 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private final Span subTitleText = new Span();
     private final Anchor subTitleLink = new Anchor();
 
-    private final TextField usernameEmailInput = new TextField();
-    private final PasswordField passwordInput = new PasswordField();
+    private final FlexLayout userEmailLayout = new FlexLayout();
+    private final TextField userEmailInput = new TextField();
+    private final Button userEmailInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
 
-    private final Details contactPointDetails = new Details();
-    private final EmailField emailField = new EmailField();
+    private final FlexLayout usernameLayout = new FlexLayout();
+    private final TextField usernameInput = new TextField();
+    private final Button usernameInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
 
-    private final Details tfaDetails = new Details();
-    private final Checkbox tfaBox = new Checkbox();
+    private final Details usernameRequirements = new Details();
+
+    private final FlexLayout passwordLayout = new FlexLayout();
+    private final PasswordField passwordInput = new PasswordField();
+    private final Button passwordInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
 
     private final Span tosNote = createLegalInfo();
 
@@ -67,25 +78,12 @@ private void pageInit() {
 
         setFormSubTitle(subTitleText, subTitleLink);
 
-        usernameEmailInput.setLabel("Username/Email");
-        usernameEmailInput.setClearButtonVisible(true);
-        usernameEmailInput.setTooltipText("Username here please");
-        passwordInput.setLabel("Password");
-        passwordInput.setTooltipText("Password should be at least 3 chars");
-
-        emailField.setLabel("Email");
-        emailField.setClassName("email-input");
-        contactPointDetails.setSummaryText("Contact point (optional)");
-        contactPointDetails.setOpened(false);
-        contactPointDetails.addContent(emailField);
-
-        tfaBox.setId("tfaBox");
-        tfaBox.setLabel("Protect my account with additional one time codes");
-        tfaDetails.setSummaryText("Two-Factor Authentication (2FA)");
-        tfaDetails.setOpened(true);
-        tfaDetails.addContent(tfaBox);
+        setupUserEmailSection();
+        setupUserSection();
+        setupUserRequirementsSection();
+        setupPasswordSection();
 
-        setFormFields(usernameEmailInput, passwordInput, contactPointDetails, tfaDetails);
+        setFormFields(userEmailLayout, usernameRequirements, passwordLayout);
 
         setComponentsAfterFields(tosNote);
         setSubmitButtonText("Sign up");
@@ -94,15 +92,88 @@ private void pageInit() {
     }
 
     private void cleanInputs() {
-        usernameEmailInput.clear();
+        userEmailInput.clear();
         passwordInput.clear();
-        emailField.clear();
+        usernameInput.clear();
     }
 
     private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
 
+
+    private void setupUserEmailSection() {
+        userEmailInput.setLabel("Username/Email");
+        userEmailInput.setClearButtonVisible(true);
+        userEmailInput.setTooltipText("Email stored encrypted. See requirements below.");
+        userEmailInput.setClassName("input");
+        userEmailInfoButton.setIconAfterText(true);
+        userEmailInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+        userEmailInfoButton.setClassName("info-button");
+
+        Tooltip userEmailTooltip = userEmailInput.getTooltip().withManual(true);
+        userEmailInfoButton.addClickListener(event -> userEmailTooltip.setOpened(!userEmailTooltip.isOpened()));
+
+        userEmailLayout.setAlignItems(Alignment.BASELINE);
+        userEmailLayout.add(userEmailInput, userEmailInfoButton);
+    }
+
+    private void setupUserSection() {
+        usernameInput.setLabel("Username");
+        usernameInput.setClearButtonVisible(true);
+        usernameInput.setTooltipText("You can use both as login");
+        usernameInput.setClassName("input");
+
+        usernameInfoButton.setIconAfterText(true);
+        usernameInfoButton.setClassName("info-button");
+        usernameInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+
+        Tooltip usernameTooltip = usernameInput.getTooltip().withManual(true);
+        usernameInfoButton.addClickListener(event -> usernameTooltip.setOpened(!usernameTooltip.isOpened()));
+
+        usernameLayout.setAlignItems(Alignment.BASELINE);
+        usernameLayout.add(usernameInput, usernameInfoButton);
+    }
+
+    private void setupUserRequirementsSection() {
+        usernameRequirements.setSummaryText("Username requirements");
+        Span span = new Span("Username should be");
+
+        UnorderedList requirements = new UnorderedList();
+        requirements.removeAll();
+        Stream.of("The number of characters must be between 2 and 20.",
+                        "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
+                        "Also allowed of the dot (.), underscore (_), and hyphen (-).",
+                        "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
+                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
+                .forEach(requirement -> requirements.add(new ListItem(requirement)));
+
+        usernameRequirements.addContent(span, requirements);
+        usernameRequirements.setOpened(false);
+    }
+
+    private void setupPasswordSection() {
+        passwordInput.setLabel("Password");
+        passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong.");
+        Tooltip passwordTooltip = passwordInput.getTooltip().withManual(true);
+        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+        passwordInfoButton.addClickListener(event -> passwordTooltip.setOpened(!passwordTooltip.isOpened()));
+
+        passwordInput.setLabel("Password");
+        passwordInput.setClassName("input");
+        passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong");
+
+        passwordInfoButton.setIconAfterText(true);
+        passwordInfoButton.setClassName("info-button");
+        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+
+        Tooltip usernameTooltip = passwordInput.getTooltip().withManual(true);
+        passwordInfoButton.addClickListener(event -> usernameTooltip.setOpened(!usernameTooltip.isOpened()));
+
+        passwordLayout.add(passwordInput, passwordInfoButton);
+        passwordLayout.setAlignItems(Alignment.BASELINE);
+    }
+
     private Span createLegalInfo() {
         Span tosStart = new Span("By signing up, you accept our ");
         Anchor linkToTerms = new Anchor();

From a92b095a7e8ca040dd4bf5f2a3c049f8e44d5da4 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 15:02:17 +0200
Subject: [PATCH 14/69] RegistrationPage. Magic (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/Axe.java                 |  1 +
 .../axe/api/user/PostUserRestController.java  |  2 +-
 .../java/pm/axe/ui/layouts/AxeFormLayout.java |  1 +
 .../axe/ui/pages/user/RegistrationPage.java   | 60 ++++++++++++++++---
 .../java/pm/axe/users/UsernameGenerator.java  | 42 ++++++++++++-
 5 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/src/main/java/pm/axe/Axe.java b/src/main/java/pm/axe/Axe.java
index 0529f7d19..7b5c3ec40 100644
--- a/src/main/java/pm/axe/Axe.java
+++ b/src/main/java/pm/axe/Axe.java
@@ -28,6 +28,7 @@ public static class C {
         public static final int ONE_SECOND_IN_MILLIS = 1000;
         public static final String TIME_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss z";
         public static final String MINUS = "-";
+        public static final String PLUS = "+";
     }
 
     public static class Defaults {
diff --git a/src/main/java/pm/axe/api/user/PostUserRestController.java b/src/main/java/pm/axe/api/user/PostUserRestController.java
index c5f49bd3f..50f412644 100644
--- a/src/main/java/pm/axe/api/user/PostUserRestController.java
+++ b/src/main/java/pm/axe/api/user/PostUserRestController.java
@@ -103,7 +103,7 @@ public ResponseEntity<?> registerUser(final @RequestBody PostUserRequest request
             }
         } else {
             log.info("{} There is no user-defined Username in Request. Generating custom Username", TAG);
-            OperationResult usernameGenerationResult = usernameGenerator.generate();
+            OperationResult usernameGenerationResult = usernameGenerator.generateRandom();
             if (usernameGenerationResult.ok()) {
                 username = usernameGenerationResult.getStringPayload();
             } else {
diff --git a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
index 2ed27b27b..7dcb12f41 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeFormLayout.java
@@ -21,6 +21,7 @@ public class AxeFormLayout extends AxeBaseLayout {
     private final H2 formTitle = new H2();
     private final Div formSubTitle = new Div();
 
+    @Getter(value = AccessLevel.PROTECTED)
     private final VerticalLayout fields = new VerticalLayout();
     @Getter(value = AccessLevel.PROTECTED)
     private final Div spaceAfterFields = new Div();
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 83457d109..ebbc98f97 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -1,5 +1,6 @@
 package pm.axe.ui.pages.user;
 
+import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
@@ -15,6 +16,7 @@
 import com.vaadin.flow.component.shared.Tooltip;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.PageTitle;
@@ -22,9 +24,15 @@
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.EmailValidator;
 import pm.axe.Endpoint;
+import pm.axe.result.OperationResult;
+import pm.axe.services.user.UserService;
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.users.UsernameGenerator;
+import pm.axe.users.UsernameValidator;
 
 import java.util.stream.Stream;
 
@@ -35,6 +43,8 @@
 @Route(value = Endpoint.UI.REGISTRATION_PAGE, layout = MainView.class)
 @PageTitle("Registration - Axe.pm")
 public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserver {
+    private final UsernameGenerator usernameGenerator;
+    private final UserService userService;
 
     private final Span subTitleText = new Span();
     private final Anchor subTitleLink = new Anchor();
@@ -97,6 +107,39 @@ private void cleanInputs() {
         usernameInput.clear();
     }
 
+    private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        String input = event.getValue();
+        boolean isInputEmpty = StringUtils.isBlank(input);
+        if (isInputEmpty) {
+            onInvalidUserEmail("Username cannot be empty");
+            return;
+        }
+        boolean isEmail = EmailValidator.getInstance().isValid(input);
+        if (isEmail) {
+            //input is email
+            OperationResult generationResult = usernameGenerator.generateFromEmail(input);
+            if (generationResult.ok()) {
+                usernameInput.setValue(generationResult.getStringPayload());
+                //paste username fields
+                getFields().replace(usernameRequirements, usernameLayout);
+            }
+        } else {
+            //input is username
+            OperationResult usernameValidation = UsernameValidator.isValid(input);
+            if (usernameValidation.ok()) {
+                if (userService.isUserExists(input)) {
+                    onInvalidUserEmail("Username already exists");
+                }
+            } else {
+                onInvalidUserEmail("Username doesn't meet requirements");
+            }
+        }
+    }
+
+    private void onInvalidUserEmail(final String errorMessage) {
+        userEmailInput.setInvalid(true);
+        userEmailInput.setErrorMessage(errorMessage);
+    }
     private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
@@ -105,8 +148,11 @@ private void onRegister(final ClickEvent<Button> event) {
     private void setupUserEmailSection() {
         userEmailInput.setLabel("Username/Email");
         userEmailInput.setClearButtonVisible(true);
+        userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        userEmailInput.addValueChangeListener(this::onUserEmailFieldChanged);
         userEmailInput.setTooltipText("Email stored encrypted. See requirements below.");
         userEmailInput.setClassName("input");
+
         userEmailInfoButton.setIconAfterText(true);
         userEmailInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
         userEmailInfoButton.setClassName("info-button");
@@ -118,6 +164,8 @@ private void setupUserEmailSection() {
         userEmailLayout.add(userEmailInput, userEmailInfoButton);
     }
 
+
+
     private void setupUserSection() {
         usernameInput.setLabel("Username");
         usernameInput.setClearButtonVisible(true);
@@ -153,22 +201,16 @@ private void setupUserRequirementsSection() {
     }
 
     private void setupPasswordSection() {
-        passwordInput.setLabel("Password");
-        passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong.");
-        Tooltip passwordTooltip = passwordInput.getTooltip().withManual(true);
-        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
-        passwordInfoButton.addClickListener(event -> passwordTooltip.setOpened(!passwordTooltip.isOpened()));
-
         passwordInput.setLabel("Password");
         passwordInput.setClassName("input");
         passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong");
 
         passwordInfoButton.setIconAfterText(true);
         passwordInfoButton.setClassName("info-button");
-        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
 
-        Tooltip usernameTooltip = passwordInput.getTooltip().withManual(true);
-        passwordInfoButton.addClickListener(event -> usernameTooltip.setOpened(!usernameTooltip.isOpened()));
+        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+        Tooltip passwordTooltip = passwordInput.getTooltip().withManual(true);
+        passwordInfoButton.addClickListener(event -> passwordTooltip.setOpened(!passwordTooltip.isOpened()));
 
         passwordLayout.add(passwordInput, passwordInfoButton);
         passwordLayout.setAlignItems(Alignment.BASELINE);
diff --git a/src/main/java/pm/axe/users/UsernameGenerator.java b/src/main/java/pm/axe/users/UsernameGenerator.java
index 71271282f..7a4e9a258 100644
--- a/src/main/java/pm/axe/users/UsernameGenerator.java
+++ b/src/main/java/pm/axe/users/UsernameGenerator.java
@@ -6,6 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.CannotCreateTransactionException;
+import pm.axe.Axe;
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.UserService;
 
@@ -17,6 +18,7 @@
 @Component
 public class UsernameGenerator {
     private static final String TAG = "[" + UsernameGenerator.class.getSimpleName() + "]";
+    private static final int MAX_ROUNDS = 5;
 
     public static final String USER_PREFIX = "user";
     public static final int USERNAME_RANDOM_PART_LEN = 6;
@@ -38,12 +40,12 @@ public static boolean isGenerated(final String username) {
      *
      * @return {@link OperationResult} with username {@link String} in payload or {@link OperationResult} with error.
      */
-    public OperationResult generate() {
+    public OperationResult generateRandom() {
         try {
             String generatedUsername;
             boolean isUsernameAlreadyExist;
             do {
-                generatedUsername = generatedNew();
+                generatedUsername = generateNew();
                 isUsernameAlreadyExist = userService.isUserExists(generatedUsername);
             } while (isUsernameAlreadyExist);
             return OperationResult.success().addPayload(generatedUsername);
@@ -56,7 +58,41 @@ public OperationResult generate() {
         }
     }
 
-    private String generatedNew() {
+    public OperationResult generateFromEmail(final String emailAddress) {
+        String[] parts = emailAddress.split(Axe.C.AT);
+        if (parts.length < 2) {
+            return OperationResult.malformedInput().withMessage(String.format("%s is not valid email", emailAddress));
+        }
+        String[] usernameParts = parts[0].split("\\" + Axe.C.PLUS);
+        if (usernameParts.length < 1) {
+            return OperationResult.malformedInput().withMessage("Something is wrong with provided email");
+        }
+        String nameFromEmail = usernameParts[0];
+        OperationResult nameValidationResult = UsernameValidator.isValid(nameFromEmail);
+        if (nameValidationResult.notOk()) {
+            return generateRandom();
+        }
+        boolean isUsernameAlreadyExist = userService.isUserExists(nameFromEmail);
+        if (isUsernameAlreadyExist) {
+            String generatedName;
+            for (int i=1; i <= MAX_ROUNDS; i++) {
+                generatedName = nameFromEmail + i;
+                nameValidationResult = UsernameValidator.isValid(generatedName);
+                if (nameValidationResult.notOk()) {
+                    return generateRandom();
+                }
+                isUsernameAlreadyExist = userService.isUserExists(nameFromEmail);
+                if (!isUsernameAlreadyExist) {
+                    return OperationResult.success().addPayload(generatedName);
+                }
+            }
+            return generateRandom();
+        } else {
+            return OperationResult.success().addPayload(nameFromEmail);
+        }
+    }
+
+    private String generateNew() {
         return USER_PREFIX + RandomStringUtils.randomNumeric(USERNAME_RANDOM_PART_LEN);
     }
 }

From 1425be7ce41508333181095df364a455cebb7684 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 16:47:42 +0200
Subject: [PATCH 15/69] RegistrationPage. Magic 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/pages/user/RegistrationPage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index ebbc98f97..9f70d6df4 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -108,6 +108,9 @@ private void cleanInputs() {
     }
 
     private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        if (getFields().indexOf(usernameLayout) != -1 ) {
+            getFields().remove(userEmailLayout);
+        }
         String input = event.getValue();
         boolean isInputEmpty = StringUtils.isBlank(input);
         if (isInputEmpty) {
@@ -121,7 +124,7 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
             if (generationResult.ok()) {
                 usernameInput.setValue(generationResult.getStringPayload());
                 //paste username fields
-                getFields().replace(usernameRequirements, usernameLayout);
+                getFields().addComponentAtIndex(1, usernameLayout);
             }
         } else {
             //input is username

From d419465896e1a28148d096d0aaf56eb32ad62ece Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 22:23:23 +0200
Subject: [PATCH 16/69] RegistrationPage. Magic 3 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/RegistrationPage.java   | 73 ++++++++++++++++---
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 9f70d6df4..75fe52ab1 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -43,6 +43,11 @@
 @Route(value = Endpoint.UI.REGISTRATION_PAGE, layout = MainView.class)
 @PageTitle("Registration - Axe.pm")
 public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserver {
+    private static final String USERNAME_EMAIL_LABEL = "Username/Email";
+    private static final String JUST_EMAIL_LABEL = "Email";
+    private static final int PASSWORD_MIN_LEN = 3;
+    private static final int PASSWORD_MAX_LEN = 71; //BCrypt limitation
+
     private final UsernameGenerator usernameGenerator;
     private final UserService userService;
 
@@ -89,7 +94,7 @@ private void pageInit() {
         setFormSubTitle(subTitleText, subTitleLink);
 
         setupUserEmailSection();
-        setupUserSection();
+        setupUsernameSection();
         setupUserRequirementsSection();
         setupPasswordSection();
 
@@ -108,13 +113,11 @@ private void cleanInputs() {
     }
 
     private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
-        if (getFields().indexOf(usernameLayout) != -1 ) {
-            getFields().remove(userEmailLayout);
-        }
         String input = event.getValue();
         boolean isInputEmpty = StringUtils.isBlank(input);
         if (isInputEmpty) {
-            onInvalidUserEmail("Username cannot be empty");
+            hideUsernameField();
+            updateLabelForUserEmailInput();
             return;
         }
         boolean isEmail = EmailValidator.getInstance().isValid(input);
@@ -125,8 +128,11 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
                 usernameInput.setValue(generationResult.getStringPayload());
                 //paste username fields
                 getFields().addComponentAtIndex(1, usernameLayout);
+                updateLabelForUserEmailInput();
             }
         } else {
+            hideUsernameField();
+            updateLabelForUserEmailInput();
             //input is username
             OperationResult usernameValidation = UsernameValidator.isValid(input);
             if (usernameValidation.ok()) {
@@ -139,17 +145,64 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
         }
     }
 
+    private void onUsernameFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        final String username = event.getValue();
+        if (StringUtils.isBlank(username)) return;
+        OperationResult usernameValidation = UsernameValidator.isValid(username);
+        if (usernameValidation.ok()) {
+            if (userService.isUserExists(username)) {
+                onInvalidUsername("Username already exists");
+            }
+        } else {
+            onInvalidUsername("Username doesn't meet requirements");
+        }
+    }
+
+    private void onPasswordFieldChanged(AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+        String password = event.getValue();
+        if (StringUtils.isBlank(password)) return;
+        if (password.length() < PASSWORD_MIN_LEN) {
+          onInvalidPassword(String.format("Password is very short. Minimum %d symbols", PASSWORD_MIN_LEN));
+        } else if (password.length() > PASSWORD_MAX_LEN) {
+            onInvalidPassword(String.format("Password is too long. Max %d symbols", PASSWORD_MAX_LEN));
+        }
+    }
+
     private void onInvalidUserEmail(final String errorMessage) {
         userEmailInput.setInvalid(true);
         userEmailInput.setErrorMessage(errorMessage);
     }
+
+    private void onInvalidUsername(final String errorMessage) {
+        usernameInput.setInvalid(true);
+        usernameInput.setErrorMessage(errorMessage);
+    }
+
+    public void onInvalidPassword(final String errorMessage) {
+        passwordInput.setInvalid(true);
+        passwordInput.setErrorMessage(errorMessage);
+    }
+
     private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
 
+    private void hideUsernameField() {
+        if (getFields().indexOf(usernameLayout) != -1 ) {
+            getFields().remove(usernameLayout);
+        }
+    }
+
+    private void updateLabelForUserEmailInput() {
+        if (usernameInput.isVisible()) {
+            userEmailInput.setLabel(JUST_EMAIL_LABEL);
+        } else {
+            userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
+        }
+    }
 
     private void setupUserEmailSection() {
-        userEmailInput.setLabel("Username/Email");
+        userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
         userEmailInput.setClearButtonVisible(true);
         userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         userEmailInput.addValueChangeListener(this::onUserEmailFieldChanged);
@@ -167,11 +220,11 @@ private void setupUserEmailSection() {
         userEmailLayout.add(userEmailInput, userEmailInfoButton);
     }
 
-
-
-    private void setupUserSection() {
+    private void setupUsernameSection() {
         usernameInput.setLabel("Username");
         usernameInput.setClearButtonVisible(true);
+        usernameInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        usernameInput.addValueChangeListener(this::onUsernameFieldChanged);
         usernameInput.setTooltipText("You can use both as login");
         usernameInput.setClassName("input");
 
@@ -205,6 +258,8 @@ private void setupUserRequirementsSection() {
 
     private void setupPasswordSection() {
         passwordInput.setLabel("Password");
+        passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
         passwordInput.setClassName("input");
         passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong");
 

From 75105d875edfe9ee1109759be9106627c82807d8 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 22:43:35 +0200
Subject: [PATCH 17/69] RegistrationPage. Magic 4 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/RegistrationPage.java  | 12 +++++++++---
 src/main/java/pm/axe/users/UsernameGenerator.java    |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 75fe52ab1..233df01b9 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -187,14 +187,18 @@ private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
 
+    private boolean isUsernameLayoutVisible() {
+        return getFields().indexOf(usernameLayout) != -1;
+    }
+
     private void hideUsernameField() {
-        if (getFields().indexOf(usernameLayout) != -1 ) {
+        if (isUsernameLayoutVisible()) {
             getFields().remove(usernameLayout);
         }
     }
 
     private void updateLabelForUserEmailInput() {
-        if (usernameInput.isVisible()) {
+        if (isUsernameLayoutVisible()) {
             userEmailInput.setLabel(JUST_EMAIL_LABEL);
         } else {
             userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
@@ -261,7 +265,9 @@ private void setupPasswordSection() {
         passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
         passwordInput.setClassName("input");
-        passwordInput.setTooltipText("At least 3 chars. Use password generator - make it strong");
+        passwordInput.setTooltipText(String.format("At least %d symbols. Max %d symbols. " +
+                        "Use password generator - make it strong.",
+                PASSWORD_MIN_LEN, PASSWORD_MAX_LEN));
 
         passwordInfoButton.setIconAfterText(true);
         passwordInfoButton.setClassName("info-button");
diff --git a/src/main/java/pm/axe/users/UsernameGenerator.java b/src/main/java/pm/axe/users/UsernameGenerator.java
index 7a4e9a258..dc98200d6 100644
--- a/src/main/java/pm/axe/users/UsernameGenerator.java
+++ b/src/main/java/pm/axe/users/UsernameGenerator.java
@@ -81,7 +81,7 @@ public OperationResult generateFromEmail(final String emailAddress) {
                 if (nameValidationResult.notOk()) {
                     return generateRandom();
                 }
-                isUsernameAlreadyExist = userService.isUserExists(nameFromEmail);
+                isUsernameAlreadyExist = userService.isUserExists(generatedName);
                 if (!isUsernameAlreadyExist) {
                     return OperationResult.success().addPayload(generatedName);
                 }

From 34921b60e336f25e66129b28765c31c7da8ace28 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 23:43:40 +0200
Subject: [PATCH 18/69] RegistrationPage. PasswordGenerator (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pm/axe/ui/elements/PasswordGenerator.java | 79 +++++++++++++++++++
 .../axe/ui/pages/user/RegistrationPage.java   | 18 ++++-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/pm/axe/ui/elements/PasswordGenerator.java

diff --git a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
new file mode 100644
index 000000000..9492ccd44
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
@@ -0,0 +1,79 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.textfield.PasswordField;
+import org.apache.commons.lang3.RandomStringUtils;
+import pm.axe.utils.ClipboardUtils;
+
+
+@SuppressWarnings({"FieldCanBeLocal"})
+public class PasswordGenerator extends Composite<Details> {
+    private static final String SUMMARY_TEXT = "Password Generator";
+    private static final int DEFAULT_LEN = 24;
+    private final Code generatedPasswordHolder = new Code();
+    private final Button useItButton = new Button(VaadinIcon.COPY.create());
+    private final Button redoButton = new Button(VaadinIcon.REFRESH.create());
+
+    private PasswordField target;
+
+    public static PasswordGenerator create() {
+        return new PasswordGenerator();
+    }
+
+    public void setCopyTarget(final PasswordField component) {
+        if (component == null) throw new IllegalArgumentException("cannot copy to null component");
+        this.target = component;
+    }
+
+    public void setOpened(final boolean shouldOpen) {
+        getContent().setOpened(shouldOpen);
+    }
+
+    private PasswordGenerator() {
+        getContent().setSummaryText(SUMMARY_TEXT);
+
+        generatedPasswordHolder.setText(generatePassword());
+
+        useItButton.setTooltipText("Use this password");
+        useItButton.addClickListener(this::onUseThisPasswordClicked);
+        ClipboardUtils.setCopyToClipboardFunctionFor(useItButton);
+        ClipboardUtils.setTextToCopy(generatedPasswordHolder.getText()).forComponent(useItButton);
+
+        redoButton.setTooltipText("Re-generate it");
+        redoButton.addClickListener(this::onRedoButtonClicked);
+
+        HorizontalLayout content = new HorizontalLayout();
+        content.setAlignItems(FlexComponent.Alignment.CENTER);
+        content.add(generatedPasswordHolder, useItButton, redoButton);
+        getContent().setContent(content);
+    }
+
+    private void onUseThisPasswordClicked(ClickEvent<Button> event) {
+        if (target != null) {
+            //copy to component
+            target.setValue(generatedPasswordHolder.getText());
+            target.getElement().callJsFunction("_setPasswordVisible", true);
+            //suggestion accepted - we can close Password Generator
+            getContent().setOpened(false);
+        } else {
+            //copy to clipboard
+            ClipboardUtils.showLinkCopiedNotification("Password copied", Notification.Position.MIDDLE);
+        }
+    }
+
+    private void onRedoButtonClicked(ClickEvent<Button> event) {
+        generatedPasswordHolder.setText(generatePassword());
+        ClipboardUtils.setTextToCopy(generatedPasswordHolder.getText()).forComponent(useItButton);
+    }
+
+    private String generatePassword() {
+        return RandomStringUtils.randomAlphanumeric(DEFAULT_LEN);
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 233df01b9..5ec1e235b 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -30,6 +30,7 @@
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.UserService;
 import pm.axe.ui.MainView;
+import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.layouts.AxeFormLayout;
 import pm.axe.users.UsernameGenerator;
 import pm.axe.users.UsernameValidator;
@@ -45,6 +46,7 @@
 public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserver {
     private static final String USERNAME_EMAIL_LABEL = "Username/Email";
     private static final String JUST_EMAIL_LABEL = "Email";
+    private static final int USERNAME_MIN_LEN = 2;
     private static final int PASSWORD_MIN_LEN = 3;
     private static final int PASSWORD_MAX_LEN = 71; //BCrypt limitation
 
@@ -68,6 +70,8 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private final PasswordField passwordInput = new PasswordField();
     private final Button passwordInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
 
+    private final PasswordGenerator passwordGenerator = PasswordGenerator.create();
+
     private final Span tosNote = createLegalInfo();
 
     private boolean pageAlreadyInitialized = false;
@@ -97,8 +101,9 @@ private void pageInit() {
         setupUsernameSection();
         setupUserRequirementsSection();
         setupPasswordSection();
+        setupPasswordGeneratorSection();
 
-        setFormFields(userEmailLayout, usernameRequirements, passwordLayout);
+        setFormFields(userEmailLayout, usernameRequirements, passwordLayout, passwordGenerator);
 
         setComponentsAfterFields(tosNote);
         setSubmitButtonText("Sign up");
@@ -207,6 +212,8 @@ private void updateLabelForUserEmailInput() {
 
     private void setupUserEmailSection() {
         userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
+        userEmailInput.setRequired(true);
+        userEmailInput.setMinLength(USERNAME_MIN_LEN);
         userEmailInput.setClearButtonVisible(true);
         userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         userEmailInput.addValueChangeListener(this::onUserEmailFieldChanged);
@@ -226,6 +233,7 @@ private void setupUserEmailSection() {
 
     private void setupUsernameSection() {
         usernameInput.setLabel("Username");
+        usernameInput.setMinLength(USERNAME_MIN_LEN);
         usernameInput.setClearButtonVisible(true);
         usernameInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         usernameInput.addValueChangeListener(this::onUsernameFieldChanged);
@@ -262,6 +270,9 @@ private void setupUserRequirementsSection() {
 
     private void setupPasswordSection() {
         passwordInput.setLabel("Password");
+        passwordInput.setRequired(true);
+        passwordInput.setMinLength(PASSWORD_MIN_LEN);
+        passwordInput.setMaxLength(PASSWORD_MAX_LEN);
         passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
         passwordInput.setClassName("input");
@@ -280,6 +291,11 @@ private void setupPasswordSection() {
         passwordLayout.setAlignItems(Alignment.BASELINE);
     }
 
+    private void setupPasswordGeneratorSection() {
+        passwordGenerator.setCopyTarget(passwordInput);
+        passwordGenerator.setOpened(false);
+    }
+
     private Span createLegalInfo() {
         Span tosStart = new Span("By signing up, you accept our ");
         Anchor linkToTerms = new Anchor();

From cb2be02d714abb3a3a8a3a8ec8867716086a6640 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 13 Jan 2023 23:56:28 +0200
Subject: [PATCH 19/69] RegistrationPage. PasswordGenerator. CSS (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/elements/PasswordGenerator.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
index 9492ccd44..1c29013b4 100644
--- a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
+++ b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import org.apache.commons.lang3.RandomStringUtils;
 import pm.axe.utils.ClipboardUtils;
@@ -49,9 +49,11 @@ private PasswordGenerator() {
         redoButton.setTooltipText("Re-generate it");
         redoButton.addClickListener(this::onRedoButtonClicked);
 
-        HorizontalLayout content = new HorizontalLayout();
+        FlexLayout content = new FlexLayout();
         content.setAlignItems(FlexComponent.Alignment.CENTER);
+        content.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
         content.add(generatedPasswordHolder, useItButton, redoButton);
+        content.expand(generatedPasswordHolder);
         getContent().setContent(content);
     }
 

From 2c4a3ee12c043eba49b89ba03ebbd3951ffcb4a0 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sat, 14 Jan 2023 00:00:10 +0200
Subject: [PATCH 20/69] RegistrationPage. PasswordGenerator. CSS 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/elements/PasswordGenerator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
index 1c29013b4..82140b52c 100644
--- a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
+++ b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
@@ -3,6 +3,7 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Composite;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
@@ -43,11 +44,13 @@ private PasswordGenerator() {
 
         useItButton.setTooltipText("Use this password");
         useItButton.addClickListener(this::onUseThisPasswordClicked);
+        useItButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
         ClipboardUtils.setCopyToClipboardFunctionFor(useItButton);
         ClipboardUtils.setTextToCopy(generatedPasswordHolder.getText()).forComponent(useItButton);
 
         redoButton.setTooltipText("Re-generate it");
         redoButton.addClickListener(this::onRedoButtonClicked);
+        redoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
 
         FlexLayout content = new FlexLayout();
         content.setAlignItems(FlexComponent.Alignment.CENTER);

From a495f7a5cb6ec0af063008dd7f1e54b158c803fb Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 15 Jan 2023 23:53:16 +0200
Subject: [PATCH 21/69] LoginPage. Easy login for Dev and ProfilePage [WIP] 
 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/profile_page.css                 |   3 +
 src/main/java/pm/axe/Endpoint.java            |   1 +
 .../java/pm/axe/ui/pages/user/LoginPage.java  |  29 ++-
 .../pm/axe/ui/pages/user/ProfilePage.java     | 177 ++++++++++++++++++
 4 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 frontend/css/profile_page.css
 create mode 100644 src/main/java/pm/axe/ui/pages/user/ProfilePage.java

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
new file mode 100644
index 000000000..e4deb0c49
--- /dev/null
+++ b/frontend/css/profile_page.css
@@ -0,0 +1,3 @@
+.profile-title {
+    align-self: center;
+}
\ No newline at end of file
diff --git a/src/main/java/pm/axe/Endpoint.java b/src/main/java/pm/axe/Endpoint.java
index d6dda19ee..d5d07914d 100644
--- a/src/main/java/pm/axe/Endpoint.java
+++ b/src/main/java/pm/axe/Endpoint.java
@@ -89,6 +89,7 @@ public static class UI {
         public static final String REGISTRATION_PAGE = "register";
         public static final String FORGOT_PASSWORD_PAGE = "forgot-password";
         public static final String TOS_PAGE = "terms-of-service";
+        public static final String PROFILE_PAGE = "profile";
     }
 
     /**
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 6bfdb113e..101d2d361 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -19,8 +19,14 @@
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
 import pm.axe.Endpoint;
+import pm.axe.db.models.User;
+import pm.axe.services.user.UserService;
+import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.utils.AppUtils;
+
+import java.util.Optional;
 
 
 @SpringComponent
@@ -30,6 +36,8 @@
 @Route(value = Endpoint.UI.LOGIN_PAGE, layout = MainView.class)
 @PageTitle("Login Page - Axe.pm")
 public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
+    private final AppUtils appUtils;
+    private final UserService userService;
     private final Span subTitleText = new Span();
     private final Span spaceSpan = new Span();
     private final Anchor subTitleLink = new Anchor();
@@ -86,7 +94,26 @@ private void init() {
     }
 
     private void onLogin(final ClickEvent<Button> event) {
-        Notification.show("Not implemented yet");
+        //TODO do fields validation before sending anything
+        //FIXME remove after real login progress implemented
+        if (appUtils.isDevelopmentModeActivated()) {
+            doEasyLogin();
+        } else {
+            Notification.show("Not implemented yet");
+        }
+    }
+
+    private void doEasyLogin() {
+        if (userService.isUserExists(usernameInput.getValue())) {
+            AxeSession.getCurrent().ifPresent(axs -> {
+                Optional<User> user = userService.getUserByUsername(usernameInput.getValue());
+                user.ifPresent(axs::setUser);
+                usernameInput.getUI().ifPresent(ui -> ui.navigate(Endpoint.UI.PROFILE_PAGE));
+            });
+        } else {
+            usernameInput.setInvalid(true);
+            usernameInput.setErrorMessage("No such user found");
+        }
     }
 
     private void cleanInputs() {
diff --git a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
new file mode 100644
index 000000000..d0633a222
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
@@ -0,0 +1,177 @@
+package pm.axe.ui.pages.user;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.H4;
+import com.vaadin.flow.component.html.Hr;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.select.Select;
+import com.vaadin.flow.component.textfield.EmailField;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.Endpoint;
+import pm.axe.db.models.Account;
+import pm.axe.db.models.User;
+import pm.axe.services.user.AccountService;
+import pm.axe.session.AxeSession;
+import pm.axe.ui.MainView;
+import pm.axe.ui.elements.PasswordGenerator;
+import pm.axe.ui.layouts.AxeCompactLayout;
+import pm.axe.users.AccountType;
+
+import java.util.List;
+import java.util.Optional;
+
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/profile_page.css")
+@Route(value = Endpoint.UI.PROFILE_PAGE, layout = MainView.class)
+@PageTitle("My Profile - Axe.pm")
+public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver {
+    private final AccountService accountService;
+    private boolean pageAlreadyInitialized = false;
+    private User user;
+    private List<Account> confirmedAccounts;
+
+    @Override
+    public void beforeEnter(BeforeEnterEvent event) {
+        if (event.isRefreshEvent()) return;
+        boundUserOrGoToLogin(event);
+        confirmedAccounts = getConfirmedAccountsFor(user);
+
+        if (!pageAlreadyInitialized) {
+            initPage();
+            pageAlreadyInitialized = true;
+        }
+    }
+
+    private void initPage() {
+        //title
+        H2 title = new H2("My Profile");
+        title.setClassName("profile-title");
+
+        //username
+        TextField username = new TextField("Username");
+        username.setValue(user.getUsername());
+        username.setEnabled(false);
+        Button editUsernameButton = new Button("Edit");
+        Button saveUsernameButton = new Button("Save");
+        FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
+        usernameLayout.setAlignItems(FlexComponent.Alignment.CENTER);
+        usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+        //TODO replace with methods and fix button replace login - see MyLinksPage
+        editUsernameButton.addClickListener(e -> {
+            username.setEnabled(true);
+            usernameLayout.replace(editUsernameButton, saveUsernameButton);
+        });
+        saveUsernameButton.addClickListener(e -> {
+           username.setEnabled(false);
+           usernameLayout.replace(saveUsernameButton, editUsernameButton);
+        });
+
+        //email
+        EmailField emailField = new EmailField("E-mail");
+        emailField.setValue(getCurrentEmail());
+
+        Button saveEmailButton = new Button("Save");
+        FlexLayout emailLayout = new FlexLayout(emailField, saveEmailButton);
+        emailLayout.setAlignItems(FlexComponent.Alignment.CENTER);
+        emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+
+        //how Axe use email details
+        Details howEmailUsedDetails = new Details("How Axe use email?");
+        Span span = new Span("Account Recovery"); //TODO replace with UL with usage
+        howEmailUsedDetails.setOpened(false);
+        howEmailUsedDetails.setContent(span);
+
+        //TODO tg section
+        Hr firstSeparator = new Hr();
+        //change password section
+        H4 changePasswordTitle = new H4("Change Password");
+        PasswordField oldPasswordInput = new PasswordField("Old Password");
+        PasswordField newPasswordInput = new PasswordField("New Password");
+        PasswordGenerator passwordGenerator = PasswordGenerator.create();
+        passwordGenerator.setOpened(false);
+        passwordGenerator.setCopyTarget(newPasswordInput);
+        Button updatePasswordButton = new Button("Update");
+        VerticalLayout passwordLayout = new VerticalLayout(changePasswordTitle,
+                oldPasswordInput, newPasswordInput, passwordGenerator,
+                updatePasswordButton);
+
+        //second separator
+        Hr secondSeparator = new Hr();
+
+        //tfa section
+        Details tfaDetails = new Details("Two-Factor Authentication (2FA)");
+        Checkbox tfaBox = new Checkbox("Protect my account with additional one time codes");
+        tfaBox.setEnabled(!confirmedAccounts.isEmpty());
+
+        Select<AccountType> tfaChannelSelect = new Select<>();
+        tfaChannelSelect.setItems(confirmedAccounts.stream().map(Account::getType).toList());
+        Button saveTfaChannelButton = new Button("Save");
+        HorizontalLayout tfaChannelLayout = new HorizontalLayout(tfaChannelSelect, saveTfaChannelButton);
+
+        VerticalLayout tfaContent = new VerticalLayout(tfaBox);
+        if (confirmedAccounts.size() > 1) {
+            tfaContent.add(tfaChannelLayout);
+        }
+        tfaDetails.setContent(tfaContent);
+        tfaDetails.setOpened(true);
+
+        //TODO 3rd separator
+        //TODO danger zone
+
+        //overall layout
+        add(title, usernameLayout, emailLayout, howEmailUsedDetails,
+                firstSeparator, passwordLayout,
+                secondSeparator, tfaDetails);
+    }
+
+    private void boundUserOrGoToLogin(BeforeEnterEvent event) {
+        Optional<AxeSession> axeSession = AxeSession.getCurrent();
+        if (axeSession.isPresent()) {
+            if (axeSession.get().hasUser()) {
+                user = axeSession.get().getUser();
+            } else {
+                event.forwardTo(Endpoint.UI.LOGIN_PAGE);
+            }
+        } else {
+            event.forwardTo(LoginPage.class);
+        }
+    }
+
+    //TODO maybe Optional<String> instead
+    private String getCurrentEmail() {
+        Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
+        if (emailAccount.isPresent()) {
+            Optional<String> plainTextEmail = accountService.decryptAccountName(emailAccount.get());
+            if (plainTextEmail.isPresent() && StringUtils.isNotBlank(plainTextEmail.get())) {
+                return plainTextEmail.get();
+            } else {
+                return "";
+            }
+        } else {
+            return "";
+        }
+    }
+
+    private List<Account> getConfirmedAccountsFor(final User user) {
+        return accountService.getAllAccountsLinkedWithUser(user).stream().filter(Account::isConfirmed).toList();
+    }
+}

From 57ec50c8efda1d8b3c9b09d18d952676700b3abe Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 16 Jan 2023 00:05:05 +0200
Subject: [PATCH 22/69] LoginPage. Easy login for Dev and ProfilePage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/ProfilePage.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
index d0633a222..dfd92f62c 100644
--- a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
@@ -35,6 +35,7 @@
 import pm.axe.users.AccountType;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 @SpringComponent
@@ -52,7 +53,11 @@ public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver
     @Override
     public void beforeEnter(BeforeEnterEvent event) {
         if (event.isRefreshEvent()) return;
-        boundUserOrGoToLogin(event);
+        boundUserIfAny();
+        if (Objects.isNull(user)) {
+            event.forwardTo(LoginPage.class);
+            return;
+        }
         confirmedAccounts = getConfirmedAccountsFor(user);
 
         if (!pageAlreadyInitialized) {
@@ -73,7 +78,7 @@ private void initPage() {
         Button editUsernameButton = new Button("Edit");
         Button saveUsernameButton = new Button("Save");
         FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
-        usernameLayout.setAlignItems(FlexComponent.Alignment.CENTER);
+        usernameLayout.setAlignItems(FlexComponent.Alignment.BASELINE);
         usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
         //TODO replace with methods and fix button replace login - see MyLinksPage
         editUsernameButton.addClickListener(e -> {
@@ -91,7 +96,7 @@ private void initPage() {
 
         Button saveEmailButton = new Button("Save");
         FlexLayout emailLayout = new FlexLayout(emailField, saveEmailButton);
-        emailLayout.setAlignItems(FlexComponent.Alignment.CENTER);
+        emailLayout.setAlignItems(Alignment.BASELINE);
         emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
 
         //how Axe use email details
@@ -143,16 +148,12 @@ private void initPage() {
                 secondSeparator, tfaDetails);
     }
 
-    private void boundUserOrGoToLogin(BeforeEnterEvent event) {
+    private void boundUserIfAny() {
         Optional<AxeSession> axeSession = AxeSession.getCurrent();
         if (axeSession.isPresent()) {
             if (axeSession.get().hasUser()) {
                 user = axeSession.get().getUser();
-            } else {
-                event.forwardTo(Endpoint.UI.LOGIN_PAGE);
             }
-        } else {
-            event.forwardTo(LoginPage.class);
         }
     }
 

From 62ab4cb118e430060b009d25733787be33641650 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 17 Jan 2023 00:18:03 +0200
Subject: [PATCH 23/69] ProfilePage, OTP [WIP] and ConfirmAccountPage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/Endpoint.java            |   2 +
 src/main/java/pm/axe/db/models/Token.java     |   2 +-
 .../services/user/UserSettingsService.java    |   7 +
 .../java/pm/axe/ui/elements/TelegramSpan.java |  47 +++++++
 .../axe/ui/pages/user/ConfirmAccountPage.java | 120 ++++++++++++++++++
 .../ui/pages/user/LoginVerificationPage.java  |  90 +++++++++++++
 .../pm/axe/ui/pages/user/ProfilePage.java     |  55 ++++++--
 7 files changed, 314 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/pm/axe/ui/elements/TelegramSpan.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java

diff --git a/src/main/java/pm/axe/Endpoint.java b/src/main/java/pm/axe/Endpoint.java
index d5d07914d..ea0977b5c 100644
--- a/src/main/java/pm/axe/Endpoint.java
+++ b/src/main/java/pm/axe/Endpoint.java
@@ -90,6 +90,8 @@ public static class UI {
         public static final String FORGOT_PASSWORD_PAGE = "forgot-password";
         public static final String TOS_PAGE = "terms-of-service";
         public static final String PROFILE_PAGE = "profile";
+        public static final String CONFIRM_ACCOUNT_PAGE = "confirm-account";
+        public static final String LOGIN_VERIFICATION_PAGE = "verify";
     }
 
     /**
diff --git a/src/main/java/pm/axe/db/models/Token.java b/src/main/java/pm/axe/db/models/Token.java
index c976a4614..5a0221424 100644
--- a/src/main/java/pm/axe/db/models/Token.java
+++ b/src/main/java/pm/axe/db/models/Token.java
@@ -23,7 +23,7 @@ public class Token extends TimeModel {
     /**
      * Default length of Token (code).
      */
-    private static final int CODE_TOKEN_LEN = 6;
+    public static final int CODE_TOKEN_LEN = 6;
     @Column(name = "token", nullable = false, unique = true)
     private String token;
 
diff --git a/src/main/java/pm/axe/services/user/UserSettingsService.java b/src/main/java/pm/axe/services/user/UserSettingsService.java
index 8a468e5b5..d570fde63 100644
--- a/src/main/java/pm/axe/services/user/UserSettingsService.java
+++ b/src/main/java/pm/axe/services/user/UserSettingsService.java
@@ -62,6 +62,11 @@ public void deleteUserSettings(final UserSettings settings) {
         userSettingsDao.delete(settings);
     }
 
+    public boolean isTfaEnabled(final User user) {
+        Optional<UserSettings> userSettings = getUserSettings(user);
+        return userSettings.map(UserSettings::isTfaEnabled).orElse(false);
+    }
+
     private OperationResult createOrUpdateUserSettings(final UserSettings userSettings) {
         try {
             userSettingsDao.save(userSettings);
@@ -77,4 +82,6 @@ private OperationResult createOrUpdateUserSettings(final UserSettings userSettin
             return OperationResult.generalFail();
         }
     }
+
+
 }
diff --git a/src/main/java/pm/axe/ui/elements/TelegramSpan.java b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
new file mode 100644
index 000000000..1aa3d19d8
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
@@ -0,0 +1,47 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import pm.axe.Axe;
+import pm.axe.db.models.Token;
+import pm.axe.telegram.TelegramCommand;
+import pm.axe.utils.AppUtils;
+import pm.axe.utils.ClipboardUtils;
+import pm.axe.utils.DeviceUtils;
+
+public class TelegramSpan extends Composite<Span> {
+
+    public static TelegramSpan create(final Token token) {
+        return new TelegramSpan(token);
+    }
+
+    public TelegramSpan(final Token tgToken) {
+        String tgCommand = TelegramCommand.HELLO.getCommandText();
+
+        Span startSpan = new Span("Send ");
+        Code tgString = new Code(String.format("%s %s", tgCommand, tgToken.getToken()));
+        Icon copyCommandIcon = VaadinIcon.COPY.create();
+        Span toSpan = new Span(" to ");
+
+        String botName = AppUtils.getTelegramBotName();
+        String telegramLink = String.format("%s%s", Axe.Telegram.TELEGRAM_URL, botName);
+        Anchor botLink = new Anchor(telegramLink, "@" + botName);
+
+        Span endSpan = new Span(" to link your account with Telegram.");
+
+        getContent().add(startSpan, tgString, copyCommandIcon, toSpan, botLink, endSpan);
+
+        ClipboardUtils.setCopyToClipboardFunctionFor(copyCommandIcon);
+        ClipboardUtils.setTextToCopy(tgString.getText()).forComponent(copyCommandIcon);
+        copyCommandIcon.setClassName("copy-command-icon");
+        copyCommandIcon.addClickListener(e ->  {
+            Notification.Position position = DeviceUtils.isMobileDevice()
+                    ? Notification.Position.BOTTOM_CENTER : Notification.Position.MIDDLE;
+            ClipboardUtils.showLinkCopiedNotification("Copied!", position);
+        });
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
new file mode 100644
index 000000000..83522bbed
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -0,0 +1,120 @@
+package pm.axe.ui.pages.user;
+
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.html.H3;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.textfield.EmailField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import pm.axe.Endpoint;
+import pm.axe.db.models.Token;
+import pm.axe.db.models.User;
+import pm.axe.result.OperationResult;
+import pm.axe.services.user.TokenService;
+import pm.axe.session.AxeSession;
+import pm.axe.ui.MainView;
+import pm.axe.ui.elements.Section;
+import pm.axe.ui.elements.TelegramSpan;
+import pm.axe.ui.layouts.AxeCompactLayout;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@Route(value = Endpoint.UI.CONFIRM_ACCOUNT_PAGE, layout = MainView.class)
+@PageTitle("Confirm Account - Axe.pm")
+public class ConfirmAccountPage extends AxeCompactLayout implements BeforeEnterObserver {
+    private final TokenService tokenService;
+    private boolean pageAlreadyInitialized = false;
+    private User user;
+
+    private FlexLayout emailLayout;
+    private EmailField emailInput;
+    private Button submitEmailButton;
+    private Span sentSpan;
+
+    private Section telegramSection;
+
+    @Override
+    public void beforeEnter(final BeforeEnterEvent event) {
+        boundUserIfAny();
+        if (Objects.isNull(user)) {
+            event.forwardTo(LoginPage.class);
+        }
+        if (!pageAlreadyInitialized) {
+            initPage();
+            pageAlreadyInitialized = true;
+        }
+    }
+
+    private void initPage() {
+        H3 title = new H3("Confirm your Account");
+
+        Section emailSection =  new Section("Using Email");
+        emailSection.setCustomContent(emailSectionContent());
+
+        telegramSection = new Section("Using Telegram");
+        telegramSection.setCustomContent(telegramSectionContent());
+
+        add(title, emailSection, telegramSection);
+    }
+
+    private FlexLayout emailSectionContent() {
+        emailInput = new EmailField("Email address here");
+        submitEmailButton = new Button("Submit");
+        submitEmailButton.addClickListener(this::onSubmitEmail);
+        sentSpan = new Span("Sent!");
+        sentSpan.setClassName("green");
+
+        emailLayout = new FlexLayout(emailInput, submitEmailButton);
+        emailLayout.setAlignItems(Alignment.BASELINE);
+        emailLayout.setJustifyContentMode(JustifyContentMode.EVENLY);
+        return emailLayout;
+    }
+
+    private Component telegramSectionContent() {
+        Optional<Token> telegramToken = tokenService.getTelegramToken(user);
+        Token tgToken;
+        if (telegramToken.isPresent()) {
+            tgToken = telegramToken.get();
+        } else {
+            OperationResult tokenCreateResult = tokenService.createTelegramConfirmationToken(user);
+            if (tokenCreateResult.ok()) {
+                tgToken = tokenCreateResult.getPayload(Token.class);
+            } else {
+                telegramSection.setVisible(false);
+                return new Span("Failed to generate Telegram Token. System error,");
+            }
+        }
+        return TelegramSpan.create(tgToken);
+    }
+
+    private void onSubmitEmail(ClickEvent<Button> event) {
+        if (emailInput.isInvalid()) {
+            emailInput.setInvalid(true);
+            emailInput.setErrorMessage("Please enter valid email");
+            return;
+        }
+        //TODO implement sent confirmation letter call here
+        emailLayout.replace(submitEmailButton, sentSpan);
+    }
+
+    private void boundUserIfAny() {
+        Optional<AxeSession> axeSession = AxeSession.getCurrent();
+        if (axeSession.isPresent()) {
+            if (axeSession.get().hasUser()) {
+                user = axeSession.get().getUser();
+            }
+        }
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java b/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java
new file mode 100644
index 000000000..8462917bb
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java
@@ -0,0 +1,90 @@
+package pm.axe.ui.pages.user;
+
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.Endpoint;
+import pm.axe.db.models.Token;
+import pm.axe.ui.MainView;
+import pm.axe.ui.layouts.AxeFormLayout;
+
+
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/login_page.css")
+@Route(value = Endpoint.UI.LOGIN_VERIFICATION_PAGE, layout = MainView.class)
+@PageTitle("Login Verification - Axe.pm")
+public class LoginVerificationPage extends AxeFormLayout implements BeforeEnterObserver {
+
+    private final TextField otpInput = new TextField();
+    private boolean pageAlreadyInitialized = false;
+
+    @Override
+    public void beforeEnter(BeforeEnterEvent event) {
+        if (event.isRefreshEvent()) return;
+        if (pageAlreadyInitialized) {
+            cleanInputs();
+        } else {
+            pageInit();
+            pageAlreadyInitialized = true;
+        }
+    }
+
+    private void cleanInputs() {
+        otpInput.clear();
+    }
+
+    private void pageInit() {
+        setCompactMode();
+        setFormTitle("Verification Code\n");
+
+        otpInput.setLabel("Code (OTP)");
+
+        setComponentsAfterFields(new Span("Please insert your verification code"));
+        setSubmitButtonText("Let me in");
+        getSubmitButton().addClickShortcut(Key.ENTER);
+        getSubmitButton().addClickListener(this::onSubmit);
+    }
+
+    private void onSubmit(ClickEvent<Button> event) {
+        String otp = otpInput.getValue();
+        if (StringUtils.isBlank(otp)) {
+            otpInput.setInvalid(true);
+            otpInput.setErrorMessage("Please enter code");
+            otpInput.focus();
+            return;
+        }
+
+        if (otp.length() != Token.CODE_TOKEN_LEN) {
+            fail();
+            return;
+        }
+
+        //FIXME update code once 2FA logic ready
+        int code;
+        try {
+            code = Integer.parseInt(otp);
+        } catch (NumberFormatException e) {
+            fail();
+        }
+        //TODO check otp token from db
+        //TODO paste token owner to session
+    }
+
+    private void fail() {
+        Notification.show("Wrong Code");
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
index dfd92f62c..ab19b75e9 100644
--- a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
@@ -1,13 +1,12 @@
 package pm.axe.ui.pages.user;
 
+import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.details.Details;
-import com.vaadin.flow.component.html.H2;
-import com.vaadin.flow.component.html.H4;
-import com.vaadin.flow.component.html.Hr;
-import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.html.*;
+import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
@@ -27,7 +26,9 @@
 import pm.axe.Endpoint;
 import pm.axe.db.models.Account;
 import pm.axe.db.models.User;
+import pm.axe.db.models.UserSettings;
 import pm.axe.services.user.AccountService;
+import pm.axe.services.user.UserSettingsService;
 import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.elements.PasswordGenerator;
@@ -46,10 +47,13 @@
 @PageTitle("My Profile - Axe.pm")
 public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver {
     private final AccountService accountService;
+    private final UserSettingsService userSettingsService;
     private boolean pageAlreadyInitialized = false;
     private User user;
     private List<Account> confirmedAccounts;
 
+    private Checkbox tfaBox;
+
     @Override
     public void beforeEnter(BeforeEnterEvent event) {
         if (event.isRefreshEvent()) return;
@@ -124,16 +128,28 @@ private void initPage() {
 
         //tfa section
         Details tfaDetails = new Details("Two-Factor Authentication (2FA)");
-        Checkbox tfaBox = new Checkbox("Protect my account with additional one time codes");
+
+        tfaBox = new Checkbox("Protect my account with additional one time codes");
+        tfaBox.setValue(userSettingsService.isTfaEnabled(user));
         tfaBox.setEnabled(!confirmedAccounts.isEmpty());
+        tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
-        Select<AccountType> tfaChannelSelect = new Select<>();
-        tfaChannelSelect.setItems(confirmedAccounts.stream().map(Account::getType).toList());
+        Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
+        Select<String> tfaChannelSelect = new Select<>();
+        tfaChannelSelect.setLabel("Send to");
+        tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
         Button saveTfaChannelButton = new Button("Save");
+
         HorizontalLayout tfaChannelLayout = new HorizontalLayout(tfaChannelSelect, saveTfaChannelButton);
 
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
-        if (confirmedAccounts.size() > 1) {
+        if (confirmedAccounts.isEmpty()) {
+            tfaContent.add(noConfirmedAccountsSpan);
+        } else if (confirmedAccounts.size() == 1) {
+            tfaChannelSelect.setValue(getAccountTypeName(confirmedAccounts.get(0)));
+            tfaChannelSelect.setEnabled(false);
+            tfaContent.add(tfaChannelSelect);
+        } else {
             tfaContent.add(tfaChannelLayout);
         }
         tfaDetails.setContent(tfaContent);
@@ -148,6 +164,18 @@ private void initPage() {
                 secondSeparator, tfaDetails);
     }
 
+    private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
+        Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
+        if (userSettings.isPresent()) {
+            userSettings.get().setTfaEnabled(tfaBox.getValue());
+            userSettingsService.updateUserSettings(userSettings.get());
+            Notification.show("Saved");
+        } else {
+            tfaBox.setEnabled(false);
+            Notification.show("Failed to save. System error.");
+        }
+    }
+
     private void boundUserIfAny() {
         Optional<AxeSession> axeSession = AxeSession.getCurrent();
         if (axeSession.isPresent()) {
@@ -175,4 +203,15 @@ private String getCurrentEmail() {
     private List<Account> getConfirmedAccountsFor(final User user) {
         return accountService.getAllAccountsLinkedWithUser(user).stream().filter(Account::isConfirmed).toList();
     }
+
+    private String getAccountTypeName(final Account account) {
+        return StringUtils.capitalize(account.getType().name());
+    }
+
+    private Span getNoConfirmedAccountsSpan() {
+        Span firstPart = new Span("In order to use 2FA, please ");
+        Anchor link = new Anchor(Endpoint.UI.CONFIRM_ACCOUNT_PAGE, "confirm account");
+        Span lastPart = new Span(" .");
+        return new Span(firstPart, link, lastPart);
+    }
 }

From b77b1a5f836b98ae0347840e688c5a69240a8314 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 20 Jan 2023 23:44:39 +0200
Subject: [PATCH 24/69] Improvements (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/LoginPage.java  | 28 +++++-
 .../pm/axe/ui/pages/user/ProfilePage.java     | 54 +++++++----
 .../axe/ui/pages/user/RegistrationPage.java   | 96 +++++++------------
 3 files changed, 93 insertions(+), 85 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 101d2d361..911ddfe78 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -3,12 +3,16 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.Section;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.shared.Tooltip;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.BeforeEnterEvent;
@@ -18,6 +22,7 @@
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import pm.axe.Endpoint;
 import pm.axe.db.models.User;
 import pm.axe.services.user.UserService;
@@ -45,6 +50,7 @@ public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private final TextField usernameInput = new TextField();
     private final PasswordField passwordInput = new PasswordField();
     private final Checkbox forgotMe = new Checkbox();
+    private final Button forgotMeInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
 
     private final Section forgotPasswordSection = new Section();
     private final Anchor forgotPasswordLink = new Anchor();
@@ -75,10 +81,22 @@ private void init() {
 
         usernameInput.setLabel("Username/Email");
         usernameInput.setClearButtonVisible(true);
+        usernameInput.setRequired(true);
         passwordInput.setLabel("Password");
+        passwordInput.setRequired(true);
+
         forgotMe.setLabel("Log me out after");
+        forgotMe.setTooltipText("If enabled, Axe will log you out once current session is over");
+        forgotMeInfoButton.setIconAfterText(true);
+        forgotMeInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+        forgotMeInfoButton.setClassName("info-button");
+
+        Tooltip forgotMeTooltip = forgotMe.getTooltip().withManual(true);
+        forgotMeInfoButton.addClickListener(e -> forgotMeTooltip.setOpened(!forgotMeTooltip.isOpened()));
+        FlexLayout forgotMeLayout = new FlexLayout(forgotMe, forgotMeInfoButton);
+        forgotMeLayout.setAlignItems(Alignment.BASELINE);
 
-        setFormFields(usernameInput, passwordInput, forgotMe);
+        setFormFields(usernameInput, passwordInput, forgotMeLayout);
 
         setSubmitButtonText("Jump in");
         getSubmitButton().addClickShortcut(Key.ENTER);
@@ -104,9 +122,13 @@ private void onLogin(final ClickEvent<Button> event) {
     }
 
     private void doEasyLogin() {
-        if (userService.isUserExists(usernameInput.getValue())) {
+        String username = StringUtils.isNotBlank(usernameInput.getValue()) ? usernameInput.getValue().trim() : "";
+        if (StringUtils.isBlank(username)) {
+            usernameInput.setInvalid(true);
+            usernameInput.setErrorMessage("Please type username or email here");
+        } else if (userService.isUserExists(username)) {
             AxeSession.getCurrent().ifPresent(axs -> {
-                Optional<User> user = userService.getUserByUsername(usernameInput.getValue());
+                Optional<User> user = userService.getUserByUsername(username);
                 user.ifPresent(axs::setUser);
                 usernameInput.getUI().ifPresent(ui -> ui.navigate(Endpoint.UI.PROFILE_PAGE));
             });
diff --git a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
index ab19b75e9..247e14162 100644
--- a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
@@ -78,7 +78,7 @@ private void initPage() {
         //username
         TextField username = new TextField("Username");
         username.setValue(user.getUsername());
-        username.setEnabled(false);
+        username.setReadOnly(true);
         Button editUsernameButton = new Button("Edit");
         Button saveUsernameButton = new Button("Save");
         FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
@@ -86,26 +86,38 @@ private void initPage() {
         usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
         //TODO replace with methods and fix button replace login - see MyLinksPage
         editUsernameButton.addClickListener(e -> {
-            username.setEnabled(true);
+            username.setReadOnly(false);
             usernameLayout.replace(editUsernameButton, saveUsernameButton);
         });
         saveUsernameButton.addClickListener(e -> {
-           username.setEnabled(false);
+           username.setReadOnly(true);
            usernameLayout.replace(saveUsernameButton, editUsernameButton);
         });
 
         //email
         EmailField emailField = new EmailField("E-mail");
         emailField.setValue(getCurrentEmail());
+        emailField.setReadOnly(true);
 
+        Button editEmailButton = new Button("Edit");
         Button saveEmailButton = new Button("Save");
-        FlexLayout emailLayout = new FlexLayout(emailField, saveEmailButton);
-        emailLayout.setAlignItems(Alignment.BASELINE);
+        FlexLayout emailLayout = new FlexLayout(emailField, editEmailButton);
         emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+        emailLayout.setAlignItems(Alignment.BASELINE);
+
+        //TODO replace with methods and fix button replace login - see MyLinksPage
+        editEmailButton.addClickListener(e -> {
+           emailField.setReadOnly(false);
+           emailLayout.replace(editEmailButton, saveEmailButton);
+        });
+        saveEmailButton.addClickListener(e -> {
+           emailField.setReadOnly(true);
+           emailLayout.replace(saveEmailButton, editEmailButton);
+        });
 
         //how Axe use email details
-        Details howEmailUsedDetails = new Details("How Axe use email?");
-        Span span = new Span("Account Recovery"); //TODO replace with UL with usage
+        Details howEmailUsedDetails = new Details("What will be send to email?");
+        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
         howEmailUsedDetails.setOpened(false);
         howEmailUsedDetails.setContent(span);
 
@@ -127,7 +139,7 @@ private void initPage() {
         Hr secondSeparator = new Hr();
 
         //tfa section
-        Details tfaDetails = new Details("Two-Factor Authentication (2FA)");
+        H5 tfaTitle = new H5("Two-Factor Authentication (2FA)");
 
         tfaBox = new Checkbox("Protect my account with additional one time codes");
         tfaBox.setValue(userSettingsService.isTfaEnabled(user));
@@ -135,33 +147,39 @@ private void initPage() {
         tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
         Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
+        TextField tfaField = new TextField();
+        tfaField.setReadOnly(true);
+
+        Label sendToLabel = new Label("Send to:");
         Select<String> tfaChannelSelect = new Select<>();
-        tfaChannelSelect.setLabel("Send to");
-        tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
         Button saveTfaChannelButton = new Button("Save");
 
-        HorizontalLayout tfaChannelLayout = new HorizontalLayout(tfaChannelSelect, saveTfaChannelButton);
+        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
+        tfaSelectLayout.setAlignItems(Alignment.CENTER);
+        HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
+        tfaFieldLayout.setAlignItems(Alignment.CENTER);
 
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
+        tfaContent.setPadding(false);
+
         if (confirmedAccounts.isEmpty()) {
             tfaContent.add(noConfirmedAccountsSpan);
         } else if (confirmedAccounts.size() == 1) {
-            tfaChannelSelect.setValue(getAccountTypeName(confirmedAccounts.get(0)));
-            tfaChannelSelect.setEnabled(false);
-            tfaContent.add(tfaChannelSelect);
+            tfaField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
+            tfaContent.add(tfaFieldLayout);
         } else {
-            tfaContent.add(tfaChannelLayout);
+            tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
+            tfaContent.add(tfaSelectLayout);
         }
-        tfaDetails.setContent(tfaContent);
-        tfaDetails.setOpened(true);
 
         //TODO 3rd separator
+        //TODO Settings Tab/Zone
         //TODO danger zone
 
         //overall layout
         add(title, usernameLayout, emailLayout, howEmailUsedDetails,
                 firstSeparator, passwordLayout,
-                secondSeparator, tfaDetails);
+                secondSeparator, tfaTitle, tfaContent);
     }
 
     private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 5ec1e235b..a19fddc3b 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -3,17 +3,14 @@
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.ListItem;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.html.UnorderedList;
-import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.FlexLayout;
-import com.vaadin.flow.component.shared.Tooltip;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.data.value.ValueChangeMode;
@@ -28,10 +25,12 @@
 import org.apache.commons.validator.routines.EmailValidator;
 import pm.axe.Endpoint;
 import pm.axe.result.OperationResult;
+import pm.axe.services.user.AccountService;
 import pm.axe.services.user.UserService;
 import pm.axe.ui.MainView;
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.users.AccountType;
 import pm.axe.users.UsernameGenerator;
 import pm.axe.users.UsernameValidator;
 
@@ -52,27 +51,16 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
 
     private final UsernameGenerator usernameGenerator;
     private final UserService userService;
+    private final AccountService accountService;
 
     private final Span subTitleText = new Span();
     private final Anchor subTitleLink = new Anchor();
-
-    private final FlexLayout userEmailLayout = new FlexLayout();
     private final TextField userEmailInput = new TextField();
-    private final Button userEmailInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
-
-    private final FlexLayout usernameLayout = new FlexLayout();
     private final TextField usernameInput = new TextField();
-    private final Button usernameInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
-
     private final Details usernameRequirements = new Details();
-
-    private final FlexLayout passwordLayout = new FlexLayout();
     private final PasswordField passwordInput = new PasswordField();
-    private final Button passwordInfoButton = new Button(VaadinIcon.INFO_CIRCLE_O.create());
-
     private final PasswordGenerator passwordGenerator = PasswordGenerator.create();
-
-    private final Span tosNote = createLegalInfo();
+    private final VerticalLayout tosNote = createLegalInfo();
 
     private boolean pageAlreadyInitialized = false;
 
@@ -103,7 +91,7 @@ private void pageInit() {
         setupPasswordSection();
         setupPasswordGeneratorSection();
 
-        setFormFields(userEmailLayout, usernameRequirements, passwordLayout, passwordGenerator);
+        setFormFields(userEmailInput, usernameRequirements, passwordInput, passwordGenerator);
 
         setComponentsAfterFields(tosNote);
         setSubmitButtonText("Sign up");
@@ -118,9 +106,10 @@ private void cleanInputs() {
     }
 
     private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
-        String input = event.getValue();
+        String input = event.getValue().trim();
         boolean isInputEmpty = StringUtils.isBlank(input);
         if (isInputEmpty) {
+            userEmailInput.setInvalid(false);
             hideUsernameField();
             updateLabelForUserEmailInput();
             return;
@@ -132,8 +121,13 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
             if (generationResult.ok()) {
                 usernameInput.setValue(generationResult.getStringPayload());
                 //paste username fields
-                getFields().addComponentAtIndex(1, usernameLayout);
+                getFields().addComponentAtIndex(1, usernameInput);
                 updateLabelForUserEmailInput();
+                //check if it exists
+                boolean alreadyExists = accountService.isAccountAlreadyExists(input, AccountType.EMAIL);
+                if (alreadyExists) {
+                    onInvalidUserEmail("Email already taken");
+                }
             }
         } else {
             hideUsernameField();
@@ -142,7 +136,7 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
             OperationResult usernameValidation = UsernameValidator.isValid(input);
             if (usernameValidation.ok()) {
                 if (userService.isUserExists(input)) {
-                    onInvalidUserEmail("Username already exists");
+                    onInvalidUserEmail("Username already taken");
                 }
             } else {
                 onInvalidUserEmail("Username doesn't meet requirements");
@@ -151,7 +145,7 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
     }
 
     private void onUsernameFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
-        final String username = event.getValue();
+        final String username = event.getValue().trim();
         if (StringUtils.isBlank(username)) return;
         OperationResult usernameValidation = UsernameValidator.isValid(username);
         if (usernameValidation.ok()) {
@@ -192,18 +186,18 @@ private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
     }
 
-    private boolean isUsernameLayoutVisible() {
-        return getFields().indexOf(usernameLayout) != -1;
+    private boolean isUsernameInputVisible() {
+        return getFields().indexOf(usernameInput) != -1;
     }
 
     private void hideUsernameField() {
-        if (isUsernameLayoutVisible()) {
-            getFields().remove(usernameLayout);
+        if (isUsernameInputVisible()) {
+            getFields().remove(usernameInput);
         }
     }
 
     private void updateLabelForUserEmailInput() {
-        if (isUsernameLayoutVisible()) {
+        if (isUsernameInputVisible()) {
             userEmailInput.setLabel(JUST_EMAIL_LABEL);
         } else {
             userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
@@ -217,18 +211,8 @@ private void setupUserEmailSection() {
         userEmailInput.setClearButtonVisible(true);
         userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         userEmailInput.addValueChangeListener(this::onUserEmailFieldChanged);
-        userEmailInput.setTooltipText("Email stored encrypted. See requirements below.");
+        userEmailInput.setHelperText("Valid email address or avaialble username");
         userEmailInput.setClassName("input");
-
-        userEmailInfoButton.setIconAfterText(true);
-        userEmailInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
-        userEmailInfoButton.setClassName("info-button");
-
-        Tooltip userEmailTooltip = userEmailInput.getTooltip().withManual(true);
-        userEmailInfoButton.addClickListener(event -> userEmailTooltip.setOpened(!userEmailTooltip.isOpened()));
-
-        userEmailLayout.setAlignItems(Alignment.BASELINE);
-        userEmailLayout.add(userEmailInput, userEmailInfoButton);
     }
 
     private void setupUsernameSection() {
@@ -237,18 +221,8 @@ private void setupUsernameSection() {
         usernameInput.setClearButtonVisible(true);
         usernameInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         usernameInput.addValueChangeListener(this::onUsernameFieldChanged);
-        usernameInput.setTooltipText("You can use both as login");
+        usernameInput.setHelperText("You can use both as login");
         usernameInput.setClassName("input");
-
-        usernameInfoButton.setIconAfterText(true);
-        usernameInfoButton.setClassName("info-button");
-        usernameInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
-
-        Tooltip usernameTooltip = usernameInput.getTooltip().withManual(true);
-        usernameInfoButton.addClickListener(event -> usernameTooltip.setOpened(!usernameTooltip.isOpened()));
-
-        usernameLayout.setAlignItems(Alignment.BASELINE);
-        usernameLayout.add(usernameInput, usernameInfoButton);
     }
 
     private void setupUserRequirementsSection() {
@@ -276,19 +250,8 @@ private void setupPasswordSection() {
         passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
         passwordInput.setClassName("input");
-        passwordInput.setTooltipText(String.format("At least %d symbols. Max %d symbols. " +
-                        "Use password generator - make it strong.",
-                PASSWORD_MIN_LEN, PASSWORD_MAX_LEN));
-
-        passwordInfoButton.setIconAfterText(true);
-        passwordInfoButton.setClassName("info-button");
-
-        passwordInfoButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
-        Tooltip passwordTooltip = passwordInput.getTooltip().withManual(true);
-        passwordInfoButton.addClickListener(event -> passwordTooltip.setOpened(!passwordTooltip.isOpened()));
-
-        passwordLayout.add(passwordInput, passwordInfoButton);
-        passwordLayout.setAlignItems(Alignment.BASELINE);
+        passwordInput.setHelperText(String.format("Should be %d-%d symbols long. " +
+                "Tip: Use password generator - make it strong.", PASSWORD_MIN_LEN, PASSWORD_MAX_LEN));
     }
 
     private void setupPasswordGeneratorSection() {
@@ -296,7 +259,8 @@ private void setupPasswordGeneratorSection() {
         passwordGenerator.setOpened(false);
     }
 
-    private Span createLegalInfo() {
+    private VerticalLayout createLegalInfo() {
+        Span encryptedSpan = new Span("Data stored encrypted.");
         Span tosStart = new Span("By signing up, you accept our ");
         Anchor linkToTerms = new Anchor();
         linkToTerms.setHref(Endpoint.UI.TOS_PAGE);
@@ -304,6 +268,10 @@ private Span createLegalInfo() {
 
         Span tosEnd = new Span(".");
 
-        return new Span(tosStart, linkToTerms, tosEnd);
+        Span tosSpan = new Span(tosStart, linkToTerms, tosEnd);
+        VerticalLayout legalInfoLayout = new VerticalLayout(encryptedSpan, tosSpan);
+        legalInfoLayout.setPadding(false);
+        legalInfoLayout.setSpacing(false);
+        return legalInfoLayout;
     }
 }

From 9dc9c1cdd9d9e7710c246d5a9da3f766506deb56 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 22 Jan 2023 00:28:02 +0200
Subject: [PATCH 25/69] ProfilePage: Tabs and Telegram Stuff (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/internal/HasTabInit.java |   7 +
 .../pm/axe/ui/pages/user/ProfilePage.java     | 235 ------------------
 .../ui/pages/user/profile/ProfilePage.java    | 121 +++++++++
 .../user/profile/tabs/DangerZoneTab.java      |  20 ++
 .../pages/user/profile/tabs/ProfileTab.java   | 142 +++++++++++
 .../pages/user/profile/tabs/SecurityTab.java  | 126 ++++++++++
 .../pages/user/profile/tabs/SettingsTab.java  |  19 ++
 7 files changed, 435 insertions(+), 235 deletions(-)
 create mode 100644 src/main/java/pm/axe/internal/HasTabInit.java
 delete mode 100644 src/main/java/pm/axe/ui/pages/user/ProfilePage.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
 create mode 100644 src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java

diff --git a/src/main/java/pm/axe/internal/HasTabInit.java b/src/main/java/pm/axe/internal/HasTabInit.java
new file mode 100644
index 000000000..b667713aa
--- /dev/null
+++ b/src/main/java/pm/axe/internal/HasTabInit.java
@@ -0,0 +1,7 @@
+package pm.axe.internal;
+
+import pm.axe.db.models.User;
+
+public interface HasTabInit {
+    void tabInit(User user);
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
deleted file mode 100644
index 247e14162..000000000
--- a/src/main/java/pm/axe/ui/pages/user/ProfilePage.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package pm.axe.ui.pages.user;
-
-import com.vaadin.flow.component.AbstractField;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.checkbox.Checkbox;
-import com.vaadin.flow.component.dependency.CssImport;
-import com.vaadin.flow.component.details.Details;
-import com.vaadin.flow.component.html.*;
-import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.FlexComponent;
-import com.vaadin.flow.component.orderedlayout.FlexLayout;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.select.Select;
-import com.vaadin.flow.component.textfield.EmailField;
-import com.vaadin.flow.component.textfield.PasswordField;
-import com.vaadin.flow.component.textfield.TextField;
-import com.vaadin.flow.router.BeforeEnterEvent;
-import com.vaadin.flow.router.BeforeEnterObserver;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.spring.annotation.SpringComponent;
-import com.vaadin.flow.spring.annotation.UIScope;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import pm.axe.Endpoint;
-import pm.axe.db.models.Account;
-import pm.axe.db.models.User;
-import pm.axe.db.models.UserSettings;
-import pm.axe.services.user.AccountService;
-import pm.axe.services.user.UserSettingsService;
-import pm.axe.session.AxeSession;
-import pm.axe.ui.MainView;
-import pm.axe.ui.elements.PasswordGenerator;
-import pm.axe.ui.layouts.AxeCompactLayout;
-import pm.axe.users.AccountType;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-@SpringComponent
-@UIScope
-@RequiredArgsConstructor
-@CssImport(value = "./css/profile_page.css")
-@Route(value = Endpoint.UI.PROFILE_PAGE, layout = MainView.class)
-@PageTitle("My Profile - Axe.pm")
-public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver {
-    private final AccountService accountService;
-    private final UserSettingsService userSettingsService;
-    private boolean pageAlreadyInitialized = false;
-    private User user;
-    private List<Account> confirmedAccounts;
-
-    private Checkbox tfaBox;
-
-    @Override
-    public void beforeEnter(BeforeEnterEvent event) {
-        if (event.isRefreshEvent()) return;
-        boundUserIfAny();
-        if (Objects.isNull(user)) {
-            event.forwardTo(LoginPage.class);
-            return;
-        }
-        confirmedAccounts = getConfirmedAccountsFor(user);
-
-        if (!pageAlreadyInitialized) {
-            initPage();
-            pageAlreadyInitialized = true;
-        }
-    }
-
-    private void initPage() {
-        //title
-        H2 title = new H2("My Profile");
-        title.setClassName("profile-title");
-
-        //username
-        TextField username = new TextField("Username");
-        username.setValue(user.getUsername());
-        username.setReadOnly(true);
-        Button editUsernameButton = new Button("Edit");
-        Button saveUsernameButton = new Button("Save");
-        FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
-        usernameLayout.setAlignItems(FlexComponent.Alignment.BASELINE);
-        usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
-        //TODO replace with methods and fix button replace login - see MyLinksPage
-        editUsernameButton.addClickListener(e -> {
-            username.setReadOnly(false);
-            usernameLayout.replace(editUsernameButton, saveUsernameButton);
-        });
-        saveUsernameButton.addClickListener(e -> {
-           username.setReadOnly(true);
-           usernameLayout.replace(saveUsernameButton, editUsernameButton);
-        });
-
-        //email
-        EmailField emailField = new EmailField("E-mail");
-        emailField.setValue(getCurrentEmail());
-        emailField.setReadOnly(true);
-
-        Button editEmailButton = new Button("Edit");
-        Button saveEmailButton = new Button("Save");
-        FlexLayout emailLayout = new FlexLayout(emailField, editEmailButton);
-        emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
-        emailLayout.setAlignItems(Alignment.BASELINE);
-
-        //TODO replace with methods and fix button replace login - see MyLinksPage
-        editEmailButton.addClickListener(e -> {
-           emailField.setReadOnly(false);
-           emailLayout.replace(editEmailButton, saveEmailButton);
-        });
-        saveEmailButton.addClickListener(e -> {
-           emailField.setReadOnly(true);
-           emailLayout.replace(saveEmailButton, editEmailButton);
-        });
-
-        //how Axe use email details
-        Details howEmailUsedDetails = new Details("What will be send to email?");
-        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
-        howEmailUsedDetails.setOpened(false);
-        howEmailUsedDetails.setContent(span);
-
-        //TODO tg section
-        Hr firstSeparator = new Hr();
-        //change password section
-        H4 changePasswordTitle = new H4("Change Password");
-        PasswordField oldPasswordInput = new PasswordField("Old Password");
-        PasswordField newPasswordInput = new PasswordField("New Password");
-        PasswordGenerator passwordGenerator = PasswordGenerator.create();
-        passwordGenerator.setOpened(false);
-        passwordGenerator.setCopyTarget(newPasswordInput);
-        Button updatePasswordButton = new Button("Update");
-        VerticalLayout passwordLayout = new VerticalLayout(changePasswordTitle,
-                oldPasswordInput, newPasswordInput, passwordGenerator,
-                updatePasswordButton);
-
-        //second separator
-        Hr secondSeparator = new Hr();
-
-        //tfa section
-        H5 tfaTitle = new H5("Two-Factor Authentication (2FA)");
-
-        tfaBox = new Checkbox("Protect my account with additional one time codes");
-        tfaBox.setValue(userSettingsService.isTfaEnabled(user));
-        tfaBox.setEnabled(!confirmedAccounts.isEmpty());
-        tfaBox.addValueChangeListener(this::onTfaBoxChanged);
-
-        Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
-        TextField tfaField = new TextField();
-        tfaField.setReadOnly(true);
-
-        Label sendToLabel = new Label("Send to:");
-        Select<String> tfaChannelSelect = new Select<>();
-        Button saveTfaChannelButton = new Button("Save");
-
-        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
-        tfaSelectLayout.setAlignItems(Alignment.CENTER);
-        HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
-        tfaFieldLayout.setAlignItems(Alignment.CENTER);
-
-        VerticalLayout tfaContent = new VerticalLayout(tfaBox);
-        tfaContent.setPadding(false);
-
-        if (confirmedAccounts.isEmpty()) {
-            tfaContent.add(noConfirmedAccountsSpan);
-        } else if (confirmedAccounts.size() == 1) {
-            tfaField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
-            tfaContent.add(tfaFieldLayout);
-        } else {
-            tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
-            tfaContent.add(tfaSelectLayout);
-        }
-
-        //TODO 3rd separator
-        //TODO Settings Tab/Zone
-        //TODO danger zone
-
-        //overall layout
-        add(title, usernameLayout, emailLayout, howEmailUsedDetails,
-                firstSeparator, passwordLayout,
-                secondSeparator, tfaTitle, tfaContent);
-    }
-
-    private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
-        Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
-        if (userSettings.isPresent()) {
-            userSettings.get().setTfaEnabled(tfaBox.getValue());
-            userSettingsService.updateUserSettings(userSettings.get());
-            Notification.show("Saved");
-        } else {
-            tfaBox.setEnabled(false);
-            Notification.show("Failed to save. System error.");
-        }
-    }
-
-    private void boundUserIfAny() {
-        Optional<AxeSession> axeSession = AxeSession.getCurrent();
-        if (axeSession.isPresent()) {
-            if (axeSession.get().hasUser()) {
-                user = axeSession.get().getUser();
-            }
-        }
-    }
-
-    //TODO maybe Optional<String> instead
-    private String getCurrentEmail() {
-        Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
-        if (emailAccount.isPresent()) {
-            Optional<String> plainTextEmail = accountService.decryptAccountName(emailAccount.get());
-            if (plainTextEmail.isPresent() && StringUtils.isNotBlank(plainTextEmail.get())) {
-                return plainTextEmail.get();
-            } else {
-                return "";
-            }
-        } else {
-            return "";
-        }
-    }
-
-    private List<Account> getConfirmedAccountsFor(final User user) {
-        return accountService.getAllAccountsLinkedWithUser(user).stream().filter(Account::isConfirmed).toList();
-    }
-
-    private String getAccountTypeName(final Account account) {
-        return StringUtils.capitalize(account.getType().name());
-    }
-
-    private Span getNoConfirmedAccountsSpan() {
-        Span firstPart = new Span("In order to use 2FA, please ");
-        Anchor link = new Anchor(Endpoint.UI.CONFIRM_ACCOUNT_PAGE, "confirm account");
-        Span lastPart = new Span(" .");
-        return new Span(firstPart, link, lastPart);
-    }
-}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
new file mode 100644
index 000000000..51f224038
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
@@ -0,0 +1,121 @@
+package pm.axe.ui.pages.user.profile;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.tabs.Tab;
+import com.vaadin.flow.component.tabs.TabVariant;
+import com.vaadin.flow.component.tabs.Tabs;
+import com.vaadin.flow.component.tabs.TabsVariant;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import pm.axe.Endpoint;
+import pm.axe.db.models.User;
+import pm.axe.internal.HasTabInit;
+import pm.axe.session.AxeSession;
+import pm.axe.ui.MainView;
+import pm.axe.ui.layouts.AxeCompactLayout;
+import pm.axe.ui.pages.user.LoginPage;
+import pm.axe.ui.pages.user.profile.tabs.DangerZoneTab;
+import pm.axe.ui.pages.user.profile.tabs.ProfileTab;
+import pm.axe.ui.pages.user.profile.tabs.SecurityTab;
+import pm.axe.ui.pages.user.profile.tabs.SettingsTab;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+@SpringComponent
+@UIScope
+@RequiredArgsConstructor
+@CssImport(value = "./css/profile_page.css")
+@Route(value = Endpoint.UI.PROFILE_PAGE, layout = MainView.class)
+@PageTitle("My Profile - Axe.pm")
+public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver {
+    private final Tab profileTab = new Tab(VaadinIcon.USER.create(), new Span("Profile"));
+    private final Tab securityTab = new Tab(VaadinIcon.SHIELD.create(), new Span("Security"));
+    private final Tab settingsTab = new Tab(VaadinIcon.COG.create(), new Span("Settings"));
+    private final Tab dangerZoneTab = new Tab(VaadinIcon.FIRE.create(), new Span("Danger Zone"));
+    private final ProfileTab profileTabContent;
+    private final SecurityTab securityTabContent;
+    private final SettingsTab settingsTabContent;
+    private final DangerZoneTab dangerZoneTabContent;
+    private boolean pageAlreadyInitialized = false;
+    private User user;
+
+    private final Div content = new Div();
+    private final Map<Tab, Component> contentMap = new LinkedHashMap<>();
+
+    @Override
+    public void beforeEnter(BeforeEnterEvent event) {
+        if (event.isRefreshEvent()) return;
+        boundUserIfAny();
+        if (Objects.isNull(user)) {
+            event.forwardTo(LoginPage.class);
+            return;
+        }
+
+        if (!pageAlreadyInitialized) {
+            initPage();
+            pageAlreadyInitialized = true;
+        }
+    }
+
+    private void initPage() {
+        removeAll();
+        //content map
+        contentMap.clear();
+        contentMap.put(profileTab, profileTabContent);
+        contentMap.put(securityTab, securityTabContent);
+        contentMap.put(settingsTab, settingsTabContent);
+        contentMap.put(dangerZoneTab, dangerZoneTabContent);
+
+        //title
+        H2 title = new H2("My Profile");
+        title.setClassName("profile-title");
+
+        //tabs
+        //set icon on top on text
+        contentMap.forEach((tab, content) -> tab.addThemeVariants(TabVariant.LUMO_ICON_ON_TOP));
+        //init content
+        contentMap.forEach((tab, content) -> {
+            if (content instanceof HasTabInit) {
+                ((HasTabInit) content).tabInit(user);
+            }
+        });
+        Tabs tabs = new Tabs();
+        tabs.addSelectedChangeListener(event -> setContent(event.getSelectedTab()));
+        contentMap.forEach((tab, content) -> tabs.add(tab));
+        tabs.addThemeVariants(TabsVariant.LUMO_EQUAL_WIDTH_TABS);
+        tabs.setWidthFull();
+
+        add(title, tabs, content);
+    }
+
+    private void boundUserIfAny() {
+        Optional<AxeSession> axeSession = AxeSession.getCurrent();
+        if (axeSession.isPresent()) {
+            if (axeSession.get().hasUser()) {
+                user = axeSession.get().getUser();
+            }
+        }
+    }
+
+    private void setContent(final Tab tab) {
+        content.removeAll();
+        if (tab == null) {
+            return;
+        }
+        Component tabContent = contentMap.get(tab);
+        content.add(tabContent);
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
new file mode 100644
index 000000000..27112a59c
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -0,0 +1,20 @@
+package pm.axe.ui.pages.user.profile.tabs;
+
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import pm.axe.db.models.User;
+import pm.axe.internal.HasTabInit;
+
+@RequiredArgsConstructor
+@SpringComponent
+@UIScope
+public class DangerZoneTab extends VerticalLayout implements HasTabInit {
+
+    @Override
+    public void tabInit(final User user) {
+        add(new Span("This is Danger Zone"));
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
new file mode 100644
index 000000000..f9110dc8b
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -0,0 +1,142 @@
+package pm.axe.ui.pages.user.profile.tabs;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.EmailField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.db.models.Account;
+import pm.axe.db.models.Token;
+import pm.axe.db.models.User;
+import pm.axe.internal.HasTabInit;
+import pm.axe.result.OperationResult;
+import pm.axe.services.user.AccountService;
+import pm.axe.services.user.TokenService;
+import pm.axe.ui.elements.TelegramSpan;
+import pm.axe.users.AccountType;
+
+import java.util.Optional;
+
+@RequiredArgsConstructor
+@SpringComponent
+@UIScope
+public class ProfileTab extends VerticalLayout implements HasTabInit {
+    private final AccountService accountService;
+    private final TokenService tokenService;
+    private User user;
+
+    @Override
+    public void tabInit(final User user) {
+        this.user = user;
+
+        //username
+        TextField username = new TextField("Username");
+        username.setValue(user.getUsername());
+        username.setReadOnly(true);
+        Button editUsernameButton = new Button("Edit");
+        Button saveUsernameButton = new Button("Save");
+        FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
+        usernameLayout.setAlignItems(FlexComponent.Alignment.BASELINE);
+        usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+        //TODO replace with methods and fix button replace login - see MyLinksPage
+        editUsernameButton.addClickListener(e -> {
+            username.setReadOnly(false);
+            usernameLayout.replace(editUsernameButton, saveUsernameButton);
+        });
+        saveUsernameButton.addClickListener(e -> {
+            username.setReadOnly(true);
+            usernameLayout.replace(saveUsernameButton, editUsernameButton);
+        });
+
+        //email
+        EmailField emailField = new EmailField("E-mail");
+        emailField.setValue(getCurrentEmail());
+        emailField.setReadOnly(true);
+
+        Button editEmailButton = new Button("Edit");
+        Button saveEmailButton = new Button("Save");
+        FlexLayout emailLayout = new FlexLayout(emailField, editEmailButton);
+        emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+        emailLayout.setAlignItems(Alignment.BASELINE);
+
+        //TODO replace with methods and fix button replace login - see MyLinksPage
+        editEmailButton.addClickListener(e -> {
+            emailField.setReadOnly(false);
+            emailLayout.replace(editEmailButton, saveEmailButton);
+        });
+        saveEmailButton.addClickListener(e -> {
+            emailField.setReadOnly(true);
+            emailLayout.replace(saveEmailButton, editEmailButton);
+        });
+
+        //how Axe use email details
+        Details howEmailUsedDetails = new Details("What will be sent to email?");
+        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
+        howEmailUsedDetails.setOpened(false);
+        howEmailUsedDetails.setContent(span);
+
+        //telegram section
+        FlexLayout telegramLayout = new FlexLayout();
+        Optional<Account> telegramAccount = getTelegramAccount();
+        if (telegramAccount.isPresent()) {
+            TextField telegramField = new TextField("Telegram");
+            telegramField.setPrefixComponent(VaadinIcon.AT.create());
+            telegramField.setValue(telegramAccount.get().getAccountName());
+            Button unlink = new Button("Unlink");
+            telegramLayout.add(telegramField, unlink);
+        } else {
+            Optional<Token> tgToken = getTelegramToken();
+            if (tgToken.isPresent()) {
+                TelegramSpan telegramSpan = TelegramSpan.create(tgToken.get());
+                telegramLayout.add(telegramSpan);
+            } else {
+                telegramLayout.setVisible(false);
+            }
+        }
+
+        add(usernameLayout, emailLayout, howEmailUsedDetails, telegramLayout);
+    }
+
+    //TODO maybe Optional<String> instead
+    private String getCurrentEmail() {
+        Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
+        if (emailAccount.isPresent()) {
+            Optional<String> plainTextEmail = accountService.decryptAccountName(emailAccount.get());
+            if (plainTextEmail.isPresent() && StringUtils.isNotBlank(plainTextEmail.get())) {
+                return plainTextEmail.get();
+            } else {
+                return "";
+            }
+        } else {
+            return "";
+        }
+    }
+
+    private Optional<Account> getTelegramAccount() {
+        return accountService.getAccount(user, AccountType.TELEGRAM);
+    }
+
+    private Optional<Token> getTelegramToken() {
+        Optional<Token> telegramToken = tokenService.getTelegramToken(user);
+        Token tgToken;
+        if (telegramToken.isPresent()) {
+            tgToken = telegramToken.get();
+        } else {
+            OperationResult tokenCreateResult = tokenService.createTelegramConfirmationToken(user);
+            if (tokenCreateResult.ok()) {
+                tgToken = tokenCreateResult.getPayload(Token.class);
+            } else {
+                tgToken = null;
+            }
+        }
+        return Optional.ofNullable(tgToken);
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
new file mode 100644
index 000000000..e77c55b72
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -0,0 +1,126 @@
+package pm.axe.ui.pages.user.profile.tabs;
+
+import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.checkbox.Checkbox;
+import com.vaadin.flow.component.html.*;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.select.Select;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.Endpoint;
+import pm.axe.db.models.Account;
+import pm.axe.db.models.User;
+import pm.axe.db.models.UserSettings;
+import pm.axe.internal.HasTabInit;
+import pm.axe.services.user.AccountService;
+import pm.axe.services.user.UserSettingsService;
+import pm.axe.ui.elements.PasswordGenerator;
+
+import java.util.List;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+@SpringComponent
+@UIScope
+public class SecurityTab extends VerticalLayout implements HasTabInit {
+    private final AccountService accountService;
+    private final UserSettingsService userSettingsService;
+    private Checkbox tfaBox;
+
+    private User user;
+
+    @Override
+    public void tabInit(final User user) {
+        this.user = user;
+        List<Account> confirmedAccounts = getConfirmedAccountsFor(user);
+
+        //change password section
+        H4 changePasswordTitle = new H4("Change Password");
+        PasswordField oldPasswordInput = new PasswordField("Old Password");
+        PasswordField newPasswordInput = new PasswordField("New Password");
+        PasswordGenerator passwordGenerator = PasswordGenerator.create();
+        passwordGenerator.setOpened(false);
+        passwordGenerator.setCopyTarget(newPasswordInput);
+        Button updatePasswordButton = new Button("Update");
+        VerticalLayout changePasswordLayout = new VerticalLayout(changePasswordTitle,
+                oldPasswordInput, newPasswordInput, passwordGenerator,
+                updatePasswordButton);
+        changePasswordLayout.setPadding(false);
+        changePasswordLayout.setSpacing(false);
+
+        Hr separator = new Hr();
+
+        //tfa section
+        H4 tfaTitle = new H4("Two-Factor Authentication (2FA)");
+
+        tfaBox = new Checkbox("Protect my account with additional one time codes");
+        tfaBox.setValue(userSettingsService.isTfaEnabled(user));
+        tfaBox.setEnabled(!confirmedAccounts.isEmpty());
+        tfaBox.addValueChangeListener(this::onTfaBoxChanged);
+
+        Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
+        TextField tfaField = new TextField();
+        tfaField.setReadOnly(true);
+
+        Label sendToLabel = new Label("Send to:");
+        Select<String> tfaChannelSelect = new Select<>();
+        Button saveTfaChannelButton = new Button("Save");
+
+        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
+        tfaSelectLayout.setAlignItems(Alignment.CENTER);
+        HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
+        tfaFieldLayout.setAlignItems(Alignment.CENTER);
+
+        VerticalLayout tfaContent = new VerticalLayout(tfaBox);
+        tfaContent.setPadding(false);
+
+        if (confirmedAccounts.isEmpty()) {
+            tfaContent.add(noConfirmedAccountsSpan);
+        } else if (confirmedAccounts.size() == 1) {
+            tfaField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
+            tfaContent.add(tfaFieldLayout);
+        } else {
+            tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
+            tfaContent.add(tfaSelectLayout);
+        }
+
+        VerticalLayout tfaLayout = new VerticalLayout(tfaTitle, tfaBox, tfaContent);
+        tfaLayout.setPadding(false);
+
+        add(changePasswordLayout, separator, tfaLayout);
+    }
+
+    private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
+        Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
+        if (userSettings.isPresent()) {
+            userSettings.get().setTfaEnabled(tfaBox.getValue());
+            userSettingsService.updateUserSettings(userSettings.get());
+            Notification.show("Saved");
+        } else {
+            tfaBox.setEnabled(false);
+            Notification.show("Failed to save. System error.");
+        }
+    }
+
+    private List<Account> getConfirmedAccountsFor(final User user) {
+        return accountService.getAllAccountsLinkedWithUser(user).stream().filter(Account::isConfirmed).toList();
+    }
+
+    private String getAccountTypeName(final Account account) {
+        return StringUtils.capitalize(account.getType().name());
+    }
+
+    private Span getNoConfirmedAccountsSpan() {
+        Span firstPart = new Span("In order to use 2FA, please ");
+        Anchor link = new Anchor(Endpoint.UI.CONFIRM_ACCOUNT_PAGE, "confirm account");
+        Span lastPart = new Span(" .");
+        return new Span(firstPart, link, lastPart);
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
new file mode 100644
index 000000000..e27bf70f4
--- /dev/null
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -0,0 +1,19 @@
+package pm.axe.ui.pages.user.profile.tabs;
+
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import pm.axe.db.models.User;
+import pm.axe.internal.HasTabInit;
+
+@RequiredArgsConstructor
+@SpringComponent
+@UIScope
+public class SettingsTab extends VerticalLayout implements HasTabInit {
+    @Override
+    public void tabInit(final User user) {
+        add(new Span("This is Settings Tab"));
+    }
+}

From 8e95c752aac3ee3b1f63cc6b43d632761bdb9c40 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 22 Jan 2023 08:41:53 +0200
Subject: [PATCH 26/69] ProfilePage: Tabs and Telegram Stuff. Fix (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../ui/pages/user/profile/tabs/ProfileTab.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index f9110dc8b..d5cdfc108 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -85,11 +85,14 @@ public void tabInit(final User user) {
 
         //telegram section
         FlexLayout telegramLayout = new FlexLayout();
+        telegramLayout.setAlignItems(Alignment.BASELINE);
+
         Optional<Account> telegramAccount = getTelegramAccount();
-        if (telegramAccount.isPresent()) {
+        Optional<String> telegramUsername = getTelegramUsername();
+        if (telegramAccount.isPresent() && telegramUsername.isPresent()) { //FIXME fix logic
             TextField telegramField = new TextField("Telegram");
             telegramField.setPrefixComponent(VaadinIcon.AT.create());
-            telegramField.setValue(telegramAccount.get().getAccountName());
+            telegramField.setValue(telegramUsername.get());
             Button unlink = new Button("Unlink");
             telegramLayout.add(telegramField, unlink);
         } else {
@@ -139,4 +142,13 @@ private Optional<Token> getTelegramToken() {
         }
         return Optional.ofNullable(tgToken);
     }
+
+    private Optional<String> getTelegramUsername() {
+        Optional<Account> telegramAccount = getTelegramAccount();
+        if (telegramAccount.isPresent()) {
+            return accountService.decryptAccountName(telegramAccount.get());
+        } else {
+            return Optional.empty();
+        }
+    }
 }

From f177a83c09c16bff32ab2c324e4f1f877e7e8835 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 22 Jan 2023 14:26:14 +0200
Subject: [PATCH 27/69] ProfilePage: Tabs and Telegram Stuff. Fix pack (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pages/user/profile/tabs/ProfileTab.java   | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index d5cdfc108..17115f12b 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -88,13 +88,20 @@ public void tabInit(final User user) {
         telegramLayout.setAlignItems(Alignment.BASELINE);
 
         Optional<Account> telegramAccount = getTelegramAccount();
-        Optional<String> telegramUsername = getTelegramUsername();
-        if (telegramAccount.isPresent() && telegramUsername.isPresent()) { //FIXME fix logic
-            TextField telegramField = new TextField("Telegram");
-            telegramField.setPrefixComponent(VaadinIcon.AT.create());
-            telegramField.setValue(telegramUsername.get());
-            Button unlink = new Button("Unlink");
-            telegramLayout.add(telegramField, unlink);
+
+        if (telegramAccount.isPresent()) {
+            Optional<String> telegramUsername =  accountService.decryptAccountName(telegramAccount.get());
+            if (telegramUsername.isPresent()) {
+                TextField telegramField = new TextField("Telegram");
+                telegramField.setReadOnly(true);
+                telegramField.setPrefixComponent(VaadinIcon.AT.create());
+                telegramField.setValue(telegramUsername.get());
+                Button unlink = new Button("Unlink");
+                telegramLayout.add(telegramField, unlink);
+            } else {
+                telegramLayout.setVisible(false);
+            }
+
         } else {
             Optional<Token> tgToken = getTelegramToken();
             if (tgToken.isPresent()) {
@@ -143,12 +150,4 @@ private Optional<Token> getTelegramToken() {
         return Optional.ofNullable(tgToken);
     }
 
-    private Optional<String> getTelegramUsername() {
-        Optional<Account> telegramAccount = getTelegramAccount();
-        if (telegramAccount.isPresent()) {
-            return accountService.decryptAccountName(telegramAccount.get());
-        } else {
-            return Optional.empty();
-        }
-    }
 }

From 972a12c2a4273444b6b7495529e7a1167a02d51c Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 22 Jan 2023 21:52:57 +0200
Subject: [PATCH 28/69] ProfilePage: 2FA state [WIP] (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pages/user/profile/tabs/ProfileTab.java   |  6 ++-
 .../pages/user/profile/tabs/SecurityTab.java  | 46 +++++++++++++++++--
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 17115f12b..56f0bf8ac 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -101,12 +101,14 @@ public void tabInit(final User user) {
             } else {
                 telegramLayout.setVisible(false);
             }
-
         } else {
             Optional<Token> tgToken = getTelegramToken();
             if (tgToken.isPresent()) {
+                Details telegramDetails = new Details("Link Telegram Account");
+                telegramDetails.setOpened(true);
                 TelegramSpan telegramSpan = TelegramSpan.create(tgToken.get());
-                telegramLayout.add(telegramSpan);
+                telegramDetails.setContent(telegramSpan);
+                telegramLayout.add(telegramDetails);
             } else {
                 telegramLayout.setVisible(false);
             }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index e77c55b72..78293bf66 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -22,6 +22,7 @@
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.ui.elements.PasswordGenerator;
+import pm.axe.users.AccountType;
 
 import java.util.List;
 import java.util.Optional;
@@ -33,6 +34,8 @@ public class SecurityTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
     private final UserSettingsService userSettingsService;
     private Checkbox tfaBox;
+    private TextField tfaField;
+    private Select<String> tfaChannelSelect;
 
     private User user;
 
@@ -66,17 +69,18 @@ public void tabInit(final User user) {
         tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
         Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
-        TextField tfaField = new TextField();
+
+        tfaField = new TextField();
         tfaField.setReadOnly(true);
 
         Label sendToLabel = new Label("Send to:");
-        Select<String> tfaChannelSelect = new Select<>();
+        tfaChannelSelect = new Select<>();
         Button saveTfaChannelButton = new Button("Save");
 
         HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
-        tfaSelectLayout.setAlignItems(Alignment.CENTER);
+        tfaSelectLayout.setAlignItems(Alignment.BASELINE);
         HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
-        tfaFieldLayout.setAlignItems(Alignment.CENTER);
+        tfaFieldLayout.setAlignItems(Alignment.BASELINE);
 
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
         tfaContent.setPadding(false);
@@ -89,6 +93,11 @@ public void tabInit(final User user) {
         } else {
             tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
             tfaContent.add(tfaSelectLayout);
+            //set default value
+            Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
+            userSettings.ifPresent(settings -> tfaChannelSelect.setValue(
+                    StringUtils.capitalize(userSettings.get().getTfaChannel().name())
+            ));
         }
 
         VerticalLayout tfaLayout = new VerticalLayout(tfaTitle, tfaBox, tfaContent);
@@ -98,9 +107,38 @@ public void tabInit(final User user) {
     }
 
     private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
+        AccountType tfaChannel;
+        boolean tfaBoxChecked = tfaBox.getValue();
+        if (tfaBoxChecked) {
+            //Selecting tfa channel
+            if (tfaField.isVisible() && !tfaField.isEmpty()) {
+                tfaChannel = AccountType.valueOf(tfaField.getValue());
+            } else if (tfaChannelSelect.isVisible()) {
+                if (tfaChannelSelect.isEmpty() || tfaChannelSelect.getValue().equals(AccountType.LOCAL.name())) {
+                    tfaBox.setValue(false);
+                    tfaChannelSelect.setInvalid(true);
+                    tfaChannelSelect.setErrorMessage("Please select 2FA destination");
+                    tfaChannelSelect.focus();
+                    return;
+                } else {
+                    tfaChannel = AccountType.valueOf(tfaChannelSelect.getValue());
+                }
+            } else {
+                //should never happen
+                tfaBox.setValue(false);
+                Notification.show("Failed to save. No valid and confirmed 2FA channels exist yet");
+                return;
+            }
+        } else {
+            //tfa disabled - reset channel
+            tfaChannel = AccountType.LOCAL;
+        }
+
+        //saving
         Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
         if (userSettings.isPresent()) {
             userSettings.get().setTfaEnabled(tfaBox.getValue());
+            userSettings.get().setTfaChannel(tfaChannel);
             userSettingsService.updateUserSettings(userSettings.get());
             Notification.show("Saved");
         } else {

From 025a1232cf8ed7b760c5b1e59020812559fa1c9f Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 23 Jan 2023 20:25:45 +0200
Subject: [PATCH 29/69] ProfilePage: 2FA state (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../ui/pages/user/profile/tabs/SecurityTab.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 78293bf66..4dc6a9e6e 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -75,6 +75,7 @@ public void tabInit(final User user) {
 
         Label sendToLabel = new Label("Send to:");
         tfaChannelSelect = new Select<>();
+        tfaChannelSelect.addValueChangeListener(this::onTfaSelectModified);
         Button saveTfaChannelButton = new Button("Save");
 
         HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
@@ -134,6 +135,21 @@ private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, B
             tfaChannel = AccountType.LOCAL;
         }
 
+        saveTfa(tfaChannel);
+    }
+
+    private void onTfaSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
+        AccountType selectedAccountType = AccountType.valueOf(tfaChannelSelect.getValue());
+        if (selectedAccountType != AccountType.LOCAL) {
+            tfaBox.setValue(true);
+            saveTfa(selectedAccountType);
+        } else {
+            //should not happen, but no TFA for LOCAL
+            tfaBox.setValue(false);
+        }
+    }
+
+    private void saveTfa(final AccountType tfaChannel) {
         //saving
         Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
         if (userSettings.isPresent()) {

From 0c400f79bf88dc87781fcba20ac1d566b7660c78 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 24 Jan 2023 21:06:24 +0200
Subject: [PATCH 30/69] ProfilePage: 2FA state - no save button (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 4dc6a9e6e..2f3ad6cd9 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -76,9 +76,8 @@ public void tabInit(final User user) {
         Label sendToLabel = new Label("Send to:");
         tfaChannelSelect = new Select<>();
         tfaChannelSelect.addValueChangeListener(this::onTfaSelectModified);
-        Button saveTfaChannelButton = new Button("Save");
 
-        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect, saveTfaChannelButton);
+        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect);
         tfaSelectLayout.setAlignItems(Alignment.BASELINE);
         HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
         tfaFieldLayout.setAlignItems(Alignment.BASELINE);

From cb1eec94739c58d89d40d59599ebaa9a0dc4d5ff Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 26 Jan 2023 21:48:54 +0200
Subject: [PATCH 31/69] Actions after login (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/LoginPage.java  | 21 ++++++++++++++++++-
 .../ui/pages/user/profile/ProfilePage.java    | 15 +++----------
 .../java/pm/axe/utils/AxeSessionUtils.java    | 13 ++++++++++++
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 911ddfe78..16b096a05 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -25,11 +25,14 @@
 import org.apache.commons.lang3.StringUtils;
 import pm.axe.Endpoint;
 import pm.axe.db.models.User;
+import pm.axe.db.models.UserSettings;
 import pm.axe.services.user.UserService;
 import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.users.LandingPage;
 import pm.axe.utils.AppUtils;
+import pm.axe.utils.AxeSessionUtils;
 
 import java.util.Optional;
 
@@ -43,6 +46,9 @@
 public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private final AppUtils appUtils;
     private final UserService userService;
+    private final AxeSessionUtils axeSessionUtils;
+    private final MainView mainView;
+
     private final Span subTitleText = new Span();
     private final Span spaceSpan = new Span();
     private final Anchor subTitleLink = new Anchor();
@@ -130,7 +136,20 @@ private void doEasyLogin() {
             AxeSession.getCurrent().ifPresent(axs -> {
                 Optional<User> user = userService.getUserByUsername(username);
                 user.ifPresent(axs::setUser);
-                usernameInput.getUI().ifPresent(ui -> ui.navigate(Endpoint.UI.PROFILE_PAGE));
+                Optional<UserSettings> us = axeSessionUtils.getCurrentUserSettings();
+                //dark mode
+                if (us.isPresent() && us.get().isDarkMode()) {
+                    axs.getSettings().setDarkMode(true);
+                    mainView.applyTheme(true);
+                }
+                //landing page
+                LandingPage landingPage; //page after login
+                if (us.isPresent()) {
+                    landingPage = us.get().getLandingPage();
+                } else {
+                    landingPage = LandingPage.HOME_PAGE;
+                }
+                usernameInput.getUI().ifPresent(ui -> ui.navigate(landingPage.getPath()));
             });
         } else {
             usernameInput.setInvalid(true);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
index 51f224038..b05780d50 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
@@ -20,7 +20,6 @@
 import pm.axe.Endpoint;
 import pm.axe.db.models.User;
 import pm.axe.internal.HasTabInit;
-import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeCompactLayout;
 import pm.axe.ui.pages.user.LoginPage;
@@ -28,11 +27,11 @@
 import pm.axe.ui.pages.user.profile.tabs.ProfileTab;
 import pm.axe.ui.pages.user.profile.tabs.SecurityTab;
 import pm.axe.ui.pages.user.profile.tabs.SettingsTab;
+import pm.axe.utils.AxeSessionUtils;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 @SpringComponent
 @UIScope
@@ -41,6 +40,7 @@
 @Route(value = Endpoint.UI.PROFILE_PAGE, layout = MainView.class)
 @PageTitle("My Profile - Axe.pm")
 public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver {
+    private final AxeSessionUtils axeSessionUtils;
     private final Tab profileTab = new Tab(VaadinIcon.USER.create(), new Span("Profile"));
     private final Tab securityTab = new Tab(VaadinIcon.SHIELD.create(), new Span("Security"));
     private final Tab settingsTab = new Tab(VaadinIcon.COG.create(), new Span("Settings"));
@@ -58,7 +58,7 @@ public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver
     @Override
     public void beforeEnter(BeforeEnterEvent event) {
         if (event.isRefreshEvent()) return;
-        boundUserIfAny();
+        user = axeSessionUtils.boundUserIfAny();
         if (Objects.isNull(user)) {
             event.forwardTo(LoginPage.class);
             return;
@@ -101,15 +101,6 @@ private void initPage() {
         add(title, tabs, content);
     }
 
-    private void boundUserIfAny() {
-        Optional<AxeSession> axeSession = AxeSession.getCurrent();
-        if (axeSession.isPresent()) {
-            if (axeSession.get().hasUser()) {
-                user = axeSession.get().getUser();
-            }
-        }
-    }
-
     private void setContent(final Tab tab) {
         content.removeAll();
         if (tab == null) {
diff --git a/src/main/java/pm/axe/utils/AxeSessionUtils.java b/src/main/java/pm/axe/utils/AxeSessionUtils.java
index 13526d44c..e715b6070 100644
--- a/src/main/java/pm/axe/utils/AxeSessionUtils.java
+++ b/src/main/java/pm/axe/utils/AxeSessionUtils.java
@@ -33,4 +33,17 @@ public Optional<UserSettings> getCurrentUserSettings() {
             return Optional.empty();
         }
     }
+
+    public User boundUserIfAny() {
+        Optional<AxeSession> axeSession = AxeSession.getCurrent();
+        if (axeSession.isPresent()) {
+            if (axeSession.get().hasUser()) {
+                return axeSession.get().getUser();
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
 }

From 3d8f78ce494855521c3366c48600db54b2755c96 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 26 Jan 2023 23:43:31 +0200
Subject: [PATCH 32/69] ProfilePage: SettingsTab created, SecurityTab updated
 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/settings/SettingsPage.java   |  2 +-
 .../pages/user/profile/tabs/SecurityTab.java  | 88 +++++++++++++++---
 .../pages/user/profile/tabs/SettingsTab.java  | 91 ++++++++++++++++++-
 src/main/java/pm/axe/users/LandingPage.java   |  3 +-
 4 files changed, 169 insertions(+), 15 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java b/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
index b335baa9b..1dd08c2f5 100644
--- a/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
+++ b/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
@@ -148,7 +148,7 @@ private void onAnalyticCookiesChanged(final AbstractField.ComponentValueChangeEv
         notifyClient();
     }
 
-    private void onDarkModeChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> event) {
+    public void onDarkModeChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> event) {
         final boolean isDarkTheme = event.getValue();
         mainView.applyTheme(isDarkTheme);
         AxeSession.getCurrent().ifPresent(session -> session.getSettings().setDarkMode(event.getValue()));
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 2f3ad6cd9..59bf320f6 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -23,16 +23,22 @@
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.users.AccountType;
+import pm.axe.utils.AxeSessionUtils;
 
 import java.util.List;
 import java.util.Optional;
 
+@SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
 public class SecurityTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
     private final UserSettingsService userSettingsService;
+    private final AxeSessionUtils axeSessionUtils;
+
+    private Select<String> resetPasswordSelect;
+
     private Checkbox tfaBox;
     private TextField tfaField;
     private Select<String> tfaChannelSelect;
@@ -60,6 +66,43 @@ public void tabInit(final User user) {
 
         Hr separator = new Hr();
 
+        //reset password channel session
+        H4 resetPasswordTitle = new H4("Reset password link");
+        Span noWhereToSendSpan = getNoWhereToSendSpan();
+        TextField resetPasswordField = new TextField();
+        resetPasswordField.setReadOnly(true);
+
+        Label sendResetLinkToLabel = new Label("Send reset password link to:");
+        resetPasswordSelect = new Select<>();
+        resetPasswordSelect.addValueChangeListener(this::onResetPasswordSelectModified);
+
+        HorizontalLayout resetPasswordFieldLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordField);
+        resetPasswordFieldLayout.setAlignItems(Alignment.BASELINE);
+        HorizontalLayout resetPasswordSelectLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordSelect);
+        resetPasswordSelectLayout.setAlignItems(Alignment.BASELINE);
+
+        VerticalLayout resetPasswordContent = new VerticalLayout();
+        resetPasswordContent.setPadding(false);
+
+        if (confirmedAccounts.isEmpty()) {
+            resetPasswordContent.add(noWhereToSendSpan);
+        } else if (confirmedAccounts.size() == 1) {
+            resetPasswordField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
+            resetPasswordContent.add(resetPasswordFieldLayout);
+        } else {
+            resetPasswordSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
+            resetPasswordContent.add(resetPasswordSelectLayout);
+            Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+            userSettings.ifPresent(us -> resetPasswordSelect.setValue(
+                    StringUtils.capitalize(userSettings.get().getPasswordResetChannel().name())
+            ));
+        }
+
+        VerticalLayout resetPasswordLayout = new VerticalLayout(resetPasswordTitle, resetPasswordContent);
+        resetPasswordLayout.setPadding(false);
+
+        Hr separator2 = new Hr();
+
         //tfa section
         H4 tfaTitle = new H4("Two-Factor Authentication (2FA)");
 
@@ -69,19 +112,17 @@ public void tabInit(final User user) {
         tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
         Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
+        String sendTo = "Send to"; //TODO kinda static string
 
         tfaField = new TextField();
+        tfaField.setLabel(sendTo);
         tfaField.setReadOnly(true);
 
-        Label sendToLabel = new Label("Send to:");
+
         tfaChannelSelect = new Select<>();
+        tfaChannelSelect.setLabel(sendTo);
         tfaChannelSelect.addValueChangeListener(this::onTfaSelectModified);
 
-        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sendToLabel, tfaChannelSelect);
-        tfaSelectLayout.setAlignItems(Alignment.BASELINE);
-        HorizontalLayout tfaFieldLayout = new HorizontalLayout(sendToLabel, tfaField);
-        tfaFieldLayout.setAlignItems(Alignment.BASELINE);
-
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
         tfaContent.setPadding(false);
 
@@ -89,10 +130,10 @@ public void tabInit(final User user) {
             tfaContent.add(noConfirmedAccountsSpan);
         } else if (confirmedAccounts.size() == 1) {
             tfaField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
-            tfaContent.add(tfaFieldLayout);
+            tfaContent.add(tfaField);
         } else {
             tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
-            tfaContent.add(tfaSelectLayout);
+            tfaContent.add(tfaChannelSelect);
             //set default value
             Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
             userSettings.ifPresent(settings -> tfaChannelSelect.setValue(
@@ -103,10 +144,28 @@ public void tabInit(final User user) {
         VerticalLayout tfaLayout = new VerticalLayout(tfaTitle, tfaBox, tfaContent);
         tfaLayout.setPadding(false);
 
-        add(changePasswordLayout, separator, tfaLayout);
+        add(changePasswordLayout, separator, resetPasswordLayout, separator2, tfaLayout);
     }
 
-    private void onTfaBoxChanged(AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
+    private void onResetPasswordSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
+        AccountType selectedAccountType = AccountType.valueOf(resetPasswordSelect.getValue());
+        if (selectedAccountType != AccountType.LOCAL) {
+            saveResetPasswordChannel(selectedAccountType);
+        }
+    }
+
+    private void saveResetPasswordChannel(final AccountType accountType) {
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        if (userSettings.isPresent()) {
+            userSettings.get().setPasswordResetChannel(accountType);
+            userSettingsService.updateUserSettings(userSettings.get());
+            Notification.show("Saved");
+        } else {
+            Notification.show("Failed to save. System error.");
+        }
+    }
+
+    private void onTfaBoxChanged(final AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> valueChangeEvent) {
         AccountType tfaChannel;
         boolean tfaBoxChecked = tfaBox.getValue();
         if (tfaBoxChecked) {
@@ -173,7 +232,14 @@ private String getAccountTypeName(final Account account) {
     private Span getNoConfirmedAccountsSpan() {
         Span firstPart = new Span("In order to use 2FA, please ");
         Anchor link = new Anchor(Endpoint.UI.CONFIRM_ACCOUNT_PAGE, "confirm account");
-        Span lastPart = new Span(" .");
+        Span lastPart = new Span(".");
         return new Span(firstPart, link, lastPart);
     }
+
+    private Span getNoWhereToSendSpan() {
+        Span first = new Span("Nowhere to sent reset password link. Please ");
+        Anchor link = new Anchor(Endpoint.UI.CONFIRM_ACCOUNT_PAGE, "confirm account");
+        Span last = new Span(".");
+        return new Span(first, link, last);
+    }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index e27bf70f4..ca266112f 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -1,19 +1,106 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
-import com.vaadin.flow.component.html.Span;
+import com.vaadin.componentfactory.ToggleButton;
+import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.FlexLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.select.Select;
+import com.vaadin.flow.component.textfield.IntegerField;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
 import pm.axe.db.models.User;
+import pm.axe.db.models.UserSettings;
 import pm.axe.internal.HasTabInit;
+import pm.axe.services.user.UserSettingsService;
+import pm.axe.ui.pages.settings.SettingsPage;
+import pm.axe.users.LandingPage;
+import pm.axe.utils.AxeSessionUtils;
+
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
 public class SettingsTab extends VerticalLayout implements HasTabInit {
+    private final AxeSessionUtils axeSessionUtils;
+    private final UserSettingsService uss;
+    private final SettingsPage settingsPage;
+
+    private final Select<String> landingPageSelect = new Select<>();
+    private final ToggleButton darkModeToggle = new ToggleButton();
     @Override
     public void tabInit(final User user) {
-        add(new Span("This is Settings Tab"));
+        removeAll();
+        add(landingPageLayout(), darkModeLayout(), loginSessionDuration());
+    }
+
+    private Component landingPageLayout() {
+        landingPageSelect.setLabel("Landing Page");
+        landingPageSelect.setItems(Arrays.stream(LandingPage.values()).map(LandingPage::name).toList());
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        userSettings.ifPresent(settings -> landingPageSelect.setValue(settings.getLandingPage().name()));
+        landingPageSelect.addValueChangeListener(this::onLandingPageSelectChanged);
+        //TODO add tooltip with manual trigger
+        FlexLayout layout = new FlexLayout(landingPageSelect);
+        layout.setAlignItems(Alignment.BASELINE);
+        return layout;
+    }
+
+    private Component darkModeLayout() {
+        darkModeToggle.setLabel("Dark Mode: ");
+        darkModeToggle.addValueChangeListener(this::onDarkModeToggleChanged);
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        userSettings.ifPresent(us -> darkModeToggle.setValue(us.isDarkMode()));
+
+        FlexLayout layout = new FlexLayout(darkModeToggle);
+        layout.setAlignItems(Alignment.BASELINE);
+        return layout;
+    }
+
+    private Component loginSessionDuration() {
+        //TODO may be a single component
+        IntegerField amountField = new IntegerField();
+        amountField.setLabel("Login Session Duration");
+        amountField.setStepButtonsVisible(true);
+        amountField.setMin(1);
+        amountField.setMax(60);
+        amountField.setValue(1); //TODO replace with real value from settings
+        Select<String> unitSelect = new Select<>();
+        unitSelect.setItems(ChronoUnit.SECONDS.name(), ChronoUnit.MINUTES.name(),
+                ChronoUnit.HOURS.name(), ChronoUnit.DAYS.name()); //TODO continue list
+        unitSelect.setValue(ChronoUnit.DAYS.name());
+        //TODO on unit change change amount field number max/min values
+        Button save = new Button("Save");
+        save.addClickListener(this::onSessionDurationSaved);
+
+        FlexLayout layout = new FlexLayout(amountField, unitSelect, save);
+        layout.setAlignItems(Alignment.BASELINE);
+        return layout;
+    }
+
+    private void onLandingPageSelectChanged(AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
+        LandingPage landingPage = LandingPage.valueOf(landingPageSelect.getValue());
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        if (userSettings.isPresent()) {
+            userSettings.get().setLandingPage(landingPage);
+            uss.updateUserSettings(userSettings.get());
+            Notification.show("Saved");
+        }
+    }
+
+    private void onDarkModeToggleChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> event) {
+        settingsPage.onDarkModeChanged(event); // do same action as in Settings Page
+    }
+
+    private void onSessionDurationSaved(ClickEvent<Button> event) {
+        //TODO implement
+        Notification.show("Not implemented yet");
     }
 }
diff --git a/src/main/java/pm/axe/users/LandingPage.java b/src/main/java/pm/axe/users/LandingPage.java
index b2484f695..5444b1e6d 100644
--- a/src/main/java/pm/axe/users/LandingPage.java
+++ b/src/main/java/pm/axe/users/LandingPage.java
@@ -8,7 +8,8 @@
  */
 public enum LandingPage {
     HOME_PAGE(Endpoint.UI.HOME_PAGE),
-    MY_LINKS_PAGE(Endpoint.UI.MY_LINKS_PAGE);
+    MY_LINKS_PAGE(Endpoint.UI.MY_LINKS_PAGE),
+    PROFILE_PAGE(Endpoint.UI.PROFILE_PAGE);
 
     @Getter
     private final String path;

From 5db43201c7c66f49cd265db5d13bf791598179c3 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sat, 28 Jan 2023 23:01:16 +0200
Subject: [PATCH 33/69] ProfilePage: Sections (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pages/user/profile/tabs/ProfileTab.java   | 147 +++++++++++-------
 .../pages/user/profile/tabs/SecurityTab.java  |  82 ++++++----
 2 files changed, 151 insertions(+), 78 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 56f0bf8ac..b93d112e4 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -1,5 +1,6 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
+import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Span;
@@ -20,6 +21,7 @@
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.TokenService;
+import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
 import pm.axe.users.AccountType;
 
@@ -33,64 +35,81 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final TokenService tokenService;
     private User user;
 
+    @SuppressWarnings("FieldCanBeLocal") //will be re-drawn if event received
+    private Section accountsSection;
+
+    private final TextField usernameField = new TextField();
+    private final Button editUsernameButton = new Button();
+    private final Button saveUsernameButton = new Button();
+    private final FlexLayout usernameLayout = new FlexLayout();
+
+    private final EmailField emailField = new EmailField();
+    private final Button editEmailButton = new Button();
+    private final Button saveEmailButton = new Button();
+    private final FlexLayout emailLayout = new FlexLayout();
+
     @Override
     public void tabInit(final User user) {
         this.user = user;
 
-        //username
-        TextField username = new TextField("Username");
-        username.setValue(user.getUsername());
-        username.setReadOnly(true);
-        Button editUsernameButton = new Button("Edit");
-        Button saveUsernameButton = new Button("Save");
-        FlexLayout usernameLayout = new FlexLayout(username, editUsernameButton);
+        accountsSection = createAccountSection();
+        add(accountsSection);
+    }
+
+    private Section createAccountSection() {
+        FlexLayout usernameLayout = createUsernameLayout();
+        FlexLayout emailLayout = createEmailLayout();
+        Details emailUsageDetails = createEmailUsageDetails();
+        FlexLayout telegramLayout = createTelegramLayout();
+
+        Section section = new Section("Accounts");
+        section.setContent(usernameLayout, emailLayout, emailUsageDetails, telegramLayout);
+        return section;
+    }
+
+    private FlexLayout createUsernameLayout() {
+        usernameField.setLabel("Username");
+        usernameField.setValue(user.getUsername());
+        usernameField.setReadOnly(true);
+
+        editUsernameButton.setText("Edit");
+        saveUsernameButton.setText("Save");
+
+        usernameLayout.add(usernameField, editUsernameButton);
         usernameLayout.setAlignItems(FlexComponent.Alignment.BASELINE);
         usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
-        //TODO replace with methods and fix button replace login - see MyLinksPage
-        editUsernameButton.addClickListener(e -> {
-            username.setReadOnly(false);
-            usernameLayout.replace(editUsernameButton, saveUsernameButton);
-        });
-        saveUsernameButton.addClickListener(e -> {
-            username.setReadOnly(true);
-            usernameLayout.replace(saveUsernameButton, editUsernameButton);
-        });
-
-        //email
-        EmailField emailField = new EmailField("E-mail");
-        emailField.setValue(getCurrentEmail());
+
+        editUsernameButton.addClickListener(this::onEditUsername);
+        saveUsernameButton.addClickListener(this::onSaveUsername);
+        return usernameLayout;
+    }
+
+    private FlexLayout createEmailLayout() {
+        emailField.setLabel("E-mail");
+        Optional<String> currentEmail = getCurrentEmail();
+        currentEmail.ifPresent(e -> emailField.setValue(currentEmail.get()));
         emailField.setReadOnly(true);
 
-        Button editEmailButton = new Button("Edit");
-        Button saveEmailButton = new Button("Save");
-        FlexLayout emailLayout = new FlexLayout(emailField, editEmailButton);
+        editEmailButton.setText("Edit");
+        saveEmailButton.setText("Save");
+
+        emailLayout.add(emailField, editEmailButton);
         emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
         emailLayout.setAlignItems(Alignment.BASELINE);
 
-        //TODO replace with methods and fix button replace login - see MyLinksPage
-        editEmailButton.addClickListener(e -> {
-            emailField.setReadOnly(false);
-            emailLayout.replace(editEmailButton, saveEmailButton);
-        });
-        saveEmailButton.addClickListener(e -> {
-            emailField.setReadOnly(true);
-            emailLayout.replace(saveEmailButton, editEmailButton);
-        });
-
-        //how Axe use email details
-        Details howEmailUsedDetails = new Details("What will be sent to email?");
-        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
-        howEmailUsedDetails.setOpened(false);
-        howEmailUsedDetails.setContent(span);
+        editEmailButton.addClickListener(this::onEditEmail);
+        saveEmailButton.addClickListener(this::onSaveEmail);
+        return emailLayout;
+    }
 
-        //telegram section
+    private FlexLayout createTelegramLayout() {
         FlexLayout telegramLayout = new FlexLayout();
         telegramLayout.setAlignItems(Alignment.BASELINE);
 
         Optional<Account> telegramAccount = getTelegramAccount();
 
         if (telegramAccount.isPresent()) {
-            Optional<String> telegramUsername =  accountService.decryptAccountName(telegramAccount.get());
+            Optional<String> telegramUsername = accountService.decryptAccountName(telegramAccount.get());
             if (telegramUsername.isPresent()) {
                 TextField telegramField = new TextField("Telegram");
                 telegramField.setReadOnly(true);
@@ -113,22 +132,47 @@ public void tabInit(final User user) {
                 telegramLayout.setVisible(false);
             }
         }
+        return telegramLayout;
+    }
+
+    private Details createEmailUsageDetails() {
+        Details howEmailUsedDetails = new Details("What will be sent to email?");
+        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
+        howEmailUsedDetails.setOpened(false);
+        howEmailUsedDetails.setContent(span);
+        return howEmailUsedDetails;
+    }
+
+    private void onEditUsername(final ClickEvent<Button> event) {
+        usernameField.setReadOnly(false);
+        usernameLayout.replace(editUsernameButton, saveUsernameButton);
+    }
 
-        add(usernameLayout, emailLayout, howEmailUsedDetails, telegramLayout);
+    private void onSaveUsername(final ClickEvent<Button> event) {
+        usernameField.setReadOnly(true);
+        usernameLayout.replace(saveUsernameButton, editUsernameButton);
     }
 
-    //TODO maybe Optional<String> instead
-    private String getCurrentEmail() {
+    private void onEditEmail(ClickEvent<Button> event) {
+        emailField.setReadOnly(false);
+        emailLayout.replace(editEmailButton, saveEmailButton);
+    }
+
+    private void onSaveEmail(ClickEvent<Button> event) {
+        emailField.setReadOnly(true);
+        emailLayout.replace(saveEmailButton, editEmailButton);
+    }
+
+
+    private Optional<String> getCurrentEmail() {
         Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
-        if (emailAccount.isPresent()) {
-            Optional<String> plainTextEmail = accountService.decryptAccountName(emailAccount.get());
-            if (plainTextEmail.isPresent() && StringUtils.isNotBlank(plainTextEmail.get())) {
-                return plainTextEmail.get();
-            } else {
-                return "";
-            }
+        if (emailAccount.isEmpty()) return Optional.empty();
+        Optional<String> plainTextEmail = accountService.decryptAccountName(emailAccount.get());
+        if (plainTextEmail.isEmpty()) return Optional.empty();
+        if (StringUtils.isNotBlank(plainTextEmail.get())) {
+            return plainTextEmail;
         } else {
-            return "";
+            return Optional.empty();
         }
     }
 
@@ -151,5 +195,4 @@ private Optional<Token> getTelegramToken() {
         }
         return Optional.ofNullable(tgToken);
     }
-
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 59bf320f6..e28dedcce 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -3,7 +3,9 @@
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.checkbox.Checkbox;
-import com.vaadin.flow.component.html.*;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -22,6 +24,7 @@
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.ui.elements.PasswordGenerator;
+import pm.axe.ui.elements.Section;
 import pm.axe.users.AccountType;
 import pm.axe.utils.AxeSessionUtils;
 
@@ -37,37 +40,61 @@ public class SecurityTab extends VerticalLayout implements HasTabInit {
     private final UserSettingsService userSettingsService;
     private final AxeSessionUtils axeSessionUtils;
 
+    private List<Account> confirmedAccounts;
+
+    private Section changePasswordSection;
+    private Section resetPasswordChannelSection;
+    private Section tfaSection;
+
     private Select<String> resetPasswordSelect;
 
     private Checkbox tfaBox;
     private TextField tfaField;
     private Select<String> tfaChannelSelect;
-
     private User user;
 
     @Override
     public void tabInit(final User user) {
         this.user = user;
-        List<Account> confirmedAccounts = getConfirmedAccountsFor(user);
 
-        //change password section
-        H4 changePasswordTitle = new H4("Change Password");
+        confirmedAccounts = getConfirmedAccountsFor(user);
+
+        changePasswordSection = createChangePasswordSection();
+        resetPasswordChannelSection = createResetPasswordChannelSection();
+        tfaSection = createTfaSection();
+
+        add(changePasswordSection, resetPasswordChannelSection, tfaSection);
+    }
+
+    private Section createChangePasswordSection() {
+        VerticalLayout changePasswordContent = createChangePasswordContent();
+        changePasswordSection = new Section("Change Password");
+        changePasswordSection.setContent(changePasswordContent);
+        return changePasswordSection;
+    }
+
+    private VerticalLayout createChangePasswordContent() {
         PasswordField oldPasswordInput = new PasswordField("Old Password");
         PasswordField newPasswordInput = new PasswordField("New Password");
         PasswordGenerator passwordGenerator = PasswordGenerator.create();
         passwordGenerator.setOpened(false);
         passwordGenerator.setCopyTarget(newPasswordInput);
         Button updatePasswordButton = new Button("Update");
-        VerticalLayout changePasswordLayout = new VerticalLayout(changePasswordTitle,
-                oldPasswordInput, newPasswordInput, passwordGenerator,
-                updatePasswordButton);
+        VerticalLayout changePasswordLayout = new VerticalLayout(oldPasswordInput, newPasswordInput,
+                passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);
         changePasswordLayout.setSpacing(false);
+        return changePasswordLayout;
+    }
 
-        Hr separator = new Hr();
+    private Section createResetPasswordChannelSection() {
+        VerticalLayout content = createResetPasswordChannelContent();
+        resetPasswordChannelSection = new Section("Reset password link");
+        resetPasswordChannelSection.setContent(content);
+        return resetPasswordChannelSection;
+    }
 
-        //reset password channel session
-        H4 resetPasswordTitle = new H4("Reset password link");
+    private VerticalLayout createResetPasswordChannelContent() {
         Span noWhereToSendSpan = getNoWhereToSendSpan();
         TextField resetPasswordField = new TextField();
         resetPasswordField.setReadOnly(true);
@@ -98,31 +125,37 @@ public void tabInit(final User user) {
             ));
         }
 
-        VerticalLayout resetPasswordLayout = new VerticalLayout(resetPasswordTitle, resetPasswordContent);
-        resetPasswordLayout.setPadding(false);
-
-        Hr separator2 = new Hr();
+        return resetPasswordContent;
+    }
 
-        //tfa section
-        H4 tfaTitle = new H4("Two-Factor Authentication (2FA)");
+    private Section createTfaSection() {
+        VerticalLayout content = createTfaContent();
+        tfaSection = new Section("Two-Factor Authentication (2FA)");
+        tfaSection.setContent(content);
+        return tfaSection;
+    }
 
+    private VerticalLayout createTfaContent() {
         tfaBox = new Checkbox("Protect my account with additional one time codes");
         tfaBox.setValue(userSettingsService.isTfaEnabled(user));
         tfaBox.setEnabled(!confirmedAccounts.isEmpty());
         tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
         Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
-        String sendTo = "Send to"; //TODO kinda static string
+        Label sentToLabel = new Label("Send to: ");
 
         tfaField = new TextField();
-        tfaField.setLabel(sendTo);
         tfaField.setReadOnly(true);
 
+        HorizontalLayout tfaFieldLayout = new HorizontalLayout(sentToLabel, tfaField);
+        tfaFieldLayout.setAlignItems(Alignment.BASELINE);
 
         tfaChannelSelect = new Select<>();
-        tfaChannelSelect.setLabel(sendTo);
         tfaChannelSelect.addValueChangeListener(this::onTfaSelectModified);
 
+        HorizontalLayout tfaSelectLayout = new HorizontalLayout(sentToLabel, tfaChannelSelect);
+        tfaSelectLayout.setAlignItems(Alignment.BASELINE);
+
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
         tfaContent.setPadding(false);
 
@@ -130,10 +163,10 @@ public void tabInit(final User user) {
             tfaContent.add(noConfirmedAccountsSpan);
         } else if (confirmedAccounts.size() == 1) {
             tfaField.setValue(getAccountTypeName(confirmedAccounts.get(0)));
-            tfaContent.add(tfaField);
+            tfaContent.add(tfaFieldLayout);
         } else {
             tfaChannelSelect.setItems(confirmedAccounts.stream().map(this::getAccountTypeName).toList());
-            tfaContent.add(tfaChannelSelect);
+            tfaContent.add(tfaSelectLayout);
             //set default value
             Optional<UserSettings> userSettings = userSettingsService.getUserSettings(user);
             userSettings.ifPresent(settings -> tfaChannelSelect.setValue(
@@ -141,10 +174,7 @@ public void tabInit(final User user) {
             ));
         }
 
-        VerticalLayout tfaLayout = new VerticalLayout(tfaTitle, tfaBox, tfaContent);
-        tfaLayout.setPadding(false);
-
-        add(changePasswordLayout, separator, resetPasswordLayout, separator2, tfaLayout);
+        return tfaContent;
     }
 
     private void onResetPasswordSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {

From 25b3c96afee0690c4d47ea524059b31162e0efae Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sat, 28 Jan 2023 23:44:12 +0200
Subject: [PATCH 34/69] ProfilePage: Sections for SettingsTab as well (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/profile_page.css                 |  5 ++
 .../pages/user/profile/tabs/SecurityTab.java  |  6 +-
 .../pages/user/profile/tabs/SettingsTab.java  | 87 ++++++++++++++-----
 3 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index e4deb0c49..9d01aae44 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -1,3 +1,8 @@
 .profile-title {
     align-self: center;
+}
+
+.toggle-with-prefix-postfix {
+    margin-right: 0.3rem;
+    margin-left: 0.3rem;
 }
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index e28dedcce..55afd1903 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -104,9 +104,9 @@ private VerticalLayout createResetPasswordChannelContent() {
         resetPasswordSelect.addValueChangeListener(this::onResetPasswordSelectModified);
 
         HorizontalLayout resetPasswordFieldLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordField);
-        resetPasswordFieldLayout.setAlignItems(Alignment.BASELINE);
+        resetPasswordFieldLayout.setAlignItems(Alignment.CENTER);
         HorizontalLayout resetPasswordSelectLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordSelect);
-        resetPasswordSelectLayout.setAlignItems(Alignment.BASELINE);
+        resetPasswordSelectLayout.setAlignItems(Alignment.CENTER);
 
         VerticalLayout resetPasswordContent = new VerticalLayout();
         resetPasswordContent.setPadding(false);
@@ -142,7 +142,7 @@ private VerticalLayout createTfaContent() {
         tfaBox.addValueChangeListener(this::onTfaBoxChanged);
 
         Span noConfirmedAccountsSpan = getNoConfirmedAccountsSpan();
-        Label sentToLabel = new Label("Send to: ");
+        Label sentToLabel = new Label("Send to:");
 
         tfaField = new TextField();
         tfaField.setReadOnly(true);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index ca266112f..83cdbb9c3 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -5,8 +5,10 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.select.Select;
 import com.vaadin.flow.component.textfield.IntegerField;
@@ -17,6 +19,7 @@
 import pm.axe.db.models.UserSettings;
 import pm.axe.internal.HasTabInit;
 import pm.axe.services.user.UserSettingsService;
+import pm.axe.ui.elements.Section;
 import pm.axe.ui.pages.settings.SettingsPage;
 import pm.axe.users.LandingPage;
 import pm.axe.utils.AxeSessionUtils;
@@ -33,41 +36,32 @@ public class SettingsTab extends VerticalLayout implements HasTabInit {
     private final UserSettingsService uss;
     private final SettingsPage settingsPage;
 
+    private Section loginSessionSection;
+    private Section landingPageSection;
+    private Section darkModeSection;
+
     private final Select<String> landingPageSelect = new Select<>();
     private final ToggleButton darkModeToggle = new ToggleButton();
     @Override
     public void tabInit(final User user) {
         removeAll();
-        add(landingPageLayout(), darkModeLayout(), loginSessionDuration());
-    }
+        loginSessionSection = createLoginSessionSection();
+        landingPageSection = createLandingPageSection();
+        darkModeSection = createDarkModeSection();
 
-    private Component landingPageLayout() {
-        landingPageSelect.setLabel("Landing Page");
-        landingPageSelect.setItems(Arrays.stream(LandingPage.values()).map(LandingPage::name).toList());
-        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
-        userSettings.ifPresent(settings -> landingPageSelect.setValue(settings.getLandingPage().name()));
-        landingPageSelect.addValueChangeListener(this::onLandingPageSelectChanged);
-        //TODO add tooltip with manual trigger
-        FlexLayout layout = new FlexLayout(landingPageSelect);
-        layout.setAlignItems(Alignment.BASELINE);
-        return layout;
+        add(loginSessionSection, landingPageSection, darkModeSection);
     }
 
-    private Component darkModeLayout() {
-        darkModeToggle.setLabel("Dark Mode: ");
-        darkModeToggle.addValueChangeListener(this::onDarkModeToggleChanged);
-        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
-        userSettings.ifPresent(us -> darkModeToggle.setValue(us.isDarkMode()));
-
-        FlexLayout layout = new FlexLayout(darkModeToggle);
-        layout.setAlignItems(Alignment.BASELINE);
-        return layout;
+    private Section createLoginSessionSection() {
+        loginSessionSection = new Section("Login Session Duration");
+        Component content = loginSessionDuration();
+        loginSessionSection.setContent(content);
+        return loginSessionSection;
     }
 
     private Component loginSessionDuration() {
         //TODO may be a single component
         IntegerField amountField = new IntegerField();
-        amountField.setLabel("Login Session Duration");
         amountField.setStepButtonsVisible(true);
         amountField.setMin(1);
         amountField.setMax(60);
@@ -80,7 +74,54 @@ private Component loginSessionDuration() {
         Button save = new Button("Save");
         save.addClickListener(this::onSessionDurationSaved);
 
-        FlexLayout layout = new FlexLayout(amountField, unitSelect, save);
+        HorizontalLayout fields = new HorizontalLayout(amountField, unitSelect, save);
+        fields.setAlignItems(Alignment.BASELINE);
+
+        Span explanationSpan = new Span("Time you will stay logged in after successful login");
+
+        VerticalLayout content = new VerticalLayout(fields, explanationSpan);
+        content.setPadding(false);
+        return content;
+    }
+
+    private Section createLandingPageSection() {
+        landingPageSection = new Section("Landing page");
+        Component content = landingPageLayout();
+        landingPageSection.setContent(content);
+        return landingPageSection;
+    }
+
+    private Component landingPageLayout() {
+        landingPageSelect.setLabel("Landing Page");
+        landingPageSelect.setItems(Arrays.stream(LandingPage.values()).map(LandingPage::name).toList());
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        userSettings.ifPresent(settings -> landingPageSelect.setValue(settings.getLandingPage().name()));
+        landingPageSelect.addValueChangeListener(this::onLandingPageSelectChanged);
+
+        Span explanationSpan = new Span("Page that opens after login");
+        VerticalLayout content = new VerticalLayout(landingPageSelect, explanationSpan);
+        content.setPadding(false);
+        return content;
+    }
+
+    private Section createDarkModeSection() {
+        darkModeSection = new Section("Dark Mode");
+        Component content = darkModeLayout();
+        darkModeSection.setContent(content);
+        return darkModeSection;
+    }
+
+    private Component darkModeLayout() {
+        Span offSpan = new Span("Off");
+
+        darkModeToggle.addValueChangeListener(this::onDarkModeToggleChanged);
+        Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
+        userSettings.ifPresent(us -> darkModeToggle.setValue(us.isDarkMode()));
+        darkModeToggle.addClassName("toggle-with-prefix-postfix");
+
+        Span onSpan = new Span("On");
+
+        FlexLayout layout = new FlexLayout(offSpan, darkModeToggle, onSpan);
         layout.setAlignItems(Alignment.BASELINE);
         return layout;
     }

From 83409c22ef7e084697a6ce276a95afe740f2fdd3 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Sun, 29 Jan 2023 16:06:14 +0200
Subject: [PATCH 35/69] ProfilePage: FlexLayout (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index 83cdbb9c3..1564b8516 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -4,11 +4,11 @@
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.Unit;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.select.Select;
 import com.vaadin.flow.component.textfield.IntegerField;
@@ -74,8 +74,9 @@ private Component loginSessionDuration() {
         Button save = new Button("Save");
         save.addClickListener(this::onSessionDurationSaved);
 
-        HorizontalLayout fields = new HorizontalLayout(amountField, unitSelect, save);
+        FlexLayout fields = new FlexLayout(amountField, unitSelect, save);
         fields.setAlignItems(Alignment.BASELINE);
+        fields.setMaxHeight(100, Unit.PERCENTAGE);
 
         Span explanationSpan = new Span("Time you will stay logged in after successful login");
 

From d0d42a1d639fbace1bf25f05126591a1e47b25ea Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 30 Jan 2023 13:21:30 +0200
Subject: [PATCH 36/69] ProfilePage: SettingsTab (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/elements/PeriodDurationField.java  | 181 ++++++++++++++++++
 .../pages/user/profile/tabs/SettingsTab.java  |  39 ++--
 2 files changed, 202 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/pm/axe/ui/elements/PeriodDurationField.java

diff --git a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
new file mode 100644
index 000000000..1a1cfddb0
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
@@ -0,0 +1,181 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.customfield.CustomField;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.select.Select;
+import com.vaadin.flow.component.textfield.IntegerField;
+import org.threeten.extra.PeriodDuration;
+import pm.axe.Axe;
+
+import java.time.Duration;
+import java.time.Period;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static java.time.temporal.ChronoUnit.*;
+
+public class PeriodDurationField extends CustomField<PeriodDuration> {
+    public static final String ERROR_MESSAGE = "Invalid duration. Min: 1 minute, Max: 6 months.";
+    private static final List<ChronoUnit> SUPPORTED_UNITS = List.of(MONTHS, DAYS, HOURS, MINUTES);
+
+    private final IntegerField amount;
+    private final Select<String> unit;
+
+    public PeriodDurationField() {
+        //amount field
+        amount = new IntegerField();
+        amount.setValue(1);
+        amount.setMin(1);
+        amount.setMax(6); //max varies per unit
+        amount.setStepButtonsVisible(true);
+        amount.addValueChangeListener(this::onAmountChanged);
+
+        //unit select
+        unit = new Select<>();
+        unit.setItems(getUnits());
+        unit.setValue(MONTHS.name());
+        unit.addValueChangeListener(this::onUnitChanged);
+
+        //styles
+        amount.setWidth("8em");
+        unit.setWidth("8em");
+
+        // aria-label for screen readers
+        amount.getElement()
+                .executeJs("const amount = this.inputElement;"
+                        + "amount.setAttribute('aria-label', 'Number');"
+                        + "amount.removeAttribute('aria-labelledby');");
+        unit.getElement()
+                .executeJs("const unit = this.focusElement;"
+                        + "unit.setAttribute('aria-label', 'Unit');"
+                        + "unit.removeAttribute('aria-labelledby');");
+
+        HorizontalLayout layout = new HorizontalLayout(amount, unit);
+        // Removes default spacing
+        layout.setSpacing(false);
+        // Adds small amount of space between the components
+        layout.getThemeList().add("spacing-s");
+
+        add(layout);
+    }
+
+    public boolean isValid() {
+        if (amount.isInvalid()) return false;
+        return !unit.isInvalid();
+    }
+
+    private void onUnitChanged(final ComponentValueChangeEvent<Select<String>, String> event) {
+        ChronoUnit chronoUnit = null;
+        try {
+            chronoUnit = ChronoUnit.valueOf(unit.getValue());
+        } catch (IllegalArgumentException e) {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Should be valid " + ChronoUnit.class.getSimpleName() + " constant.");
+        } catch (NullPointerException npe) {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Unit cannot be NULL");
+        }
+        if (isSupported(chronoUnit)) {
+            switch (chronoUnit) {
+                //max 6 months
+                case MONTHS -> amount.setMax(6);
+                case DAYS -> amount.setMax(182);
+                case HOURS -> amount.setMax(4383);
+                case MINUTES -> amount.setMax(263000);
+                default -> {
+                    amount.setMax(1);
+                    amount.setEnabled(false);
+                }
+            }
+            if (amount.getValue() > amount.getMax()) {
+                amount.setValue(amount.getMax());
+            }
+        } else {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Unit unsupported");
+        }
+    }
+
+    private void onAmountChanged(final ComponentValueChangeEvent<IntegerField, Integer> e) {
+        if (amount.isInvalid()) {
+            this.setInvalid(true);
+            this.setErrorMessage(ERROR_MESSAGE);
+        } else {
+            this.setInvalid(false);
+        }
+    }
+
+    @Override
+    protected PeriodDuration generateModelValue() {
+        ChronoUnit chronoUnit;
+        try {
+            chronoUnit = ChronoUnit.valueOf(unit.getValue());
+        } catch (IllegalArgumentException e) {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Should be valid " + ChronoUnit.class.getSimpleName() + " constant.");
+            return PeriodDuration.ZERO;
+        } catch (NullPointerException npe) {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Unit cannot be NULL");
+            return PeriodDuration.ZERO;
+        }
+
+        if (isSupported(chronoUnit)) {
+            if (chronoUnit.isTimeBased()) {
+                return PeriodDuration.of(Duration.of(amount.getValue(), chronoUnit));
+            } else {
+                return switch (chronoUnit) {
+                    case DAYS -> PeriodDuration.of(Period.ofDays(amount.getValue()));
+                    case MONTHS -> PeriodDuration.of(Period.ofMonths(amount.getValue()));
+                    default -> PeriodDuration.ZERO; //all others are unsupported
+                };
+            }
+        } else {
+            unit.setInvalid(true);
+            unit.setErrorMessage("Unit unsupported");
+            return PeriodDuration.ZERO;
+        }
+    }
+
+    @Override
+    protected void setPresentationValue(PeriodDuration periodDuration) {
+        if (periodDuration.isZero()) {
+            //zero - set default
+            periodDuration = Axe.Defaults.LOGIN_SESSION_DURATION;
+        }
+
+        if (periodDuration.getDuration().isZero()) {
+            //period
+            if (periodDuration.getPeriod().getMonths() > 0) {
+                amount.setValue(periodDuration.getPeriod().getMonths());
+                unit.setValue(MONTHS.name());
+            } else {
+                amount.setValue(periodDuration.getPeriod().getDays());
+                unit.setValue(DAYS.name());
+            }
+        } else {
+            //duration
+            if (periodDuration.getDuration().toHoursPart() > 0) {
+                amount.setValue(periodDuration.getDuration().toHoursPart());
+                unit.setValue(HOURS.name());
+            } else {
+                amount.setValue(periodDuration.getDuration().toMinutesPart());
+                unit.setValue(MINUTES.name());
+            }
+        }
+    }
+
+    private boolean isSupported(final ChronoUnit chronoUnit) {
+        if (chronoUnit == null) return false;
+        for (ChronoUnit u: SUPPORTED_UNITS) {
+            if (u.equals(chronoUnit)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private List<String> getUnits() {
+       return SUPPORTED_UNITS.stream().map(ChronoUnit::name).toList();
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index 1564b8516..64c39dc15 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -4,14 +4,13 @@
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.Unit;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.select.Select;
-import com.vaadin.flow.component.textfield.IntegerField;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
@@ -19,12 +18,12 @@
 import pm.axe.db.models.UserSettings;
 import pm.axe.internal.HasTabInit;
 import pm.axe.services.user.UserSettingsService;
+import pm.axe.ui.elements.PeriodDurationField;
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.pages.settings.SettingsPage;
 import pm.axe.users.LandingPage;
 import pm.axe.utils.AxeSessionUtils;
 
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Optional;
 
@@ -40,6 +39,7 @@ public class SettingsTab extends VerticalLayout implements HasTabInit {
     private Section landingPageSection;
     private Section darkModeSection;
 
+    private final PeriodDurationField pdField = new PeriodDurationField();
     private final Select<String> landingPageSelect = new Select<>();
     private final ToggleButton darkModeToggle = new ToggleButton();
     @Override
@@ -60,23 +60,17 @@ private Section createLoginSessionSection() {
     }
 
     private Component loginSessionDuration() {
-        //TODO may be a single component
-        IntegerField amountField = new IntegerField();
-        amountField.setStepButtonsVisible(true);
-        amountField.setMin(1);
-        amountField.setMax(60);
-        amountField.setValue(1); //TODO replace with real value from settings
-        Select<String> unitSelect = new Select<>();
-        unitSelect.setItems(ChronoUnit.SECONDS.name(), ChronoUnit.MINUTES.name(),
-                ChronoUnit.HOURS.name(), ChronoUnit.DAYS.name()); //TODO continue list
-        unitSelect.setValue(ChronoUnit.DAYS.name());
-        //TODO on unit change change amount field number max/min values
+        pdField.setHelperText("The longer you're logged in, the less secure it is.");
+        axeSessionUtils.getCurrentUserSettings().ifPresent(us -> pdField.setValue(us.getLoginSessionDuration()));
+
         Button save = new Button("Save");
         save.addClickListener(this::onSessionDurationSaved);
 
-        FlexLayout fields = new FlexLayout(amountField, unitSelect, save);
+        HorizontalLayout fields = new HorizontalLayout(pdField, save);
         fields.setAlignItems(Alignment.BASELINE);
-        fields.setMaxHeight(100, Unit.PERCENTAGE);
+        fields.getStyle().set("flex-wrap", "wrap");
+        fields.setSpacing(false);
+        fields.getThemeList().add("spacing-s");
 
         Span explanationSpan = new Span("Time you will stay logged in after successful login");
 
@@ -142,7 +136,16 @@ private void onDarkModeToggleChanged(final AbstractField.ComponentValueChangeEve
     }
 
     private void onSessionDurationSaved(ClickEvent<Button> event) {
-        //TODO implement
-        Notification.show("Not implemented yet");
+        axeSessionUtils.getCurrentUserSettings().ifPresent(us -> {
+            if (pdField.isValid()) {
+                us.setLoginSessionDuration(pdField.getValue());
+                uss.updateUserSettings(us);
+                Notification.show("Session duration updated!");
+            } else {
+                pdField.setInvalid(true);
+                pdField.setErrorMessage(PeriodDurationField.ERROR_MESSAGE);
+            }
+
+        });
     }
 }

From 9d85c08c80a32ea88cdf1746a44c9e1df91560d4 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 30 Jan 2023 15:20:51 +0200
Subject: [PATCH 37/69] ProfilePage: SettingsTab. Fix (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/elements/PeriodDurationField.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
index 1a1cfddb0..7524cb84c 100644
--- a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
+++ b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
@@ -147,20 +147,20 @@ protected void setPresentationValue(PeriodDuration periodDuration) {
         if (periodDuration.getDuration().isZero()) {
             //period
             if (periodDuration.getPeriod().getMonths() > 0) {
-                amount.setValue(periodDuration.getPeriod().getMonths());
                 unit.setValue(MONTHS.name());
+                amount.setValue(periodDuration.getPeriod().getMonths());
             } else {
-                amount.setValue(periodDuration.getPeriod().getDays());
                 unit.setValue(DAYS.name());
+                amount.setValue(periodDuration.getPeriod().getDays());
             }
         } else {
             //duration
             if (periodDuration.getDuration().toHoursPart() > 0) {
-                amount.setValue(periodDuration.getDuration().toHoursPart());
                 unit.setValue(HOURS.name());
+                amount.setValue(periodDuration.getDuration().toHoursPart());
             } else {
-                amount.setValue(periodDuration.getDuration().toMinutesPart());
                 unit.setValue(MINUTES.name());
+                amount.setValue(periodDuration.getDuration().toMinutesPart());
             }
         }
     }

From 56821671cadabd08cef70745e6142a05656bd9f4 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 10:20:51 +0200
Subject: [PATCH 38/69] ProfilePage: DangerZoneTab draft (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../user/profile/tabs/DangerZoneTab.java      | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index 27112a59c..50eb27d3f 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -1,20 +1,50 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
-import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
 import pm.axe.db.models.User;
 import pm.axe.internal.HasTabInit;
+import pm.axe.ui.elements.Section;
+
 
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
 public class DangerZoneTab extends VerticalLayout implements HasTabInit {
-
+    private Section deleteAccountSection;
+    private User user;
     @Override
     public void tabInit(final User user) {
-        add(new Span("This is Danger Zone"));
+        this.user = user;
+        createDeleteAccountSection();
+        add(deleteAccountSection);
+    }
+
+    private void createDeleteAccountSection() {
+        deleteAccountSection = new Section("Delete my Account");
+        Component content = deleteAccountSectionContent();
+        deleteAccountSection.setContent(content);
+    }
+
+    private Component deleteAccountSectionContent() {
+        Button deleteAccountButton = new Button();
+        deleteAccountButton.setText("Delete this Account");
+        deleteAccountButton.addClickListener(this::onDeleteAccount);
+
+        HorizontalLayout layout = new HorizontalLayout(deleteAccountButton);
+        layout.setAlignItems(Alignment.BASELINE);
+        return layout;
+    }
+
+    private void onDeleteAccount(final ClickEvent<Button> event) {
+        if (user == null) return; //no user - no action
+        Notification.show("TODO");
     }
 }

From f0fccac9e91c6fa028ec6feff41d552c327e9418 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 14:33:52 +0200
Subject: [PATCH 39/69] ProfilePage: CSSex (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/common_styles.css                | 12 ++++++
 frontend/css/profile_page.css                 |  7 +++-
 .../axe/ui/elements/PeriodDurationField.java  |  9 +++--
 src/main/java/pm/axe/ui/elements/Section.java |  6 +++
 .../pm/axe/ui/layouts/AxeCompactLayout.java   |  4 +-
 .../ui/pages/user/profile/ProfilePage.java    | 30 +++++++-------
 .../user/profile/tabs/DangerZoneTab.java      | 26 ++++++++++---
 .../pages/user/profile/tabs/ProfileTab.java   | 39 ++++++++++---------
 .../pages/user/profile/tabs/SecurityTab.java  | 13 ++++++-
 .../pages/user/profile/tabs/SettingsTab.java  | 13 ++++---
 src/main/java/pm/axe/utils/VaadinUtils.java   | 31 +++++++++++++++
 11 files changed, 136 insertions(+), 54 deletions(-)

diff --git a/frontend/css/common_styles.css b/frontend/css/common_styles.css
index eb42258ca..7c2035f74 100644
--- a/frontend/css/common_styles.css
+++ b/frontend/css/common_styles.css
@@ -212,4 +212,16 @@ vaadin-icon[icon="vaadin:sign-in"] {
 
 .green {
     color: green;
+}
+
+.red {
+    color: red;
+}
+
+.fit-in-window {
+    flex-wrap: wrap;
+}
+
+.fit-in-window > * {
+    flex: 1 0 auto;
 }
\ No newline at end of file
diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index 9d01aae44..6f5dd3f22 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -5,4 +5,9 @@
 .toggle-with-prefix-postfix {
     margin-right: 0.3rem;
     margin-left: 0.3rem;
-}
\ No newline at end of file
+}
+
+.tab-content {
+    padding-left: 0!important;
+    padding-right: 0!important;
+}
diff --git a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
index 7524cb84c..5abec1ca3 100644
--- a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
+++ b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
@@ -6,6 +6,7 @@
 import com.vaadin.flow.component.textfield.IntegerField;
 import org.threeten.extra.PeriodDuration;
 import pm.axe.Axe;
+import pm.axe.utils.VaadinUtils;
 
 import java.time.Duration;
 import java.time.Period;
@@ -38,7 +39,9 @@ public PeriodDurationField() {
 
         //styles
         amount.setWidth("8em");
+        amount.getStyle().set("flex", "auto");
         unit.setWidth("8em");
+        unit.getStyle().set("flex", "auto");
 
         // aria-label for screen readers
         amount.getElement()
@@ -51,10 +54,8 @@ public PeriodDurationField() {
                         + "unit.removeAttribute('aria-labelledby');");
 
         HorizontalLayout layout = new HorizontalLayout(amount, unit);
-        // Removes default spacing
-        layout.setSpacing(false);
-        // Adds small amount of space between the components
-        layout.getThemeList().add("spacing-s");
+        VaadinUtils.setSmallSpacing(layout);
+        VaadinUtils.setWrap(layout);
 
         add(layout);
     }
diff --git a/src/main/java/pm/axe/ui/elements/Section.java b/src/main/java/pm/axe/ui/elements/Section.java
index dc810ed3d..81ab49223 100644
--- a/src/main/java/pm/axe/ui/elements/Section.java
+++ b/src/main/java/pm/axe/ui/elements/Section.java
@@ -4,6 +4,7 @@
 import com.vaadin.flow.component.Composite;
 import com.vaadin.flow.component.HasStyle;
 import com.vaadin.flow.component.html.H5;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
@@ -93,6 +94,11 @@ public void add(final Component component) {
         content.add(component);
     }
 
+    public void setCentered() {
+        self.setAlignItems(FlexComponent.Alignment.CENTER);
+        content.setWidth("auto");
+    }
+
     private void setContentCloserToTitle() {
         content.getStyle().set("padding-top", "0");
     }
diff --git a/src/main/java/pm/axe/ui/layouts/AxeCompactLayout.java b/src/main/java/pm/axe/ui/layouts/AxeCompactLayout.java
index bf8160775..f0b72ff24 100644
--- a/src/main/java/pm/axe/ui/layouts/AxeCompactLayout.java
+++ b/src/main/java/pm/axe/ui/layouts/AxeCompactLayout.java
@@ -3,13 +3,15 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import lombok.AccessLevel;
+import lombok.Getter;
 
 /**
  * Layout, that uses only part of {@link AxeBaseLayout#getCentralLayout()} and its width depends on its content.
  */
 @CssImport(value = "./css/axe_compact_styles.css")
 public class AxeCompactLayout extends AxeBaseLayout {
-    private final VerticalLayout compactLayout = new VerticalLayout();
+    @Getter(AccessLevel.PROTECTED) private final VerticalLayout compactLayout = new VerticalLayout();
 
     /**
      * Creates {@link AxeCompactLayout}.
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
index b05780d50..07ede6d1d 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
@@ -1,15 +1,16 @@
 package pm.axe.ui.pages.user.profile;
 
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.HasStyle;
 import com.vaadin.flow.component.dependency.CssImport;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.tabs.Tab;
+import com.vaadin.flow.component.tabs.TabSheet;
+import com.vaadin.flow.component.tabs.TabSheetVariant;
 import com.vaadin.flow.component.tabs.TabVariant;
-import com.vaadin.flow.component.tabs.Tabs;
-import com.vaadin.flow.component.tabs.TabsVariant;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.PageTitle;
@@ -72,6 +73,8 @@ public void beforeEnter(BeforeEnterEvent event) {
 
     private void initPage() {
         removeAll();
+        //making tabs equal
+        getCompactLayout().getStyle().set("width", "100%!important");
         //content map
         contentMap.clear();
         contentMap.put(profileTab, profileTabContent);
@@ -91,22 +94,15 @@ private void initPage() {
             if (content instanceof HasTabInit) {
                 ((HasTabInit) content).tabInit(user);
             }
+            if (content instanceof HasStyle) {
+                ((HasStyle) content).addClassName("tab-content");
+            }
         });
-        Tabs tabs = new Tabs();
-        tabs.addSelectedChangeListener(event -> setContent(event.getSelectedTab()));
-        contentMap.forEach((tab, content) -> tabs.add(tab));
-        tabs.addThemeVariants(TabsVariant.LUMO_EQUAL_WIDTH_TABS);
-        tabs.setWidthFull();
-
-        add(title, tabs, content);
-    }
+        TabSheet tabSheet = new TabSheet();
+        contentMap.forEach(tabSheet::add);
+        tabSheet.addThemeVariants(TabSheetVariant.LUMO_TABS_EQUAL_WIDTH_TABS, TabSheetVariant.LUMO_BORDERED);
+        tabSheet.setWidthFull();
 
-    private void setContent(final Tab tab) {
-        content.removeAll();
-        if (tab == null) {
-            return;
-        }
-        Component tabContent = contentMap.get(tab);
-        content.add(tabContent);
+        add(title, tabSheet, content);
     }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index 50eb27d3f..b9b56e678 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -12,6 +12,7 @@
 import pm.axe.db.models.User;
 import pm.axe.internal.HasTabInit;
 import pm.axe.ui.elements.Section;
+import pm.axe.utils.VaadinUtils;
 
 
 @RequiredArgsConstructor
@@ -29,22 +30,35 @@ public void tabInit(final User user) {
 
     private void createDeleteAccountSection() {
         deleteAccountSection = new Section("Delete my Account");
+        deleteAccountSection.setCentered();
         Component content = deleteAccountSectionContent();
         deleteAccountSection.setContent(content);
     }
 
     private Component deleteAccountSectionContent() {
-        Button deleteAccountButton = new Button();
-        deleteAccountButton.setText("Delete this Account");
-        deleteAccountButton.addClickListener(this::onDeleteAccount);
+        deleteAccountSection.getTitle().addClassName("red");
+        deleteAccountSection.getTitle().addClassName("bold");
 
-        HorizontalLayout layout = new HorizontalLayout(deleteAccountButton);
-        layout.setAlignItems(Alignment.BASELINE);
+        Button deleteAccountOnlyButton = new Button();
+        deleteAccountOnlyButton.setText("Delete Account");
+        deleteAccountOnlyButton.addClickListener(this::onDeleteAccount);
+
+        Button deleteAccountAndLinksButton = new Button();
+        deleteAccountAndLinksButton.setText("Delete Account and Links");
+        deleteAccountAndLinksButton.addClickListener(this::onDeleteAccountAndLinks);
+
+        HorizontalLayout layout = new HorizontalLayout(deleteAccountOnlyButton, deleteAccountAndLinksButton);
+        VaadinUtils.fitLayoutInWindow(layout);
         return layout;
     }
 
     private void onDeleteAccount(final ClickEvent<Button> event) {
         if (user == null) return; //no user - no action
-        Notification.show("TODO");
+        Notification.show("Will do once they implement me");
+    }
+
+    private void onDeleteAccountAndLinks(final ClickEvent<Button> event) {
+        if (user == null) return; //no user - no action
+        Notification.show("Will do once they implement me");
     }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index b93d112e4..8da1927cb 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -1,12 +1,12 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
 import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.icon.VaadinIcon;
-import com.vaadin.flow.component.orderedlayout.FlexComponent;
-import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.component.textfield.TextField;
@@ -24,9 +24,11 @@
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
 import pm.axe.users.AccountType;
+import pm.axe.utils.VaadinUtils;
 
 import java.util.Optional;
 
+@SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
@@ -41,12 +43,12 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final TextField usernameField = new TextField();
     private final Button editUsernameButton = new Button();
     private final Button saveUsernameButton = new Button();
-    private final FlexLayout usernameLayout = new FlexLayout();
+    private final HorizontalLayout usernameLayout = new HorizontalLayout();
 
     private final EmailField emailField = new EmailField();
     private final Button editEmailButton = new Button();
     private final Button saveEmailButton = new Button();
-    private final FlexLayout emailLayout = new FlexLayout();
+    private final HorizontalLayout emailLayout = new HorizontalLayout();
 
     @Override
     public void tabInit(final User user) {
@@ -57,17 +59,18 @@ public void tabInit(final User user) {
     }
 
     private Section createAccountSection() {
-        FlexLayout usernameLayout = createUsernameLayout();
-        FlexLayout emailLayout = createEmailLayout();
+        Component usernameLayout = createUsernameLayout();
+        Component emailLayout = createEmailLayout();
         Details emailUsageDetails = createEmailUsageDetails();
-        FlexLayout telegramLayout = createTelegramLayout();
+        Component telegramLayout = createTelegramLayout();
 
         Section section = new Section("Accounts");
         section.setContent(usernameLayout, emailLayout, emailUsageDetails, telegramLayout);
+        section.setCentered();
         return section;
     }
 
-    private FlexLayout createUsernameLayout() {
+    private HorizontalLayout createUsernameLayout() {
         usernameField.setLabel("Username");
         usernameField.setValue(user.getUsername());
         usernameField.setReadOnly(true);
@@ -76,38 +79,38 @@ private FlexLayout createUsernameLayout() {
         saveUsernameButton.setText("Save");
 
         usernameLayout.add(usernameField, editUsernameButton);
-        usernameLayout.setAlignItems(FlexComponent.Alignment.BASELINE);
-        usernameLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+        VaadinUtils.fitLayoutInWindow(usernameLayout);
+        VaadinUtils.setSmallSpacing(usernameLayout);
 
         editUsernameButton.addClickListener(this::onEditUsername);
         saveUsernameButton.addClickListener(this::onSaveUsername);
         return usernameLayout;
     }
 
-    private FlexLayout createEmailLayout() {
+    private Component createEmailLayout() {
         emailField.setLabel("E-mail");
         Optional<String> currentEmail = getCurrentEmail();
-        currentEmail.ifPresent(e -> emailField.setValue(currentEmail.get()));
         emailField.setReadOnly(true);
+        currentEmail.ifPresent(e -> emailField.setValue(currentEmail.get()));
 
         editEmailButton.setText("Edit");
         saveEmailButton.setText("Save");
 
         emailLayout.add(emailField, editEmailButton);
-        emailLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
-        emailLayout.setAlignItems(Alignment.BASELINE);
+        VaadinUtils.fitLayoutInWindow(emailLayout);
+        VaadinUtils.setSmallSpacing(emailLayout);
 
         editEmailButton.addClickListener(this::onEditEmail);
         saveEmailButton.addClickListener(this::onSaveEmail);
         return emailLayout;
     }
 
-    private FlexLayout createTelegramLayout() {
-        FlexLayout telegramLayout = new FlexLayout();
-        telegramLayout.setAlignItems(Alignment.BASELINE);
+    private HorizontalLayout createTelegramLayout() {
+        HorizontalLayout telegramLayout = new HorizontalLayout();
+        VaadinUtils.fitLayoutInWindow(telegramLayout);
+        VaadinUtils.setSmallSpacing(telegramLayout);
 
         Optional<Account> telegramAccount = getTelegramAccount();
-
         if (telegramAccount.isPresent()) {
             Optional<String> telegramUsername = accountService.decryptAccountName(telegramAccount.get());
             if (telegramUsername.isPresent()) {
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 55afd1903..1a47f0219 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -27,9 +27,11 @@
 import pm.axe.ui.elements.Section;
 import pm.axe.users.AccountType;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.VaadinUtils;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 @SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
@@ -69,6 +71,7 @@ public void tabInit(final User user) {
     private Section createChangePasswordSection() {
         VerticalLayout changePasswordContent = createChangePasswordContent();
         changePasswordSection = new Section("Change Password");
+        changePasswordSection.setCentered();
         changePasswordSection.setContent(changePasswordContent);
         return changePasswordSection;
     }
@@ -84,12 +87,14 @@ private VerticalLayout createChangePasswordContent() {
                 passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);
         changePasswordLayout.setSpacing(false);
+        Stream.of(oldPasswordInput, newPasswordInput, updatePasswordButton).forEach(VaadinUtils::setCentered);
         return changePasswordLayout;
     }
 
     private Section createResetPasswordChannelSection() {
         VerticalLayout content = createResetPasswordChannelContent();
         resetPasswordChannelSection = new Section("Reset password link");
+        resetPasswordChannelSection.setCentered();
         resetPasswordChannelSection.setContent(content);
         return resetPasswordChannelSection;
     }
@@ -104,8 +109,11 @@ private VerticalLayout createResetPasswordChannelContent() {
         resetPasswordSelect.addValueChangeListener(this::onResetPasswordSelectModified);
 
         HorizontalLayout resetPasswordFieldLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordField);
+        VaadinUtils.fitLayoutInWindow(resetPasswordFieldLayout);
         resetPasswordFieldLayout.setAlignItems(Alignment.CENTER);
+
         HorizontalLayout resetPasswordSelectLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordSelect);
+        VaadinUtils.fitLayoutInWindow(resetPasswordSelectLayout);
         resetPasswordSelectLayout.setAlignItems(Alignment.CENTER);
 
         VerticalLayout resetPasswordContent = new VerticalLayout();
@@ -131,6 +139,7 @@ private VerticalLayout createResetPasswordChannelContent() {
     private Section createTfaSection() {
         VerticalLayout content = createTfaContent();
         tfaSection = new Section("Two-Factor Authentication (2FA)");
+        tfaSection.setCentered();
         tfaSection.setContent(content);
         return tfaSection;
     }
@@ -148,13 +157,13 @@ private VerticalLayout createTfaContent() {
         tfaField.setReadOnly(true);
 
         HorizontalLayout tfaFieldLayout = new HorizontalLayout(sentToLabel, tfaField);
-        tfaFieldLayout.setAlignItems(Alignment.BASELINE);
+        VaadinUtils.fitLayoutInWindow(tfaFieldLayout);
 
         tfaChannelSelect = new Select<>();
         tfaChannelSelect.addValueChangeListener(this::onTfaSelectModified);
 
         HorizontalLayout tfaSelectLayout = new HorizontalLayout(sentToLabel, tfaChannelSelect);
-        tfaSelectLayout.setAlignItems(Alignment.BASELINE);
+        VaadinUtils.fitLayoutInWindow(tfaSelectLayout);
 
         VerticalLayout tfaContent = new VerticalLayout(tfaBox);
         tfaContent.setPadding(false);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index 64c39dc15..37f7dcb86 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -23,6 +23,7 @@
 import pm.axe.ui.pages.settings.SettingsPage;
 import pm.axe.users.LandingPage;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.VaadinUtils;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -54,6 +55,7 @@ public void tabInit(final User user) {
 
     private Section createLoginSessionSection() {
         loginSessionSection = new Section("Login Session Duration");
+        loginSessionSection.setCentered();
         Component content = loginSessionDuration();
         loginSessionSection.setContent(content);
         return loginSessionSection;
@@ -61,16 +63,16 @@ private Section createLoginSessionSection() {
 
     private Component loginSessionDuration() {
         pdField.setHelperText("The longer you're logged in, the less secure it is.");
+        VaadinUtils.setFlex(pdField, "1 1 auto");
         axeSessionUtils.getCurrentUserSettings().ifPresent(us -> pdField.setValue(us.getLoginSessionDuration()));
 
         Button save = new Button("Save");
+        VaadinUtils.setFlex(save, "1");
         save.addClickListener(this::onSessionDurationSaved);
 
         HorizontalLayout fields = new HorizontalLayout(pdField, save);
-        fields.setAlignItems(Alignment.BASELINE);
-        fields.getStyle().set("flex-wrap", "wrap");
-        fields.setSpacing(false);
-        fields.getThemeList().add("spacing-s");
+        VaadinUtils.setWrap(fields);
+        VaadinUtils.setSmallSpacing(fields);
 
         Span explanationSpan = new Span("Time you will stay logged in after successful login");
 
@@ -81,13 +83,13 @@ private Component loginSessionDuration() {
 
     private Section createLandingPageSection() {
         landingPageSection = new Section("Landing page");
+        landingPageSection.setCentered();
         Component content = landingPageLayout();
         landingPageSection.setContent(content);
         return landingPageSection;
     }
 
     private Component landingPageLayout() {
-        landingPageSelect.setLabel("Landing Page");
         landingPageSelect.setItems(Arrays.stream(LandingPage.values()).map(LandingPage::name).toList());
         Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
         userSettings.ifPresent(settings -> landingPageSelect.setValue(settings.getLandingPage().name()));
@@ -101,6 +103,7 @@ private Component landingPageLayout() {
 
     private Section createDarkModeSection() {
         darkModeSection = new Section("Dark Mode");
+        darkModeSection.setCentered();
         Component content = darkModeLayout();
         darkModeSection.setContent(content);
         return darkModeSection;
diff --git a/src/main/java/pm/axe/utils/VaadinUtils.java b/src/main/java/pm/axe/utils/VaadinUtils.java
index f2c4f672a..817ee90d6 100644
--- a/src/main/java/pm/axe/utils/VaadinUtils.java
+++ b/src/main/java/pm/axe/utils/VaadinUtils.java
@@ -1,5 +1,8 @@
 package pm.axe.utils;
 
+import com.vaadin.flow.component.HasStyle;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.BeforeEvent;
 import com.vaadin.flow.router.QueryParameters;
 
@@ -43,4 +46,32 @@ public static Optional<String> getParamValue(final String paramName, final Befor
             return Optional.empty();
         }
     }
+
+    public static void fitLayoutInWindow(final FlexComponent layout) {
+        layout.addClassName("fit-in-window");
+        layout.setAlignItems(FlexComponent.Alignment.BASELINE);
+        layout.setJustifyContentMode(FlexComponent.JustifyContentMode.AROUND);
+    }
+
+    /**
+     * For those elements, where {@link #fitLayoutInWindow(FlexComponent)} is not fit.
+     *
+     * @param layout {@link FlexComponent} that should be wrapped.
+     */
+    public static void setWrap(final FlexComponent layout) {
+        layout.getStyle().set("flex-wrap", "wrap");
+    }
+
+    public static void setSmallSpacing(final HorizontalLayout layout) {
+        layout.setSpacing(false);
+        layout.getThemeList().add("spacing-s");
+    }
+
+    public static void setCentered(final HasStyle component) {
+        component.addClassName("centered-element");
+    }
+
+    public static void setFlex(final HasStyle component, final String flexValue) {
+        component.getStyle().set("flex", flexValue);
+    }
 }

From 677a7cb573fc2f02890fda26c4ec22185b83a5c4 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 15:00:39 +0200
Subject: [PATCH 40/69] ProfilePage: Painting Buttons (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/profile/tabs/DangerZoneTab.java  |  9 +++++----
 .../pm/axe/ui/pages/user/profile/tabs/ProfileTab.java  | 10 ++++++++--
 .../pm/axe/ui/pages/user/profile/tabs/SecurityTab.java |  2 ++
 .../pm/axe/ui/pages/user/profile/tabs/SettingsTab.java | 10 ++++++----
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index b9b56e678..4de04b416 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -3,6 +3,7 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -39,12 +40,12 @@ private Component deleteAccountSectionContent() {
         deleteAccountSection.getTitle().addClassName("red");
         deleteAccountSection.getTitle().addClassName("bold");
 
-        Button deleteAccountOnlyButton = new Button();
-        deleteAccountOnlyButton.setText("Delete Account");
+        Button deleteAccountOnlyButton = new Button("Delete Account");
+        deleteAccountOnlyButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
         deleteAccountOnlyButton.addClickListener(this::onDeleteAccount);
 
-        Button deleteAccountAndLinksButton = new Button();
-        deleteAccountAndLinksButton.setText("Delete Account and Links");
+        Button deleteAccountAndLinksButton = new Button("Delete Account and Links");
+        deleteAccountAndLinksButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
         deleteAccountAndLinksButton.addClickListener(this::onDeleteAccountAndLinks);
 
         HorizontalLayout layout = new HorizontalLayout(deleteAccountOnlyButton, deleteAccountAndLinksButton);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 8da1927cb..3549f1614 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -3,6 +3,7 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.details.Details;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.icon.VaadinIcon;
@@ -76,7 +77,9 @@ private HorizontalLayout createUsernameLayout() {
         usernameField.setReadOnly(true);
 
         editUsernameButton.setText("Edit");
+        editUsernameButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         saveUsernameButton.setText("Save");
+        saveUsernameButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
         usernameLayout.add(usernameField, editUsernameButton);
         VaadinUtils.fitLayoutInWindow(usernameLayout);
@@ -94,7 +97,9 @@ private Component createEmailLayout() {
         currentEmail.ifPresent(e -> emailField.setValue(currentEmail.get()));
 
         editEmailButton.setText("Edit");
+        editEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         saveEmailButton.setText("Save");
+        saveEmailButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
         emailLayout.add(emailField, editEmailButton);
         VaadinUtils.fitLayoutInWindow(emailLayout);
@@ -118,8 +123,9 @@ private HorizontalLayout createTelegramLayout() {
                 telegramField.setReadOnly(true);
                 telegramField.setPrefixComponent(VaadinIcon.AT.create());
                 telegramField.setValue(telegramUsername.get());
-                Button unlink = new Button("Unlink");
-                telegramLayout.add(telegramField, unlink);
+                Button unlinkButton = new Button("Unlink");
+                unlinkButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
+                telegramLayout.add(telegramField, unlinkButton);
             } else {
                 telegramLayout.setVisible(false);
             }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 1a47f0219..dca00abf1 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -2,6 +2,7 @@
 
 import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.Label;
@@ -83,6 +84,7 @@ private VerticalLayout createChangePasswordContent() {
         passwordGenerator.setOpened(false);
         passwordGenerator.setCopyTarget(newPasswordInput);
         Button updatePasswordButton = new Button("Update");
+        updatePasswordButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         VerticalLayout changePasswordLayout = new VerticalLayout(oldPasswordInput, newPasswordInput,
                 passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index 37f7dcb86..d0f28fa0e 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -5,6 +5,7 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
@@ -66,11 +67,12 @@ private Component loginSessionDuration() {
         VaadinUtils.setFlex(pdField, "1 1 auto");
         axeSessionUtils.getCurrentUserSettings().ifPresent(us -> pdField.setValue(us.getLoginSessionDuration()));
 
-        Button save = new Button("Save");
-        VaadinUtils.setFlex(save, "1");
-        save.addClickListener(this::onSessionDurationSaved);
+        Button saveButton = new Button("Save");
+        saveButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+        saveButton.addClickListener(this::onSessionDurationSaved);
+        VaadinUtils.setFlex(saveButton, "1");
 
-        HorizontalLayout fields = new HorizontalLayout(pdField, save);
+        HorizontalLayout fields = new HorizontalLayout(pdField, saveButton);
         VaadinUtils.setWrap(fields);
         VaadinUtils.setSmallSpacing(fields);
 

From 4b5eb0c53f37e3847c0ec7961fc95dba08909838 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 15:30:33 +0200
Subject: [PATCH 41/69] ProfilePage: too much red (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index 4de04b416..2a8f824e0 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -37,7 +37,6 @@ private void createDeleteAccountSection() {
     }
 
     private Component deleteAccountSectionContent() {
-        deleteAccountSection.getTitle().addClassName("red");
         deleteAccountSection.getTitle().addClassName("bold");
 
         Button deleteAccountOnlyButton = new Button("Delete Account");

From c3f4adc4f308169558f3621060cced8bfaa33984 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 17:47:05 +0200
Subject: [PATCH 42/69] ConfirmAccountPage (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/ConfirmAccountPage.java   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index 83522bbed..c5bdd2219 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -3,9 +3,10 @@
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.html.H3;
 import com.vaadin.flow.component.html.Span;
-import com.vaadin.flow.component.orderedlayout.FlexLayout;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
@@ -24,6 +25,7 @@
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
 import pm.axe.ui.layouts.AxeCompactLayout;
+import pm.axe.utils.VaadinUtils;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -38,7 +40,7 @@ public class ConfirmAccountPage extends AxeCompactLayout implements BeforeEnterO
     private boolean pageAlreadyInitialized = false;
     private User user;
 
-    private FlexLayout emailLayout;
+    private HorizontalLayout emailLayout;
     private EmailField emailInput;
     private Button submitEmailButton;
     private Span sentSpan;
@@ -69,16 +71,18 @@ private void initPage() {
         add(title, emailSection, telegramSection);
     }
 
-    private FlexLayout emailSectionContent() {
+    private Component emailSectionContent() {
         emailInput = new EmailField("Email address here");
+        emailInput.setHelperText("Axe will send confirmation letter there");
         submitEmailButton = new Button("Submit");
+        submitEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         submitEmailButton.addClickListener(this::onSubmitEmail);
         sentSpan = new Span("Sent!");
         sentSpan.setClassName("green");
 
-        emailLayout = new FlexLayout(emailInput, submitEmailButton);
-        emailLayout.setAlignItems(Alignment.BASELINE);
-        emailLayout.setJustifyContentMode(JustifyContentMode.EVENLY);
+        emailLayout = new HorizontalLayout(emailInput, submitEmailButton);
+        VaadinUtils.fitLayoutInWindow(emailLayout);
+        VaadinUtils.setSmallSpacing(emailLayout);
         return emailLayout;
     }
 
@@ -106,6 +110,7 @@ private void onSubmitEmail(ClickEvent<Button> event) {
             return;
         }
         //TODO implement sent confirmation letter call here
+        emailInput.setReadOnly(true);
         emailLayout.replace(submitEmailButton, sentSpan);
     }
 

From e119aed9aeca95d53afcf3b86490bccd41456d5e Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Tue, 31 Jan 2023 22:01:10 +0200
Subject: [PATCH 43/69] Redirect stuff (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/ConfirmAccountPage.java  | 15 ++++-----------
 .../java/pm/axe/ui/pages/user/LoginPage.java   | 18 ++++++++++--------
 .../pm/axe/ui/pages/user/RegistrationPage.java | 13 +++++++++++--
 .../ui/pages/user/profile/tabs/ProfileTab.java | 13 +++++++------
 .../java/pm/axe/utils/AxeSessionUtils.java     |  7 +++++++
 5 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index c5bdd2219..8ecc49a35 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -20,11 +20,11 @@
 import pm.axe.db.models.User;
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.TokenService;
-import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
 import pm.axe.ui.layouts.AxeCompactLayout;
+import pm.axe.utils.AxeSessionUtils;
 import pm.axe.utils.VaadinUtils;
 
 import java.util.Objects;
@@ -37,6 +37,7 @@
 @PageTitle("Confirm Account - Axe.pm")
 public class ConfirmAccountPage extends AxeCompactLayout implements BeforeEnterObserver {
     private final TokenService tokenService;
+    private final AxeSessionUtils axeSessionUtils;
     private boolean pageAlreadyInitialized = false;
     private User user;
 
@@ -49,9 +50,10 @@ public class ConfirmAccountPage extends AxeCompactLayout implements BeforeEnterO
 
     @Override
     public void beforeEnter(final BeforeEnterEvent event) {
-        boundUserIfAny();
+        user = axeSessionUtils.boundUserIfAny();
         if (Objects.isNull(user)) {
             event.forwardTo(LoginPage.class);
+            return;
         }
         if (!pageAlreadyInitialized) {
             initPage();
@@ -113,13 +115,4 @@ private void onSubmitEmail(ClickEvent<Button> event) {
         emailInput.setReadOnly(true);
         emailLayout.replace(submitEmailButton, sentSpan);
     }
-
-    private void boundUserIfAny() {
-        Optional<AxeSession> axeSession = AxeSession.getCurrent();
-        if (axeSession.isPresent()) {
-            if (axeSession.get().hasUser()) {
-                user = axeSession.get().getUser();
-            }
-        }
-    }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 16b096a05..5f87d95a7 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -34,6 +34,7 @@
 import pm.axe.utils.AppUtils;
 import pm.axe.utils.AxeSessionUtils;
 
+import java.util.Objects;
 import java.util.Optional;
 
 
@@ -63,8 +64,14 @@ public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
 
     private boolean pageAlreadyInitialized = false;
     @Override
-    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
-        if (beforeEnterEvent.isRefreshEvent()) return;
+    public void beforeEnter(final BeforeEnterEvent enterEvent) {
+        if (enterEvent.isRefreshEvent()) return;
+        //redirect to landing page if user already in
+        if (Objects.nonNull(axeSessionUtils.boundUserIfAny())) {
+            enterEvent.forwardTo(axeSessionUtils.getLandingPage().getPath());
+            return;
+        }
+        //init once
         if (pageAlreadyInitialized) {
            cleanInputs();
         } else {
@@ -143,12 +150,7 @@ private void doEasyLogin() {
                     mainView.applyTheme(true);
                 }
                 //landing page
-                LandingPage landingPage; //page after login
-                if (us.isPresent()) {
-                    landingPage = us.get().getLandingPage();
-                } else {
-                    landingPage = LandingPage.HOME_PAGE;
-                }
+                LandingPage landingPage = axeSessionUtils.getLandingPage(); //page after login
                 usernameInput.getUI().ifPresent(ui -> ui.navigate(landingPage.getPath()));
             });
         } else {
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index a19fddc3b..9e32646a7 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -33,7 +33,9 @@
 import pm.axe.users.AccountType;
 import pm.axe.users.UsernameGenerator;
 import pm.axe.users.UsernameValidator;
+import pm.axe.utils.AxeSessionUtils;
 
+import java.util.Objects;
 import java.util.stream.Stream;
 
 @SpringComponent
@@ -52,6 +54,7 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private final UsernameGenerator usernameGenerator;
     private final UserService userService;
     private final AccountService accountService;
+    private final AxeSessionUtils axeSessionUtils;
 
     private final Span subTitleText = new Span();
     private final Anchor subTitleLink = new Anchor();
@@ -65,8 +68,14 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private boolean pageAlreadyInitialized = false;
 
     @Override
-    public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
-        if (beforeEnterEvent.isRefreshEvent()) return;
+    public void beforeEnter(BeforeEnterEvent enterEvent) {
+        if (enterEvent.isRefreshEvent()) return;
+        //redirect to landing page if user already in
+        if (Objects.nonNull(axeSessionUtils.boundUserIfAny())) {
+            enterEvent.forwardTo(axeSessionUtils.getLandingPage().getPath());
+            return;
+        }
+        //init once
         if (pageAlreadyInitialized) {
             cleanInputs();
         } else {
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 3549f1614..3beadb0c6 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -1,7 +1,6 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
 import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.details.Details;
@@ -28,6 +27,7 @@
 import pm.axe.utils.VaadinUtils;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 @SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
@@ -60,10 +60,12 @@ public void tabInit(final User user) {
     }
 
     private Section createAccountSection() {
-        Component usernameLayout = createUsernameLayout();
-        Component emailLayout = createEmailLayout();
+        HorizontalLayout usernameLayout = createUsernameLayout();
+        HorizontalLayout emailLayout = createEmailLayout();
         Details emailUsageDetails = createEmailUsageDetails();
-        Component telegramLayout = createTelegramLayout();
+        HorizontalLayout telegramLayout = createTelegramLayout();
+
+        Stream.of(usernameLayout, emailLayout, emailUsageDetails, telegramLayout).forEach(VaadinUtils::setCentered);
 
         Section section = new Section("Accounts");
         section.setContent(usernameLayout, emailLayout, emailUsageDetails, telegramLayout);
@@ -90,7 +92,7 @@ private HorizontalLayout createUsernameLayout() {
         return usernameLayout;
     }
 
-    private Component createEmailLayout() {
+    private HorizontalLayout createEmailLayout() {
         emailField.setLabel("E-mail");
         Optional<String> currentEmail = getCurrentEmail();
         emailField.setReadOnly(true);
@@ -112,7 +114,6 @@ private Component createEmailLayout() {
 
     private HorizontalLayout createTelegramLayout() {
         HorizontalLayout telegramLayout = new HorizontalLayout();
-        VaadinUtils.fitLayoutInWindow(telegramLayout);
         VaadinUtils.setSmallSpacing(telegramLayout);
 
         Optional<Account> telegramAccount = getTelegramAccount();
diff --git a/src/main/java/pm/axe/utils/AxeSessionUtils.java b/src/main/java/pm/axe/utils/AxeSessionUtils.java
index e715b6070..97359948c 100644
--- a/src/main/java/pm/axe/utils/AxeSessionUtils.java
+++ b/src/main/java/pm/axe/utils/AxeSessionUtils.java
@@ -7,6 +7,7 @@
 import pm.axe.db.models.UserSettings;
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.session.AxeSession;
+import pm.axe.users.LandingPage;
 
 import java.util.Optional;
 
@@ -46,4 +47,10 @@ public User boundUserIfAny() {
             return null;
         }
     }
+
+    public LandingPage getLandingPage() {
+        final User user = this.boundUserIfAny();
+        final Optional<UserSettings> us = this.getCurrentUserSettings();
+        return (user != null && us.isPresent()) ? us.get().getLandingPage() : LandingPage.HOME_PAGE;
+    }
 }

From 890cec914201e8c4569af2273ffa88761ea175af Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Thu, 2 Feb 2023 15:57:57 +0200
Subject: [PATCH 44/69] More CSS Stuff (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/profile_page.css                               | 6 ++++++
 .../java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java  | 5 +++++
 .../java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java | 1 +
 3 files changed, 12 insertions(+)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index 6f5dd3f22..3e43f2ea2 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -11,3 +11,9 @@
     padding-left: 0!important;
     padding-right: 0!important;
 }
+
+@media (max-width: 400px) {
+    .fit-in-section {
+        width: min-content;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 3beadb0c6..b960a5a97 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -84,6 +84,7 @@ private HorizontalLayout createUsernameLayout() {
         saveUsernameButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
         usernameLayout.add(usernameField, editUsernameButton);
+        usernameLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(usernameLayout);
         VaadinUtils.setSmallSpacing(usernameLayout);
 
@@ -104,6 +105,7 @@ private HorizontalLayout createEmailLayout() {
         saveEmailButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
         emailLayout.add(emailField, editEmailButton);
+        emailLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(emailLayout);
         VaadinUtils.setSmallSpacing(emailLayout);
 
@@ -114,6 +116,9 @@ private HorizontalLayout createEmailLayout() {
 
     private HorizontalLayout createTelegramLayout() {
         HorizontalLayout telegramLayout = new HorizontalLayout();
+        telegramLayout.setAlignItems(Alignment.BASELINE);
+        telegramLayout.addClassName("fit-in-section");
+        VaadinUtils.fitLayoutInWindow(telegramLayout);
         VaadinUtils.setSmallSpacing(telegramLayout);
 
         Optional<Account> telegramAccount = getTelegramAccount();
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index dca00abf1..d21b01334 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -85,6 +85,7 @@ private VerticalLayout createChangePasswordContent() {
         passwordGenerator.setCopyTarget(newPasswordInput);
         Button updatePasswordButton = new Button("Update");
         updatePasswordButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+        updatePasswordButton.setWidthFull();
         VerticalLayout changePasswordLayout = new VerticalLayout(oldPasswordInput, newPasswordInput,
                 passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);

From 01fc58eaf3f60607ac4ba851b5ce72d3a597e67b Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 3 Feb 2023 12:44:14 +0200
Subject: [PATCH 45/69] LoginPage. Validation (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/LoginPage.java  | 121 ++++++++++++++----
 .../axe/ui/pages/user/RegistrationPage.java   |  29 ++---
 .../java/pm/axe/users/PasswordValidator.java  |  15 ++-
 .../pm/axe/utils/FieldsValidationUtils.java   |  68 ++++++++++
 src/main/java/pm/axe/utils/VaadinUtils.java   |  10 ++
 5 files changed, 198 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/pm/axe/utils/FieldsValidationUtils.java

diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 5f87d95a7..50453947a 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -1,7 +1,6 @@
 package pm.axe.ui.pages.user;
 
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
@@ -23,20 +22,28 @@
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.EmailValidator;
 import pm.axe.Endpoint;
+import pm.axe.db.models.Account;
 import pm.axe.db.models.User;
 import pm.axe.db.models.UserSettings;
+import pm.axe.services.user.AccountService;
 import pm.axe.services.user.UserService;
 import pm.axe.session.AxeSession;
 import pm.axe.ui.MainView;
 import pm.axe.ui.layouts.AxeFormLayout;
+import pm.axe.users.AccountType;
 import pm.axe.users.LandingPage;
 import pm.axe.utils.AppUtils;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.ErrorUtils;
+import pm.axe.utils.FieldsValidationUtils;
 
 import java.util.Objects;
 import java.util.Optional;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 
 @SpringComponent
 @UIScope
@@ -47,7 +54,9 @@
 public class LoginPage extends AxeFormLayout implements BeforeEnterObserver {
     private final AppUtils appUtils;
     private final UserService userService;
+    private final AccountService accountService;
     private final AxeSessionUtils axeSessionUtils;
+    private final FieldsValidationUtils fieldsValidationUtils;
     private final MainView mainView;
 
     private final Span subTitleText = new Span();
@@ -95,8 +104,11 @@ private void init() {
         usernameInput.setLabel("Username/Email");
         usernameInput.setClearButtonVisible(true);
         usernameInput.setRequired(true);
+        usernameInput.addValueChangeListener(this::onUsernameChanged);
+
         passwordInput.setLabel("Password");
         passwordInput.setRequired(true);
+        passwordInput.addValueChangeListener(this::onPasswordChanged);
 
         forgotMe.setLabel("Log me out after");
         forgotMe.setTooltipText("If enabled, Axe will log you out once current session is over");
@@ -124,8 +136,43 @@ private void init() {
         setComponentsAfterSubmitButton(forgotPasswordSection);
     }
 
+    private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<TextField, String> e) {
+        boolean isEmail = EmailValidator.getInstance().isValid(usernameInput.getValue().trim());
+        boolean inputInvalid = isEmail
+                ? fieldsValidationUtils.isEmailInvalid(usernameInput)
+                : fieldsValidationUtils.isUsernameInvalid(usernameInput);
+
+
+        if (!inputInvalid) {
+            usernameInput.setInvalid(false);
+            usernameInput.setErrorMessage("");
+        }
+    }
+
+    private void onPasswordChanged(final AbstractField.ComponentValueChangeEvent<PasswordField, String> e) {
+        boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(passwordInput);
+        if (isPasswordValid) {
+            passwordInput.setInvalid(false);
+            passwordInput.setErrorMessage("");
+        }
+    }
+
     private void onLogin(final ClickEvent<Button> event) {
-        //TODO do fields validation before sending anything
+        String userOrEmail = usernameInput.getValue().trim();
+        boolean isInputEmpty = StringUtils.isBlank(userOrEmail);
+        if (isInputEmpty) {
+            onInvalidInput(usernameInput, "Please type username or email here");
+            return;
+        }
+
+        boolean isEmail = EmailValidator.getInstance().isValid(userOrEmail);
+        boolean userOrEmailInvalid = isEmail
+                ? fieldsValidationUtils.isEmailInvalid(usernameInput)
+                : fieldsValidationUtils.isUsernameInvalid(usernameInput);
+        if (userOrEmailInvalid) return;
+        if (fieldsValidationUtils.isPasswordInvalid(passwordInput)) return;
+
+        //TODO read value of forgotMe and at accordingly
         //FIXME remove after real login progress implemented
         if (appUtils.isDevelopmentModeActivated()) {
             doEasyLogin();
@@ -135,33 +182,53 @@ private void onLogin(final ClickEvent<Button> event) {
     }
 
     private void doEasyLogin() {
-        String username = StringUtils.isNotBlank(usernameInput.getValue()) ? usernameInput.getValue().trim() : "";
-        if (StringUtils.isBlank(username)) {
-            usernameInput.setInvalid(true);
-            usernameInput.setErrorMessage("Please type username or email here");
-        } else if (userService.isUserExists(username)) {
-            AxeSession.getCurrent().ifPresent(axs -> {
-                Optional<User> user = userService.getUserByUsername(username);
-                user.ifPresent(axs::setUser);
-                Optional<UserSettings> us = axeSessionUtils.getCurrentUserSettings();
-                //dark mode
-                if (us.isPresent() && us.get().isDarkMode()) {
-                    axs.getSettings().setDarkMode(true);
-                    mainView.applyTheme(true);
+        AxeSession.getCurrent().ifPresent(axs -> {
+            final String input = usernameInput.getValue().trim();
+            boolean isInputEmail = EmailValidator.getInstance().isValid(input);
+            String username;
+            if (isInputEmail) {
+                Optional<String> usernameFromEmail = getUsernameByEmail(input);
+                if (usernameFromEmail.isPresent()) {
+                    username = usernameFromEmail.get();
+                } else {
+                    ErrorUtils.getErrorNotification("Something went wrong, because try using username instead");
+                    return;
                 }
-                //landing page
-                LandingPage landingPage = axeSessionUtils.getLandingPage(); //page after login
-                usernameInput.getUI().ifPresent(ui -> ui.navigate(landingPage.getPath()));
-            });
-        } else {
-            usernameInput.setInvalid(true);
-            usernameInput.setErrorMessage("No such user found");
-        }
+            } else {
+                username = input;
+            }
+            Optional<User> user = userService.getUserByUsername(username);
+            user.ifPresent(axs::setUser);
+            Optional<UserSettings> us = axeSessionUtils.getCurrentUserSettings();
+            //dark mode
+            if (us.isPresent() && us.get().isDarkMode()) {
+                axs.getSettings().setDarkMode(true);
+                mainView.applyTheme(true);
+            }
+            //landing page
+            LandingPage landingPage = axeSessionUtils.getLandingPage(); //page after login
+            usernameInput.getUI().ifPresent(ui -> ui.navigate(landingPage.getPath()));
+        });
+    }
+
+    private Optional<String> getUsernameByEmail(final String email) {
+        Optional<Account> account = accountService.getAccountByAccountName(email, AccountType.EMAIL);
+        return account.map(owner -> owner.getUser().getUsername());
     }
 
     private void cleanInputs() {
-        usernameInput.clear();
-        passwordInput.clear();
-        forgotMe.clear();
+        cleanInput(usernameInput);
+        cleanInput(passwordInput);
+        cleanInput(forgotMe);
+    }
+
+    private void cleanInput(final Component input) {
+        if (input instanceof HasValue<?,?>) {
+            ((HasValue<?, ?>) input).clear();
+        }
+        if (input instanceof HasValidation) {
+            ((HasValidation) input).setInvalid(false);
+            ((HasValidation) input).setErrorMessage("");
+        }
     }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 9e32646a7..12f046518 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -31,9 +31,11 @@
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.layouts.AxeFormLayout;
 import pm.axe.users.AccountType;
+import pm.axe.users.PasswordValidator;
 import pm.axe.users.UsernameGenerator;
 import pm.axe.users.UsernameValidator;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.FieldsValidationUtils;
 
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -48,13 +50,12 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private static final String USERNAME_EMAIL_LABEL = "Username/Email";
     private static final String JUST_EMAIL_LABEL = "Email";
     private static final int USERNAME_MIN_LEN = 2;
-    private static final int PASSWORD_MIN_LEN = 3;
-    private static final int PASSWORD_MAX_LEN = 71; //BCrypt limitation
 
     private final UsernameGenerator usernameGenerator;
     private final UserService userService;
     private final AccountService accountService;
     private final AxeSessionUtils axeSessionUtils;
+    private final FieldsValidationUtils fieldsValidationUtils;
 
     private final Span subTitleText = new Span();
     private final Anchor subTitleLink = new Anchor();
@@ -167,29 +168,26 @@ private void onUsernameFieldChanged(AbstractField.ComponentValueChangeEvent<Text
     }
 
     private void onPasswordFieldChanged(AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
-        String password = event.getValue();
-        if (StringUtils.isBlank(password)) return;
-        if (password.length() < PASSWORD_MIN_LEN) {
-          onInvalidPassword(String.format("Password is very short. Minimum %d symbols", PASSWORD_MIN_LEN));
-        } else if (password.length() > PASSWORD_MAX_LEN) {
-            onInvalidPassword(String.format("Password is too long. Max %d symbols", PASSWORD_MAX_LEN));
+        boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(passwordInput);
+        if (isPasswordValid) {
+            passwordInput.setInvalid(false);
+            passwordInput.setErrorMessage("");
         }
+
     }
 
     private void onInvalidUserEmail(final String errorMessage) {
         userEmailInput.setInvalid(true);
         userEmailInput.setErrorMessage(errorMessage);
+        userEmailInput.focus();
     }
 
     private void onInvalidUsername(final String errorMessage) {
         usernameInput.setInvalid(true);
         usernameInput.setErrorMessage(errorMessage);
+        usernameInput.focus();
     }
 
-    public void onInvalidPassword(final String errorMessage) {
-        passwordInput.setInvalid(true);
-        passwordInput.setErrorMessage(errorMessage);
-    }
 
     private void onRegister(final ClickEvent<Button> event) {
         Notification.show("Not implemented yet");
@@ -254,13 +252,14 @@ private void setupUserRequirementsSection() {
     private void setupPasswordSection() {
         passwordInput.setLabel("Password");
         passwordInput.setRequired(true);
-        passwordInput.setMinLength(PASSWORD_MIN_LEN);
-        passwordInput.setMaxLength(PASSWORD_MAX_LEN);
+        passwordInput.setMinLength(PasswordValidator.PASSWORD_MIN_LENGTH);
+        passwordInput.setMaxLength(PasswordValidator.PASSWORD_MAX_LENGTH);
         passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
         passwordInput.setClassName("input");
         passwordInput.setHelperText(String.format("Should be %d-%d symbols long. " +
-                "Tip: Use password generator - make it strong.", PASSWORD_MIN_LEN, PASSWORD_MAX_LEN));
+                "Tip: Use password generator - make it strong.",
+                PasswordValidator.PASSWORD_MIN_LENGTH, PasswordValidator.PASSWORD_MAX_LENGTH));
     }
 
     private void setupPasswordGeneratorSection() {
diff --git a/src/main/java/pm/axe/users/PasswordValidator.java b/src/main/java/pm/axe/users/PasswordValidator.java
index c219f65fc..daadf45f0 100644
--- a/src/main/java/pm/axe/users/PasswordValidator.java
+++ b/src/main/java/pm/axe/users/PasswordValidator.java
@@ -12,9 +12,14 @@
  * Contains 3+ chars
  */
 public final class PasswordValidator {
-    private static final int PASSWORD_MIN_LENGTH = 3;
-    private static final String ERR_EMPTY_PASSWORD = "Password cannot be empty";
-    private static final String ERR_SHORT_PASSWORD = "Password is too short";
+    public static final int PASSWORD_MIN_LENGTH = 3;
+    public static final int PASSWORD_MAX_LENGTH = 71; //BCrypt limitation
+
+    public static final String ERR_EMPTY_PASSWORD = "Password cannot be empty";
+    public static final String ERR_SHORT_PASSWORD =
+            String.format("Password is very short. Minimum %d symbols", PASSWORD_MIN_LENGTH);
+    public static final String ERR_LONG_PASSWORD =
+            String.format("Password is too long. Max %d symbols", PASSWORD_MAX_LENGTH);
 
     private PasswordValidator() {
         throw new UnsupportedOperationException("Utility class");
@@ -33,6 +38,10 @@ public static OperationResult isPasswordValid(final String password) {
         if (password.length() < PASSWORD_MIN_LENGTH) {
             return OperationResult.malformedInput().withMessage(ERR_SHORT_PASSWORD);
         }
+        if (password.length() > PASSWORD_MAX_LENGTH) {
+            return OperationResult.malformedInput().withMessage(ERR_LONG_PASSWORD);
+        }
+
         return OperationResult.success();
     }
 }
diff --git a/src/main/java/pm/axe/utils/FieldsValidationUtils.java b/src/main/java/pm/axe/utils/FieldsValidationUtils.java
new file mode 100644
index 000000000..dbea4de03
--- /dev/null
+++ b/src/main/java/pm/axe/utils/FieldsValidationUtils.java
@@ -0,0 +1,68 @@
+package pm.axe.utils;
+
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.spring.annotation.UIScope;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.EmailValidator;
+import org.springframework.stereotype.Component;
+import pm.axe.result.OperationResult;
+import pm.axe.services.user.AccountService;
+import pm.axe.services.user.UserService;
+import pm.axe.users.AccountType;
+import pm.axe.users.PasswordValidator;
+
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
+@RequiredArgsConstructor
+@Component
+@UIScope
+public class FieldsValidationUtils {
+    private final AccountService accountService;
+    private final UserService userService;
+
+    public boolean isUsernameInvalid(final TextField usernameInput) {
+        String userOrEmail = usernameInput.getValue().trim();
+        boolean isInputEmpty = StringUtils.isBlank(userOrEmail);
+        if (isInputEmpty) {
+            return true;
+        }
+
+        boolean isUserExists = userService.isUserExists(userOrEmail);
+        if (!isUserExists) {
+            onInvalidInput(usernameInput, "No such user found");
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isEmailInvalid(final TextField emailInput) {
+        final String email = emailInput.getValue().trim();
+        boolean isEmail = EmailValidator.getInstance().isValid(email);
+        if (!isEmail) {
+            onInvalidInput(emailInput, "Given string is not email");
+            return true;
+        }
+        boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
+        if (!emailExists) {
+            onInvalidInput(emailInput, "No user with given email found");
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isPasswordInvalid(final PasswordField passwordInput) {
+        String password = passwordInput.getValue().trim();
+        OperationResult passwordValidationOp = PasswordValidator.isPasswordValid(password);
+        if (passwordValidationOp.notOk()) {
+            String errorMessage = passwordValidationOp.getMessage();
+            onInvalidInput(passwordInput, errorMessage);
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/pm/axe/utils/VaadinUtils.java b/src/main/java/pm/axe/utils/VaadinUtils.java
index 817ee90d6..c11052149 100644
--- a/src/main/java/pm/axe/utils/VaadinUtils.java
+++ b/src/main/java/pm/axe/utils/VaadinUtils.java
@@ -1,6 +1,8 @@
 package pm.axe.utils;
 
+import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasStyle;
+import com.vaadin.flow.component.HasValidation;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.BeforeEvent;
@@ -74,4 +76,12 @@ public static void setCentered(final HasStyle component) {
     public static void setFlex(final HasStyle component, final String flexValue) {
         component.getStyle().set("flex", flexValue);
     }
+
+    public static void onInvalidInput(final HasValidation component, final String errorMessage) {
+        component.setInvalid(true);
+        component.setErrorMessage(errorMessage);
+        if (component instanceof Focusable<?>) {
+            ((Focusable<?>) component).focus();
+        }
+    }
 }

From cf96c5118e1c889ace712cc58a8959943e24ee69 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 3 Feb 2023 15:58:14 +0200
Subject: [PATCH 46/69] RegistrationPage. Validation (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/LoginPage.java  |  27 +-
 .../axe/ui/pages/user/RegistrationPage.java   | 251 +++++++++++-------
 src/main/java/pm/axe/utils/ErrorUtils.java    |   9 +
 src/main/java/pm/axe/utils/VaadinUtils.java   |  14 +-
 4 files changed, 179 insertions(+), 122 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/LoginPage.java b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
index 50453947a..2a41cac75 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginPage.java
@@ -1,6 +1,8 @@
 package pm.axe.ui.pages.user;
 
-import com.vaadin.flow.component.*;
+import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
@@ -34,10 +36,7 @@
 import pm.axe.ui.layouts.AxeFormLayout;
 import pm.axe.users.AccountType;
 import pm.axe.users.LandingPage;
-import pm.axe.utils.AppUtils;
-import pm.axe.utils.AxeSessionUtils;
-import pm.axe.utils.ErrorUtils;
-import pm.axe.utils.FieldsValidationUtils;
+import pm.axe.utils.*;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -191,7 +190,7 @@ private void doEasyLogin() {
                 if (usernameFromEmail.isPresent()) {
                     username = usernameFromEmail.get();
                 } else {
-                    ErrorUtils.getErrorNotification("Something went wrong, because try using username instead");
+                    ErrorUtils.showErrorNotification("Something went wrong, because try using username instead");
                     return;
                 }
             } else {
@@ -217,18 +216,8 @@ private Optional<String> getUsernameByEmail(final String email) {
     }
 
     private void cleanInputs() {
-        cleanInput(usernameInput);
-        cleanInput(passwordInput);
-        cleanInput(forgotMe);
-    }
-
-    private void cleanInput(final Component input) {
-        if (input instanceof HasValue<?,?>) {
-            ((HasValue<?, ?>) input).clear();
-        }
-        if (input instanceof HasValidation) {
-            ((HasValidation) input).setInvalid(false);
-            ((HasValidation) input).setErrorMessage("");
-        }
+        VaadinUtils.cleanInput(usernameInput);
+        VaadinUtils.cleanInput(passwordInput);
+        VaadinUtils.cleanInput(forgotMe);
     }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 12f046518..82dcf820a 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -9,7 +9,6 @@
 import com.vaadin.flow.component.html.ListItem;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.html.UnorderedList;
-import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import com.vaadin.flow.component.textfield.TextField;
@@ -35,11 +34,15 @@
 import pm.axe.users.UsernameGenerator;
 import pm.axe.users.UsernameValidator;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.ErrorUtils;
 import pm.axe.utils.FieldsValidationUtils;
+import pm.axe.utils.VaadinUtils;
 
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 @SpringComponent
 @UIScope
 @RequiredArgsConstructor
@@ -79,6 +82,7 @@ public void beforeEnter(BeforeEnterEvent enterEvent) {
         //init once
         if (pageAlreadyInitialized) {
             cleanInputs();
+            hideUsernameRequirements();
         } else {
             pageInit();
             pageAlreadyInitialized = true;
@@ -109,13 +113,80 @@ private void pageInit() {
         getSubmitButton().addClickListener(this::onRegister);
     }
 
-    private void cleanInputs() {
-        userEmailInput.clear();
-        passwordInput.clear();
-        usernameInput.clear();
+    private void setupUserEmailSection() {
+        userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
+        userEmailInput.setRequired(true);
+        userEmailInput.setMinLength(USERNAME_MIN_LEN);
+        userEmailInput.setClearButtonVisible(true);
+        userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        userEmailInput.addValueChangeListener(this::onUserEmailChanged);
+        userEmailInput.setHelperText("Valid email address or avaialble username");
+        userEmailInput.setClassName("input");
     }
 
-    private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+    private void setupUsernameSection() {
+        usernameInput.setLabel("Username");
+        usernameInput.setMinLength(USERNAME_MIN_LEN);
+        usernameInput.setClearButtonVisible(true);
+        usernameInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        usernameInput.addValueChangeListener(this::onUsernameChanged);
+        usernameInput.setHelperText("You can use both as login");
+        usernameInput.setClassName("input");
+    }
+
+    private void setupUserRequirementsSection() {
+        usernameRequirements.setSummaryText("Username requirements");
+        Span span = new Span("Username should be");
+
+        UnorderedList requirements = new UnorderedList();
+        requirements.removeAll();
+        Stream.of("The number of characters must be between 2 and 20.",
+                        "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
+                        "Also allowed of the dot (.), underscore (_), and hyphen (-).",
+                        "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
+                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
+                .forEach(requirement -> requirements.add(new ListItem(requirement)));
+
+        usernameRequirements.addContent(span, requirements);
+        usernameRequirements.setOpened(false);
+    }
+
+    private void setupPasswordSection() {
+        passwordInput.setLabel("Password");
+        passwordInput.setRequired(true);
+        passwordInput.setMinLength(PasswordValidator.PASSWORD_MIN_LENGTH);
+        passwordInput.setMaxLength(PasswordValidator.PASSWORD_MAX_LENGTH);
+        passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
+        passwordInput.addValueChangeListener(this::onPasswordChanged);
+        passwordInput.setClassName("input");
+        passwordInput.setHelperText(String.format("Should be %d-%d symbols long. " +
+                        "Tip: Use password generator - make it strong.",
+                PasswordValidator.PASSWORD_MIN_LENGTH, PasswordValidator.PASSWORD_MAX_LENGTH));
+    }
+
+    private void setupPasswordGeneratorSection() {
+        passwordGenerator.setCopyTarget(passwordInput);
+        passwordGenerator.setOpened(false);
+    }
+
+    private VerticalLayout createLegalInfo() {
+        Span encryptedSpan = new Span("Data stored encrypted.");
+        Span tosStart = new Span("By signing up, you accept our ");
+        Anchor linkToTerms = new Anchor();
+        linkToTerms.setHref(Endpoint.UI.TOS_PAGE);
+        linkToTerms.setText("Terms of Service");
+
+        Span tosEnd = new Span(".");
+
+        Span tosSpan = new Span(tosStart, linkToTerms, tosEnd);
+        VerticalLayout legalInfoLayout = new VerticalLayout(encryptedSpan, tosSpan);
+        legalInfoLayout.setPadding(false);
+        legalInfoLayout.setSpacing(false);
+        return legalInfoLayout;
+    }
+
+    private void onUserEmailChanged(final AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        hideUsernameRequirements();
         String input = event.getValue().trim();
         boolean isInputEmpty = StringUtils.isBlank(input);
         if (isInputEmpty) {
@@ -136,61 +207,113 @@ private void onUserEmailFieldChanged(AbstractField.ComponentValueChangeEvent<Tex
                 //check if it exists
                 boolean alreadyExists = accountService.isAccountAlreadyExists(input, AccountType.EMAIL);
                 if (alreadyExists) {
-                    onInvalidUserEmail("Email already taken");
+                    onInvalidInput(userEmailInput, "Email already taken");
                 }
             }
         } else {
             hideUsernameField();
             updateLabelForUserEmailInput();
             //input is username
-            OperationResult usernameValidation = UsernameValidator.isValid(input);
-            if (usernameValidation.ok()) {
-                if (userService.isUserExists(input)) {
-                    onInvalidUserEmail("Username already taken");
-                }
-            } else {
-                onInvalidUserEmail("Username doesn't meet requirements");
+            final boolean isUsernameValid = !isUsernameInvalid(userEmailInput);
+            if (isUsernameValid) {
+                userEmailInput.setInvalid(false);
+                userEmailInput.setErrorMessage("");
             }
         }
     }
 
-    private void onUsernameFieldChanged(AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+    private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        hideUsernameRequirements();
         final String username = event.getValue().trim();
         if (StringUtils.isBlank(username)) return;
         OperationResult usernameValidation = UsernameValidator.isValid(username);
         if (usernameValidation.ok()) {
             if (userService.isUserExists(username)) {
-                onInvalidUsername("Username already exists");
+                onInvalidInput(usernameInput, "Username already exists");
             }
         } else {
-            onInvalidUsername("Username doesn't meet requirements");
+            onInvalidInput(usernameInput, "Username doesn't meet requirements");
+            showUsernameRequirements();
         }
     }
 
-    private void onPasswordFieldChanged(AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+    private void onPasswordChanged(AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
         boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(passwordInput);
         if (isPasswordValid) {
             passwordInput.setInvalid(false);
             passwordInput.setErrorMessage("");
         }
+    }
+
+    private void onRegister(final ClickEvent<Button> event) {
+        final String usernameOrEmail = userEmailInput.getValue().trim();
+        boolean isUserEmailInputEmpty = StringUtils.isBlank(usernameOrEmail);
+        if (isUserEmailInputEmpty) {
+            onInvalidInput(userEmailInput, "Please type username or email here");
+            return;
+        }
+        boolean isInputEmail = EmailValidator.getInstance().isValid(usernameOrEmail);
+        if (isInputEmail) {
+            //email
+            boolean emailExists = accountService.isAccountAlreadyExists(usernameOrEmail, AccountType.EMAIL);
+            if (emailExists) {
+                onInvalidInput(userEmailInput, "Email already taken");
+                return;
+            }
+        } else {
+            //username
+            if (isUsernameInvalid(userEmailInput)) {
+                return;
+            }
+        }
 
+        //username
+        if (isUsernameInputVisible()) {
+            if (isUsernameInvalid(usernameInput)) {
+                return;
+            }
+        }
+
+        //password
+        if (fieldsValidationUtils.isPasswordInvalid(passwordInput)) {
+            return;
+        }
+
+        //all field are valid - let's do registration
+        doRegistration();
     }
 
-    private void onInvalidUserEmail(final String errorMessage) {
-        userEmailInput.setInvalid(true);
-        userEmailInput.setErrorMessage(errorMessage);
-        userEmailInput.focus();
+    private void doRegistration() {
+        ErrorUtils.showErrorNotification("Registration is still not implemented yet");
     }
 
-    private void onInvalidUsername(final String errorMessage) {
-        usernameInput.setInvalid(true);
-        usernameInput.setErrorMessage(errorMessage);
-        usernameInput.focus();
+    private boolean isUsernameInvalid(final TextField inputField) {
+        final String input = inputField.getValue().trim();
+        OperationResult usernameValidation = UsernameValidator.isValid(input);
+        if (usernameValidation.ok()) {
+            if (userService.isUserExists(input)) {
+                onInvalidInput(inputField, "Username already taken");
+                return true;
+            }
+        } else {
+            onInvalidInput(inputField, "Username doesn't meet requirements");
+            showUsernameRequirements();
+            return true;
+        }
+        return false;
     }
 
+    private void cleanInputs() {
+        VaadinUtils.cleanInput(userEmailInput);
+        VaadinUtils.cleanInput(passwordInput);
+        VaadinUtils.cleanInput(usernameInput);
+    }
 
-    private void onRegister(final ClickEvent<Button> event) {
-        Notification.show("Not implemented yet");
+    private void hideUsernameRequirements() {
+        usernameRequirements.setVisible(false);
+    }
+    private void showUsernameRequirements() {
+        usernameRequirements.setVisible(true);
     }
 
     private boolean isUsernameInputVisible() {
@@ -210,76 +333,4 @@ private void updateLabelForUserEmailInput() {
             userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
         }
     }
-
-    private void setupUserEmailSection() {
-        userEmailInput.setLabel(USERNAME_EMAIL_LABEL);
-        userEmailInput.setRequired(true);
-        userEmailInput.setMinLength(USERNAME_MIN_LEN);
-        userEmailInput.setClearButtonVisible(true);
-        userEmailInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
-        userEmailInput.addValueChangeListener(this::onUserEmailFieldChanged);
-        userEmailInput.setHelperText("Valid email address or avaialble username");
-        userEmailInput.setClassName("input");
-    }
-
-    private void setupUsernameSection() {
-        usernameInput.setLabel("Username");
-        usernameInput.setMinLength(USERNAME_MIN_LEN);
-        usernameInput.setClearButtonVisible(true);
-        usernameInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
-        usernameInput.addValueChangeListener(this::onUsernameFieldChanged);
-        usernameInput.setHelperText("You can use both as login");
-        usernameInput.setClassName("input");
-    }
-
-    private void setupUserRequirementsSection() {
-        usernameRequirements.setSummaryText("Username requirements");
-        Span span = new Span("Username should be");
-
-        UnorderedList requirements = new UnorderedList();
-        requirements.removeAll();
-        Stream.of("The number of characters must be between 2 and 20.",
-                        "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
-                        "Also allowed of the dot (.), underscore (_), and hyphen (-).",
-                        "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
-                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
-                .forEach(requirement -> requirements.add(new ListItem(requirement)));
-
-        usernameRequirements.addContent(span, requirements);
-        usernameRequirements.setOpened(false);
-    }
-
-    private void setupPasswordSection() {
-        passwordInput.setLabel("Password");
-        passwordInput.setRequired(true);
-        passwordInput.setMinLength(PasswordValidator.PASSWORD_MIN_LENGTH);
-        passwordInput.setMaxLength(PasswordValidator.PASSWORD_MAX_LENGTH);
-        passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
-        passwordInput.addValueChangeListener(this::onPasswordFieldChanged);
-        passwordInput.setClassName("input");
-        passwordInput.setHelperText(String.format("Should be %d-%d symbols long. " +
-                "Tip: Use password generator - make it strong.",
-                PasswordValidator.PASSWORD_MIN_LENGTH, PasswordValidator.PASSWORD_MAX_LENGTH));
-    }
-
-    private void setupPasswordGeneratorSection() {
-        passwordGenerator.setCopyTarget(passwordInput);
-        passwordGenerator.setOpened(false);
-    }
-
-    private VerticalLayout createLegalInfo() {
-        Span encryptedSpan = new Span("Data stored encrypted.");
-        Span tosStart = new Span("By signing up, you accept our ");
-        Anchor linkToTerms = new Anchor();
-        linkToTerms.setHref(Endpoint.UI.TOS_PAGE);
-        linkToTerms.setText("Terms of Service");
-
-        Span tosEnd = new Span(".");
-
-        Span tosSpan = new Span(tosStart, linkToTerms, tosEnd);
-        VerticalLayout legalInfoLayout = new VerticalLayout(encryptedSpan, tosSpan);
-        legalInfoLayout.setPadding(false);
-        legalInfoLayout.setSpacing(false);
-        return legalInfoLayout;
-    }
 }
diff --git a/src/main/java/pm/axe/utils/ErrorUtils.java b/src/main/java/pm/axe/utils/ErrorUtils.java
index 1c80880c4..ae87e1e4c 100644
--- a/src/main/java/pm/axe/utils/ErrorUtils.java
+++ b/src/main/java/pm/axe/utils/ErrorUtils.java
@@ -65,6 +65,15 @@ public static Notification getErrorNotification(final String text) {
         return AppUtils.getNotification(text, NotificationVariant.LUMO_ERROR);
     }
 
+    /**
+     * Creates error notification with {@link #getErrorNotification(String)} and shows it.
+     *
+     * @param text string with error
+     */
+    public static void showErrorNotification(final String text) {
+        getErrorNotification(text).open();
+    }
+
     /**
      * Extracts {@link AxeError} from {@link BeforeEvent}.
      *
diff --git a/src/main/java/pm/axe/utils/VaadinUtils.java b/src/main/java/pm/axe/utils/VaadinUtils.java
index c11052149..9d11055db 100644
--- a/src/main/java/pm/axe/utils/VaadinUtils.java
+++ b/src/main/java/pm/axe/utils/VaadinUtils.java
@@ -1,8 +1,6 @@
 package pm.axe.utils;
 
-import com.vaadin.flow.component.Focusable;
-import com.vaadin.flow.component.HasStyle;
-import com.vaadin.flow.component.HasValidation;
+import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.BeforeEvent;
@@ -84,4 +82,14 @@ public static void onInvalidInput(final HasValidation component, final String er
             ((Focusable<?>) component).focus();
         }
     }
+
+    public static void cleanInput(final Component input) {
+        if (input instanceof HasValue<?,?>) {
+            ((HasValue<?, ?>) input).clear();
+        }
+        if (input instanceof HasValidation) {
+            ((HasValidation) input).setInvalid(false);
+            ((HasValidation) input).setErrorMessage("");
+        }
+    }
 }

From 4b498a8aed6a7389b445e126ca4c2767a93517b7 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 3 Feb 2023 16:37:33 +0200
Subject: [PATCH 47/69] Notification updates (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java     | 2 +-
 .../java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index d21b01334..9ca6ff450 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -201,7 +201,7 @@ private void saveResetPasswordChannel(final AccountType accountType) {
         if (userSettings.isPresent()) {
             userSettings.get().setPasswordResetChannel(accountType);
             userSettingsService.updateUserSettings(userSettings.get());
-            Notification.show("Saved");
+            Notification.show("Reset Password Channel updated!");
         } else {
             Notification.show("Failed to save. System error.");
         }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index d0f28fa0e..7f6ebc8a7 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -132,7 +132,7 @@ private void onLandingPageSelectChanged(AbstractField.ComponentValueChangeEvent<
         if (userSettings.isPresent()) {
             userSettings.get().setLandingPage(landingPage);
             uss.updateUserSettings(userSettings.get());
-            Notification.show("Saved");
+            Notification.show("Landing page updated!");
         }
     }
 

From 656dc1758699ed271b0c569269b64ae3361eaffc Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 3 Feb 2023 21:58:57 +0200
Subject: [PATCH 48/69] Notification updates 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pages/user/profile/tabs/SecurityTab.java  | 32 +++++++++++++++----
 src/main/java/pm/axe/utils/AppUtils.java      | 30 ++++++++++++++++-
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index 9ca6ff450..eaa64f668 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -7,7 +7,6 @@
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.Label;
 import com.vaadin.flow.component.html.Span;
-import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.select.Select;
@@ -27,7 +26,9 @@
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.elements.Section;
 import pm.axe.users.AccountType;
+import pm.axe.utils.AppUtils;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.ErrorUtils;
 import pm.axe.utils.VaadinUtils;
 
 import java.util.List;
@@ -56,9 +57,13 @@ public class SecurityTab extends VerticalLayout implements HasTabInit {
     private Select<String> tfaChannelSelect;
     private User user;
 
+    private boolean isClientChange;
+
     @Override
     public void tabInit(final User user) {
         this.user = user;
+        //automatic starts changing values - disabling notifications
+        isClientChange = false;
 
         confirmedAccounts = getConfirmedAccountsFor(user);
 
@@ -67,6 +72,9 @@ public void tabInit(final User user) {
         tfaSection = createTfaSection();
 
         add(changePasswordSection, resetPasswordChannelSection, tfaSection);
+
+        //automatic set all values, all other actions are from client.
+        isClientChange = true;
     }
 
     private Section createChangePasswordSection() {
@@ -201,9 +209,9 @@ private void saveResetPasswordChannel(final AccountType accountType) {
         if (userSettings.isPresent()) {
             userSettings.get().setPasswordResetChannel(accountType);
             userSettingsService.updateUserSettings(userSettings.get());
-            Notification.show("Reset Password Channel updated!");
+            notifyAboutSuccess("Reset Password Channel updated!");
         } else {
-            Notification.show("Failed to save. System error.");
+            notifyAboutError("Failed to save reset password channel. System error.");
         }
     }
 
@@ -227,7 +235,7 @@ private void onTfaBoxChanged(final AbstractField.ComponentValueChangeEvent<Check
             } else {
                 //should never happen
                 tfaBox.setValue(false);
-                Notification.show("Failed to save. No valid and confirmed 2FA channels exist yet");
+                notifyAboutError("Failed to save. No valid and confirmed 2FA channels exist yet");
                 return;
             }
         } else {
@@ -256,10 +264,10 @@ private void saveTfa(final AccountType tfaChannel) {
             userSettings.get().setTfaEnabled(tfaBox.getValue());
             userSettings.get().setTfaChannel(tfaChannel);
             userSettingsService.updateUserSettings(userSettings.get());
-            Notification.show("Saved");
+            notifyAboutSuccess("Two-Factor Authentication Settings updated!");
         } else {
             tfaBox.setEnabled(false);
-            Notification.show("Failed to save. System error.");
+            notifyAboutError("Failed to save 2FA Settings. System error.");
         }
     }
 
@@ -284,4 +292,16 @@ private Span getNoWhereToSendSpan() {
         Span last = new Span(".");
         return new Span(first, link, last);
     }
+
+    private void notifyAboutSuccess(final String notificationText) {
+        if (isClientChange) {
+            AppUtils.showSuccessNotification(notificationText);
+        }
+    }
+
+    private void notifyAboutError(final String errorText) {
+        if (isClientChange) {
+            ErrorUtils.showErrorNotification(errorText);
+        }
+    }
 }
diff --git a/src/main/java/pm/axe/utils/AppUtils.java b/src/main/java/pm/axe/utils/AppUtils.java
index a16e7f8c9..b5040c900 100644
--- a/src/main/java/pm/axe/utils/AppUtils.java
+++ b/src/main/java/pm/axe/utils/AppUtils.java
@@ -11,6 +11,8 @@
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.notification.NotificationVariant;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
@@ -44,6 +46,8 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+import static com.vaadin.flow.component.button.ButtonVariant.LUMO_TERTIARY_INLINE;
+
 /**
  * App-wide tools.
  *
@@ -327,6 +331,22 @@ public static Notification getNotification(final String text, final Notification
         return notification;
     }
 
+    public static void showSuccessNotification(final String text) {
+        Notification notification = new Notification();
+        notification.addThemeVariants(NotificationVariant.LUMO_SUCCESS);
+        notification.setPosition(Notification.Position.MIDDLE);
+        notification.setDuration(Axe.Defaults.NOTIFICATION_DURATION_MILLIS); //1.5 seconds
+
+        Icon icon = VaadinIcon.CHECK_CIRCLE.create();
+        Div info = new Div(new Text(text));
+
+        HorizontalLayout layout = new HorizontalLayout(icon, info, createCloseBtn(notification));
+        layout.setAlignItems(FlexComponent.Alignment.CENTER);
+
+        notification.add(layout);
+        notification.open();
+    }
+
     /**
      * Creates Session Expired Notification.
      *
@@ -355,7 +375,7 @@ public static Notification getSessionExpiredNotification(final UI ui, final AxeS
         Div text = new Div(new Text(message));
 
         Button pageRefreshButton = new Button("Refresh Page", event -> ui.getPage().reload());
-        pageRefreshButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+        pageRefreshButton.addThemeVariants(LUMO_TERTIARY_INLINE);
 
         Button closeButton = new Button("Dismiss", event -> notification.close());
         closeButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_SMALL);
@@ -692,4 +712,12 @@ private static boolean clientWantsJson(final String acceptHeader) {
             return acceptHeader.equals(MimeTypes.JSON);
         }
     }
+
+    private static Button createCloseBtn(final Notification notification) {
+        Button closeBtn = new Button(VaadinIcon.CLOSE_SMALL.create(),
+                clickEvent -> notification.close());
+        closeBtn.addThemeVariants(LUMO_TERTIARY_INLINE);
+
+        return closeBtn;
+    }
 }

From a1f9a3923a73f9c3302c5611eeda43f8e0077b81 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 8 Feb 2023 12:28:15 +0200
Subject: [PATCH 49/69] DangerZone is done (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 frontend/css/danger_dialog.css                |  20 ++
 .../axe/ui/elements/DangerActionDialog.java   | 186 ++++++++++++++++++
 .../user/profile/tabs/DangerZoneTab.java      |  79 +++++++-
 3 files changed, 279 insertions(+), 6 deletions(-)
 create mode 100644 frontend/css/danger_dialog.css
 create mode 100644 src/main/java/pm/axe/ui/elements/DangerActionDialog.java

diff --git a/frontend/css/danger_dialog.css b/frontend/css/danger_dialog.css
new file mode 100644
index 000000000..954967604
--- /dev/null
+++ b/frontend/css/danger_dialog.css
@@ -0,0 +1,20 @@
+html {
+    --axe-warning-zone-color: rgb(231 235 239);
+}
+
+html[theme="dark"] {
+    --axe-warning-zone-color: rgb(55 72 95);
+}
+
+.danger-dialog {
+    max-width: min(501px,97%);
+}
+
+.italic-text {
+    font-style: italic;
+}
+
+.danger-dialog-warning-zone {
+    background: var(--axe-warning-zone-color);
+}
+
diff --git a/src/main/java/pm/axe/ui/elements/DangerActionDialog.java b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
new file mode 100644
index 000000000..1ec1c2ac0
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
@@ -0,0 +1,186 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.Text;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.html.H3;
+import com.vaadin.flow.component.html.Hr;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.shared.Registration;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.internal.Callback;
+
+/**
+ * Confirmation Dialog for actions in {@link pm.axe.ui.pages.user.profile.tabs.DangerZoneTab}.
+ *
+ */
+@CssImport("./css/danger_dialog.css")
+public final class DangerActionDialog extends Composite<Dialog> {
+
+    private final H3 title = new H3("Confirm Action");
+
+    private final Span messageSpan = new Span("Proceed below to do this action.");
+
+    private final VerticalLayout warningZone = new VerticalLayout();
+    private final Span warningTextSpan = new Span("Are you sure? This action cannot be undone.");
+
+    private final VerticalLayout confirmationZone = new VerticalLayout();
+    private final Span confirmationTextSpan = new Span("confirm");
+    private final TextField confirmInput = new TextField();
+
+    private final HorizontalLayout buttonLayout = new HorizontalLayout();
+
+    private final Button cancelButton = new Button("Cancel");
+    private final Button actionButton = new Button("Proceed");
+
+    private final Dialog dialog = getContent();
+    private Registration defaultButtonAction;
+
+    /**
+     * Creates dialog. Created dialog ain't open automatically.
+     *
+     * @return created {@link DangerActionDialog} for further modification.
+     */
+    public static DangerActionDialog create() {
+        return new DangerActionDialog();
+    }
+
+    public void setTitleText(final String newTitleText) {
+        if (newTitleText.isBlank()) {
+            title.setVisible(false);
+        }
+        title.setText(newTitleText);
+    }
+
+    public void setMessage(final String message) {
+        if (StringUtils.isBlank(message)) {
+            messageSpan.setVisible(false);
+        }
+        messageSpan.setText(message);
+    }
+
+    public void setWarningText(final String warningText) {
+        if (StringUtils.isBlank(warningText)) {
+            warningZone.setVisible(false);
+        }
+        warningTextSpan.setText(warningText);
+    }
+
+    public void setConfirmationText(final String confirmationText) {
+        if (StringUtils.isBlank(confirmationText)) {
+            confirmationZone.setVisible(false);
+        }
+        confirmationTextSpan.setText(confirmationText);
+    }
+
+    /**
+     * Sets action performed when user pressed Delete Button.
+     *
+     * @param callback callable method in lambda.
+     */
+    public void setActionButtonAction(final Callback callback) {
+        defaultButtonAction.remove();
+        this.actionButton.addClickListener(e -> {
+            boolean isConfirmed = checkConfirmationInput();
+            if (!isConfirmed) {
+                confirmInput.setInvalid(true);
+                confirmInput.setErrorMessage("Please type exactly '" + confirmationTextSpan.getText() +"'");
+                return;
+            }
+            callback.execute();
+            dialog.close();
+        });
+    }
+
+    public void setActionButtonText(final String text) {
+        if (StringUtils.isNotBlank(text)) {
+            actionButton.setText(text);
+        }
+    }
+
+    /**
+     * Displays dialog.
+     */
+    public void show() {
+        this.dialog.open();
+    }
+
+    private DangerActionDialog() {
+        VerticalLayout dialogLayout = createDialogLayout();
+        setClassNames();
+        dialog.add(dialogLayout);
+    }
+
+    private void setClassNames() {
+        dialog.setClassName("danger-dialog");
+        title.setClassName("danger-dialog-title");
+        messageSpan.setClassName("danger-dialog-message");
+        warningZone.setClassName("danger-dialog-warning-zone");
+        confirmationTextSpan.setClassName("italic-text");
+        buttonLayout.setClassName("danger-dialog-buttons");
+        cancelButton.setClassName("danger-dialog-cancel-btn");
+        actionButton.setClassName("danger-dialog-action-btn");
+    }
+
+    private VerticalLayout createDialogLayout() {
+        //warning zone
+        Icon warningIcon = VaadinIcon.WARNING.create();
+        Text warningTitle = new Text("warning".toUpperCase());
+        HorizontalLayout warningLayout = new HorizontalLayout(warningIcon, warningTitle);
+        warningLayout.setAlignItems(FlexComponent.Alignment.CENTER);
+
+        warningZone.add(warningLayout, warningTextSpan);
+
+        //confirmation zone
+        Span confirmMessageFirst = new Span("Type ");
+        Span confirmMessageLast = new Span(" to confirm");
+
+        Span confirmMessage = new Span(confirmMessageFirst, confirmationTextSpan, confirmMessageLast);
+        confirmInput.setWidthFull();
+
+        confirmationZone.add(confirmMessage, confirmInput);
+        confirmationZone.setPadding(false);
+
+        //by default - no action
+        cancelButton.addClickListener(e -> dialog.close());
+        defaultButtonAction = actionButton.addClickListener(e -> dialog.close());
+
+        //buttons and button layout
+        actionButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_ERROR);
+        cancelButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+
+        buttonLayout.add(cancelButton, actionButton);
+        buttonLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
+
+        Hr firstLine = new Hr();
+        Hr secondLine = new Hr();
+
+        VerticalLayout dialogLayout = new VerticalLayout(title, firstLine,
+                messageSpan, warningZone, confirmationZone,
+                secondLine, buttonLayout);
+        dialogLayout.setPadding(false);
+        dialogLayout.setAlignItems(FlexComponent.Alignment.STRETCH);
+        dialogLayout.setClassName("delete-dialog");
+
+        return dialogLayout;
+    }
+
+    private boolean checkConfirmationInput() {
+        if (!confirmationZone.isVisible()) { return true; }
+
+        String inputText = confirmInput.getValue();
+        if (StringUtils.isBlank(inputText)) return false;
+
+        String confirmationText = confirmationTextSpan.getText();
+        return inputText.trim().equals(confirmationText);
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index 2a8f824e0..9dcb6f917 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -4,7 +4,6 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.spring.annotation.SpringComponent;
@@ -12,9 +11,13 @@
 import lombok.RequiredArgsConstructor;
 import pm.axe.db.models.User;
 import pm.axe.internal.HasTabInit;
+import pm.axe.ui.elements.DangerActionDialog;
 import pm.axe.ui.elements.Section;
+import pm.axe.utils.AppUtils;
 import pm.axe.utils.VaadinUtils;
 
+import java.util.stream.Stream;
+
 
 @RequiredArgsConstructor
 @SpringComponent
@@ -39,26 +42,90 @@ private void createDeleteAccountSection() {
     private Component deleteAccountSectionContent() {
         deleteAccountSection.getTitle().addClassName("bold");
 
+        Button deAuthSessionsButton = new Button("Deauthorize Sessions");
+        deAuthSessionsButton.addClickListener(this::onDeAuthSessions);
+
         Button deleteAccountOnlyButton = new Button("Delete Account");
-        deleteAccountOnlyButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
         deleteAccountOnlyButton.addClickListener(this::onDeleteAccount);
 
         Button deleteAccountAndLinksButton = new Button("Delete Account and Links");
-        deleteAccountAndLinksButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
         deleteAccountAndLinksButton.addClickListener(this::onDeleteAccountAndLinks);
 
-        HorizontalLayout layout = new HorizontalLayout(deleteAccountOnlyButton, deleteAccountAndLinksButton);
+        Stream.of(deAuthSessionsButton, deleteAccountOnlyButton, deleteAccountAndLinksButton)
+                .forEach(b -> b.addThemeVariants(ButtonVariant.LUMO_ERROR));
+
+        HorizontalLayout layout = new HorizontalLayout(deAuthSessionsButton,
+                deleteAccountOnlyButton, deleteAccountAndLinksButton);
         VaadinUtils.fitLayoutInWindow(layout);
         return layout;
     }
 
+    private void onDeAuthSessions(final ClickEvent<Button> event) {
+        if (user == null) return; //no user - no action
+        DangerActionDialog dialog = deAuthSessionDialog();
+        dialog.show();
+    }
+
     private void onDeleteAccount(final ClickEvent<Button> event) {
         if (user == null) return; //no user - no action
-        Notification.show("Will do once they implement me");
+        DangerActionDialog dialog = deleteAccountDialog();
+        dialog.show();
     }
 
     private void onDeleteAccountAndLinks(final ClickEvent<Button> event) {
         if (user == null) return; //no user - no action
-        Notification.show("Will do once they implement me");
+        DangerActionDialog dialog = deleteAccountAndLinksDialog();
+        dialog.show();
+    }
+
+    private DangerActionDialog deAuthSessionDialog() {
+        DangerActionDialog dialog = DangerActionDialog.create();
+        dialog.setTitleText("Deauthorise sessions");
+        dialog.setMessage("Concerned your account is logged in on another device? "
+                + "Proceed below to deauthorise all computers or devices that you have previously used. "
+                + "This security step is recommended if you previously used a public computer "
+                + "or accidentally saved your password on a device that isn't yours.");
+
+        dialog.setWarningText("Proceeding will also log you out of your current session, requiring you to log back in");
+        dialog.setConfirmationText("confirm");
+        dialog.setActionButtonText("Deauthorise sessions");
+        dialog.setActionButtonAction(this::deAuthSessions);
+        return dialog;
+    }
+
+    private DangerActionDialog deleteAccountDialog() {
+        DangerActionDialog dialog = DangerActionDialog.create();
+        dialog.setTitleText("Delete Account");
+        dialog.setMessage("This will delete all items (linked accounts, settings and so on) "
+                + "connected with given account. This will preserve links created, so you can continue to use them, "
+                + "but you cannot change or delete them.");
+        dialog.setWarningText("Deleting Account is permanent. It cannot be undone.");
+        dialog.setConfirmationText("delete");
+        dialog.setActionButtonText("Delete Account");
+        dialog.setActionButtonAction(this::deleteAccount);
+        return dialog;
+    }
+
+    private DangerActionDialog deleteAccountAndLinksDialog() {
+        DangerActionDialog dialog = DangerActionDialog.create();
+        dialog.setTitleText("Delete Account and Links");
+        dialog.setMessage("This will delete everything connected with given account.");
+        dialog.setWarningText("Deleting Account is permanent. There is no way back. You're warned.");
+        dialog.setConfirmationText("delete-all");
+        dialog.setActionButtonText("Delete Account and Links");
+        dialog.setActionButtonAction(this::deleteAccountAndLinks);
+        return dialog;
+    }
+
+    private void deAuthSessions() {
+        AppUtils.showSuccessNotification("Will do once implemented");
+    }
+
+    private void deleteAccount() {
+        AppUtils.showSuccessNotification("Will do once implemented");
+    }
+
+    private void deleteAccountAndLinks() {
+        AppUtils.showSuccessNotification("Will do once implemented");
     }
 }

From 810d1406b2f1756891de23975850d74a3199b15c Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 8 Feb 2023 16:27:44 +0200
Subject: [PATCH 50/69] ProfileTab (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pm/axe/services/user/AccountService.java  |  37 ++++
 .../pm/axe/services/user/UserService.java     |  20 ++
 .../pm/axe/ui/elements/AreYouSureDialog.java  |  99 ++++++++++
 .../axe/ui/elements/UsernameRequirements.java |  48 +++++
 .../pages/user/profile/tabs/ProfileTab.java   | 175 +++++++++++++++++-
 5 files changed, 372 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
 create mode 100644 src/main/java/pm/axe/ui/elements/UsernameRequirements.java

diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index cc71af633..4c0f83255 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -26,6 +26,7 @@
 public class AccountService {
     private static final String TAG = "[" + AccountService.class.getSimpleName() + "]";
     private static final String ERR_ACCOUNT_IS_EMPTY = "Account is null";
+    private static final String ERR_NO_EMAIL_ACCOUNT = "User has no Email Account";
 
     private final AccountDao accountDao;
     private final SymmetricCryptTool cryptTool;
@@ -295,4 +296,40 @@ public OperationResult deleteAccount(final Account account) {
             return OperationResult.generalFail().withMessage(e.getMessage());
         }
     }
+
+    public OperationResult updateEmailAccount(final User user, final String email) {
+        if (user == null) return OperationResult.malformedInput().withMessage("User cannot be NULL");
+        OperationResult validationResult = mailService.isEmailValid(email);
+        if (validationResult.notOk()) {
+            return validationResult;
+        }
+
+
+        Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
+        if (emailAccount.isPresent()) {
+            String encryptedEmail;
+            OperationResult encryptEmailResult = cryptTool.encrypt(email);
+            if (encryptEmailResult.ok()) {
+                encryptedEmail = encryptEmailResult.getStringPayload();
+            } else {
+                log.error("{} Email encryption failed. Value: {}. Error: {}", TAG, email, encryptEmailResult.getMessage());
+                return OperationResult.generalFail().withMessage(ERR_ENCRYPTION_FAILED);
+            }
+            emailAccount.get().setAccountName(encryptedEmail);
+            emailAccount.get().setConfirmed(false);
+        } else {
+            return OperationResult.generalFail().withMessage(ERR_NO_EMAIL_ACCOUNT);
+        }
+
+        try {
+            accountDao.save(emailAccount.get());
+            log.info("{} Updated email account for {} {}", TAG, User.class.getSimpleName(), user.getUsername());
+            return OperationResult.success().addPayload(emailAccount.get());
+        } catch (CannotCreateTransactionException e) {
+            return OperationResult.databaseDown();
+        } catch (Exception e) {
+            log.debug("", e);
+            return OperationResult.generalFail().withMessage(e.getMessage());
+        }
+    }
 }
diff --git a/src/main/java/pm/axe/services/user/UserService.java b/src/main/java/pm/axe/services/user/UserService.java
index 89a9f5e31..b10a214a6 100644
--- a/src/main/java/pm/axe/services/user/UserService.java
+++ b/src/main/java/pm/axe/services/user/UserService.java
@@ -197,4 +197,24 @@ void confirmUser(final User user) {
     }
 
 
+    public OperationResult updateUsername(final User user, final String username) {
+        if (user == null) return OperationResult.malformedInput().withMessage("User cannot be NULL");
+        OperationResult validationResult = UsernameValidator.isValid(username);
+        if (validationResult.notOk()) {
+            return validationResult;
+        }
+
+        user.setUsername(username);
+        try {
+            userDao.update(user);
+            return OperationResult.success();
+        } catch (CannotCreateTransactionException e) {
+            return OperationResult.databaseDown();
+        } catch (Exception e) {
+            log.error("{} Exception on updating {} record",
+                    TAG, User.class.getSimpleName());
+            log.debug("", e);
+            return OperationResult.generalFail();
+        }
+    }
 }
diff --git a/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
new file mode 100644
index 000000000..77ff79bed
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
@@ -0,0 +1,99 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.html.H3;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.FlexComponent;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.shared.Registration;
+import org.apache.commons.lang3.StringUtils;
+import pm.axe.internal.Callback;
+
+/**
+ * "Are you sure?" Dialog.
+ *
+ */
+public final class AreYouSureDialog extends Composite<Dialog> {
+
+    private final H3 title = new H3();
+    private final Span message = new Span("Are you sure?");
+    private final Button cancelButton = new Button("Cancel");
+    private final Button actionButton = new Button("Action");
+
+    private final Dialog dialog = getContent();
+    private Registration defaultActionButtonAction;
+
+    /**
+     * Creates dialog. Created dialog ain't open automatically.
+     *
+     * @param titleText string with title text
+     * @return created {@link AreYouSureDialog} for further modification.
+     */
+    public static AreYouSureDialog create(final String titleText) {
+        return new AreYouSureDialog(titleText);
+    }
+
+    /**
+     * Sets action performed when user pressed Delete Button.
+     *
+     * @param callback callable method in lambda.
+     */
+    public void setActionButtonAction(final Callback callback) {
+        defaultActionButtonAction.remove();
+        this.actionButton.addClickListener(e -> {
+            callback.execute();
+            dialog.close();
+        });
+    }
+
+    /**
+     * Displays dialog.
+     */
+    public void show() {
+        this.dialog.open();
+    }
+
+    public void setActionButtonText(final String text) {
+        if (StringUtils.isNotBlank(text)) {
+            actionButton.setText(text);
+        }
+    }
+
+    private AreYouSureDialog(final String titleTextString) {
+        VerticalLayout dialogLayout = createDialogLayout();
+        setClassNames();
+        dialog.add(dialogLayout);
+
+        final String titleText = StringUtils.isNotBlank(titleTextString) ? titleTextString : "Title";
+        title.setText(titleText);
+    }
+
+    private void setClassNames() {
+        title.setClassName("sure-dialog-title");
+        message.setClassName("sure-dialog-message");
+        cancelButton.setClassName("sure-dialog-cancel-btn");
+        actionButton.setClassName("sure-dialog-delete-btn");
+    }
+
+    private VerticalLayout createDialogLayout() {
+        //by default - no action
+        cancelButton.addClickListener(e -> dialog.close());
+        defaultActionButtonAction = actionButton.addClickListener(e -> dialog.close());
+
+        cancelButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+        actionButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_ERROR);
+        HorizontalLayout buttonLayout = new HorizontalLayout(cancelButton, actionButton);
+        buttonLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
+
+        VerticalLayout dialogLayout = new VerticalLayout(title, message, buttonLayout);
+        dialogLayout.setPadding(false);
+        dialogLayout.setAlignItems(FlexComponent.Alignment.STRETCH);
+        dialogLayout.setClassName("sure-dialog");
+
+        return dialogLayout;
+    }
+}
diff --git a/src/main/java/pm/axe/ui/elements/UsernameRequirements.java b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
new file mode 100644
index 000000000..0d37f17a9
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
@@ -0,0 +1,48 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.HasStyle;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.ListItem;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.html.UnorderedList;
+
+import java.util.stream.Stream;
+
+public class UsernameRequirements extends Composite<Details> implements HasStyle {
+
+    public static UsernameRequirements create() {
+        return new UsernameRequirements();
+    }
+
+    public void show() {
+        this.setVisible(true);
+    }
+
+    public void hide() {
+        this.setVisible(false);
+    }
+
+    private UsernameRequirements() {
+        Details details = getContent();
+        details.setSummaryText("Username requirements");
+        Span span = new Span("Username should be");
+
+        UnorderedList requirements = getRequirements();
+
+        details.addContent(span, requirements);
+        details.setOpened(false);
+    }
+
+    private UnorderedList getRequirements() {
+        UnorderedList requirements = new UnorderedList();
+        requirements.removeAll();
+        Stream.of("The number of characters must be between 2 and 20.",
+                        "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
+                        "Also allowed of the dot (.), underscore (_), and hyphen (-).",
+                        "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
+                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
+                .forEach(requirement -> requirements.add(new ListItem(requirement)));
+        return requirements;
+    }
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index b960a5a97..1dd546b5f 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -1,10 +1,12 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
+import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.details.Details;
-import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.html.ListItem;
+import com.vaadin.flow.component.html.UnorderedList;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -14,6 +16,7 @@
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.EmailValidator;
 import pm.axe.db.models.Account;
 import pm.axe.db.models.Token;
 import pm.axe.db.models.User;
@@ -21,14 +24,22 @@
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.TokenService;
+import pm.axe.services.user.UserService;
+import pm.axe.ui.elements.AreYouSureDialog;
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
+import pm.axe.ui.elements.UsernameRequirements;
 import pm.axe.users.AccountType;
+import pm.axe.users.UsernameValidator;
+import pm.axe.utils.AppUtils;
+import pm.axe.utils.ErrorUtils;
 import pm.axe.utils.VaadinUtils;
 
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 @SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
 @SpringComponent
@@ -36,12 +47,14 @@
 public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
     private final TokenService tokenService;
+    private final UserService userService;
     private User user;
 
     @SuppressWarnings("FieldCanBeLocal") //will be re-drawn if event received
     private Section accountsSection;
 
     private final TextField usernameField = new TextField();
+    private final UsernameRequirements usernameRequirements = UsernameRequirements.create();
     private final Button editUsernameButton = new Button();
     private final Button saveUsernameButton = new Button();
     private final HorizontalLayout usernameLayout = new HorizontalLayout();
@@ -57,6 +70,8 @@ public void tabInit(final User user) {
 
         accountsSection = createAccountSection();
         add(accountsSection);
+
+        usernameRequirements.hide();
     }
 
     private Section createAccountSection() {
@@ -65,10 +80,10 @@ private Section createAccountSection() {
         Details emailUsageDetails = createEmailUsageDetails();
         HorizontalLayout telegramLayout = createTelegramLayout();
 
-        Stream.of(usernameLayout, emailLayout, emailUsageDetails, telegramLayout).forEach(VaadinUtils::setCentered);
+        Stream.of(usernameLayout, emailLayout, telegramLayout).forEach(VaadinUtils::setCentered);
 
         Section section = new Section("Accounts");
-        section.setContent(usernameLayout, emailLayout, emailUsageDetails, telegramLayout);
+        section.setContent(usernameLayout, usernameRequirements, emailLayout, emailUsageDetails, telegramLayout);
         section.setCentered();
         return section;
     }
@@ -76,6 +91,8 @@ private Section createAccountSection() {
     private HorizontalLayout createUsernameLayout() {
         usernameField.setLabel("Username");
         usernameField.setValue(user.getUsername());
+        usernameField.addValueChangeListener(this::onUsernameChanged);
+        usernameField.setClearButtonVisible(true);
         usernameField.setReadOnly(true);
 
         editUsernameButton.setText("Edit");
@@ -95,9 +112,12 @@ private HorizontalLayout createUsernameLayout() {
 
     private HorizontalLayout createEmailLayout() {
         emailField.setLabel("E-mail");
-        Optional<String> currentEmail = getCurrentEmail();
+
+        emailField.setClearButtonVisible(true);
         emailField.setReadOnly(true);
-        currentEmail.ifPresent(e -> emailField.setValue(currentEmail.get()));
+        emailField.addValueChangeListener(this::onEmailChanged);
+
+        getCurrentEmail().ifPresent(emailField::setValue);
 
         editEmailButton.setText("Edit");
         editEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
@@ -131,6 +151,7 @@ private HorizontalLayout createTelegramLayout() {
                 telegramField.setValue(telegramUsername.get());
                 Button unlinkButton = new Button("Unlink");
                 unlinkButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
+                unlinkButton.addClickListener(this::onTelegramUnlink);
                 telegramLayout.add(telegramField, unlinkButton);
             } else {
                 telegramLayout.setVisible(false);
@@ -152,32 +173,172 @@ private HorizontalLayout createTelegramLayout() {
 
     private Details createEmailUsageDetails() {
         Details howEmailUsedDetails = new Details("What will be sent to email?");
-        Span span = new Span("Account Recovery"); //TODO replace with UL with usage - see RegForm for UL example
+
+        UnorderedList usageCases = new UnorderedList();
+        usageCases.removeAll();
+        Stream.of("Account Recovery",
+                "Password Reset",
+                "Two-Factor Authentication (2FA)")
+                .forEach(usageCase -> usageCases.add(new ListItem(usageCase)));
+
         howEmailUsedDetails.setOpened(false);
-        howEmailUsedDetails.setContent(span);
+        howEmailUsedDetails.setContent(usageCases);
         return howEmailUsedDetails;
     }
 
+    private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<TextField, String> event) {
+        usernameRequirements.hide();
+        String input = event.getValue().trim();
+        boolean isInputEmpty = StringUtils.isBlank(input);
+        if (isInputEmpty) {
+            usernameField.setInvalid(false);
+            usernameRequirements.hide();
+            return;
+        }
+
+        final boolean isSameAsCurrent = user.getUsername().equals(input);
+        if (isSameAsCurrent) {
+            return;
+        }
+
+        final boolean isUsernameValid = !isUsernameInvalid(usernameField);
+        if (isUsernameValid) {
+            usernameField.setInvalid(false);
+            usernameField.setErrorMessage("");
+        }
+    }
+
     private void onEditUsername(final ClickEvent<Button> event) {
         usernameField.setReadOnly(false);
         usernameLayout.replace(editUsernameButton, saveUsernameButton);
     }
 
     private void onSaveUsername(final ClickEvent<Button> event) {
+        if (StringUtils.isBlank(usernameField.getValue().trim())) {
+            usernameField.setInvalid(true);
+            usernameField.setErrorMessage("Username cannot be empty");
+            return;
+        }
+        //is same as current ?
+        boolean isSameAsCurrent = user.getUsername().equals(usernameField.getValue().trim());
+        if (isSameAsCurrent) {
+            usernameField.setReadOnly(true);
+            usernameLayout.replace(saveUsernameButton, editUsernameButton);
+            return;
+        }
+
+        //changed -> validate
+        if (isUsernameInvalid(usernameField)) {
+            return;
+        }
+
+        //clean -> save
+        OperationResult usernameUpdate = userService.updateUsername(user, usernameField.getValue());
+        if (usernameUpdate.ok()) {
+            AppUtils.showSuccessNotification("Username is updated");
+        } else {
+            ErrorUtils.showErrorNotification("Failed to update Username. Server error");
+        }
         usernameField.setReadOnly(true);
         usernameLayout.replace(saveUsernameButton, editUsernameButton);
     }
 
+    private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailField, String> event) {
+        final String email = event.getValue().trim();
+        boolean isValidEmail = EmailValidator.getInstance().isValid(email);
+        if (StringUtils.isBlank(email)) {
+            usernameField.setInvalid(false);
+            usernameField.setErrorMessage("");
+            return;
+        }
+
+        Optional<String> currentEmail = getCurrentEmail();
+        if (currentEmail.isEmpty()) return;
+        boolean isSameAsCurrent = currentEmail.get().equals(email);
+        if (isSameAsCurrent) {
+            return;
+        }
+
+        if (isValidEmail) {
+            boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
+            if (emailExists) {
+                onInvalidInput(emailField, "Email already taken");
+            }
+        } else {
+            //not valid email
+            onInvalidInput(emailField, "Should be valid email");
+        }
+    }
+
     private void onEditEmail(ClickEvent<Button> event) {
         emailField.setReadOnly(false);
         emailLayout.replace(editEmailButton, saveEmailButton);
     }
 
     private void onSaveEmail(ClickEvent<Button> event) {
+        //is same as current ?
+        Optional<String> currentEmail = getCurrentEmail();
+        if (currentEmail.isEmpty()) return;
+        final String email = emailField.getValue().trim();
+        boolean isSameAsCurrent = currentEmail.get().equals(email);
+        if (isSameAsCurrent) {
+            emailField.setReadOnly(true);
+            emailLayout.replace(saveEmailButton, editEmailButton);
+            return;
+        }
+
+        boolean isValidEmail = EmailValidator.getInstance().isValid(email);
+        if (isValidEmail) {
+            //email
+            boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
+            if (emailExists) {
+                onInvalidInput(emailField, "Email already taken");
+                return;
+            }
+        } else {
+            //not valid email
+            onInvalidInput(emailField, "Should be valid email");
+            return;
+        }
+
+        //clean -> save
+        OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
+        if (emailUpdateResult.ok()) {
+            AppUtils.showSuccessNotification("Email is updated");
+        } else {
+            ErrorUtils.showErrorNotification("Failed to update email. Server error");
+        }
+
         emailField.setReadOnly(true);
         emailLayout.replace(saveEmailButton, editEmailButton);
     }
 
+    private void onTelegramUnlink(final ClickEvent<Button> event) {
+        AreYouSureDialog dialog = AreYouSureDialog.create("Unlink Telegram Account");
+        dialog.setActionButtonText("Unlink");
+        dialog.setActionButtonAction(this::unlinkTelegram);
+        dialog.show();
+    }
+
+    private void unlinkTelegram() {
+        AppUtils.showSuccessNotification("Will do once implemented");
+    }
+
+    private boolean isUsernameInvalid(final TextField inputField) {
+        final String input = inputField.getValue().trim();
+        OperationResult usernameValidation = UsernameValidator.isValid(input);
+        if (usernameValidation.ok()) {
+            if (userService.isUserExists(input)) {
+                onInvalidInput(inputField, "Username already taken");
+                return true;
+            }
+        } else {
+            onInvalidInput(inputField, "Username doesn't meet requirements");
+            usernameRequirements.show();
+            return true;
+        }
+        return false;
+    }
 
     private Optional<String> getCurrentEmail() {
         Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);

From b1f1567ddad228ff76f341ec7026e7913484d522 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 8 Feb 2023 17:37:01 +0200
Subject: [PATCH 51/69] ProfileTab. Css stuff (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pm/axe/ui/elements/AreYouSureDialog.java     |  2 +-
 .../pages/user/profile/tabs/DangerZoneTab.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
index 77ff79bed..c1ba9afe4 100644
--- a/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
+++ b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
@@ -85,7 +85,7 @@ private VerticalLayout createDialogLayout() {
         defaultActionButtonAction = actionButton.addClickListener(e -> dialog.close());
 
         cancelButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
-        actionButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_ERROR);
+        actionButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
         HorizontalLayout buttonLayout = new HorizontalLayout(cancelButton, actionButton);
         buttonLayout.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
 
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
index 9dcb6f917..7ed9c9712 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/DangerZoneTab.java
@@ -23,24 +23,24 @@
 @SpringComponent
 @UIScope
 public class DangerZoneTab extends VerticalLayout implements HasTabInit {
-    private Section deleteAccountSection;
+    private Section dangerZoneSection;
     private User user;
     @Override
     public void tabInit(final User user) {
         this.user = user;
-        createDeleteAccountSection();
-        add(deleteAccountSection);
+        createDangerZoneSection();
+        add(dangerZoneSection);
     }
 
-    private void createDeleteAccountSection() {
-        deleteAccountSection = new Section("Delete my Account");
-        deleteAccountSection.setCentered();
+    private void createDangerZoneSection() {
+        dangerZoneSection = new Section("Danger Zone");
+        dangerZoneSection.setCentered();
         Component content = deleteAccountSectionContent();
-        deleteAccountSection.setContent(content);
+        dangerZoneSection.setContent(content);
     }
 
     private Component deleteAccountSectionContent() {
-        deleteAccountSection.getTitle().addClassName("bold");
+        dangerZoneSection.getTitle().addClassName("bold");
 
         Button deAuthSessionsButton = new Button("Deauthorize Sessions");
         deAuthSessionsButton.addClickListener(this::onDeAuthSessions);

From ce5e32227dc84e705f4a492154daeba87e4a0aee Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Wed, 8 Feb 2023 20:05:54 +0200
Subject: [PATCH 52/69] ProfileTab. Email suffix (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 1dd546b5f..a131f4a6a 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -112,7 +112,7 @@ private HorizontalLayout createUsernameLayout() {
 
     private HorizontalLayout createEmailLayout() {
         emailField.setLabel("E-mail");
-
+        emailField.setSuffixComponent(VaadinIcon.CHECK.create());
         emailField.setClearButtonVisible(true);
         emailField.setReadOnly(true);
         emailField.addValueChangeListener(this::onEmailChanged);

From e1ccf63f4de8746716833c4bbf3d1fe5e1d87978 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Fri, 10 Feb 2023 23:44:53 +0200
Subject: [PATCH 53/69] ProfileTab. Email bug fixed (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 src/main/java/pm/axe/core/IdentGenerator.java |  5 +-
 src/main/java/pm/axe/db/dao/TokenDao.java     |  3 +
 src/main/java/pm/axe/db/models/Account.java   |  8 +++
 .../pm/axe/services/user/AccountService.java  | 16 +++++
 .../pm/axe/services/user/TokenService.java    | 20 ++++---
 .../services/user/UserOperationsService.java  | 59 ++++++++++++-------
 .../pages/user/profile/tabs/ProfileTab.java   | 50 ++++++++++++++--
 7 files changed, 124 insertions(+), 37 deletions(-)

diff --git a/src/main/java/pm/axe/core/IdentGenerator.java b/src/main/java/pm/axe/core/IdentGenerator.java
index 23527dea6..05c2c9e34 100644
--- a/src/main/java/pm/axe/core/IdentGenerator.java
+++ b/src/main/java/pm/axe/core/IdentGenerator.java
@@ -35,7 +35,7 @@ public final class IdentGenerator {
             + IDENT_MAX_LENGTH_WITHOUT_FIRST_AND_LAST_CHARS + "}[a-zA-Z0-9]$";
 
     private static final int TOKEN_SUBSTRING_START_INDEX = 0;
-    private static final int TOKEN_SUBSTRING_END_INDEX = 7;
+    private static final int TOKEN_SUBSTRING_END_INDEX = 5;
 
     private IdentGenerator() {
         throw new UnsupportedOperationException("Utility class");
@@ -69,6 +69,7 @@ public static String generateTokenIdent(final Token token) {
     private static String generateAccountConfirmationIdent(final Token token) {
         String prefix = token.getTokenType().getIdentPrefix();
         String firstPartOfToken = token.getToken().substring(TOKEN_SUBSTRING_START_INDEX, TOKEN_SUBSTRING_END_INDEX);
-        return String.join("", prefix, firstPartOfToken);
+        String randomPart = RandomStringUtils.randomAlphanumeric(2); //for re-used tokens
+        return String.join("", prefix, firstPartOfToken, randomPart);
     }
 }
diff --git a/src/main/java/pm/axe/db/dao/TokenDao.java b/src/main/java/pm/axe/db/dao/TokenDao.java
index bead824cc..80021ada9 100644
--- a/src/main/java/pm/axe/db/dao/TokenDao.java
+++ b/src/main/java/pm/axe/db/dao/TokenDao.java
@@ -3,6 +3,7 @@
 import lombok.NonNull;
 import org.springframework.scheduling.annotation.Async;
 import pm.axe.db.dao.base.TimeAwareCrudDao;
+import pm.axe.db.models.Account;
 import pm.axe.db.models.Token;
 import pm.axe.db.models.User;
 import pm.axe.users.TokenType;
@@ -62,6 +63,8 @@ public interface TokenDao extends TimeAwareCrudDao<Token, Long> {
      */
     Token findByTokenTypeAndUser(TokenType tokenType, User user);
 
+    Optional<Token> findByTokenTypeAndUserAndConfirmationFor(TokenType tokenType, User user, Account account);
+
     /**
      * Finds all {@link Token} records owned by {@link User}.
      *
diff --git a/src/main/java/pm/axe/db/models/Account.java b/src/main/java/pm/axe/db/models/Account.java
index 05455ab78..b4d6fa8e3 100644
--- a/src/main/java/pm/axe/db/models/Account.java
+++ b/src/main/java/pm/axe/db/models/Account.java
@@ -41,6 +41,14 @@ public static Account.Builder create(final AccountType accountType) {
         return new Builder(accountType);
     }
 
+    public void copy(final Account anotherAccount) {
+        this.setUser(anotherAccount.getUser());
+        this.setType(anotherAccount.getType());
+        this.setAccountName(anotherAccount.getAccountName());
+        this.setConfirmed(anotherAccount.isConfirmed());
+        this.setExtraInfo(anotherAccount.getExtraInfo());
+    }
+
     private Account(final AccountType accountType, final User user) {
         this.type = accountType;
         this.user = user;
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index 4c0f83255..99d89fb58 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -332,4 +332,20 @@ public OperationResult updateEmailAccount(final User user, final String email) {
             return OperationResult.generalFail().withMessage(e.getMessage());
         }
     }
+
+    public void rollbackAccount(final Account oldAccount) {
+        Optional<Account> currentAccount = this.getAccount(oldAccount.getUser(), oldAccount.getType());
+        try {
+            if (currentAccount.isPresent()) {
+                currentAccount.get().copy(oldAccount);
+            } else {
+                accountDao.save(oldAccount);
+            }
+            log.info("{} Account {} rolled back", TAG, oldAccount);
+        } catch (CannotCreateTransactionException e) {
+            log.error("{} failed to rollback account: Database is Down", TAG);
+        } catch (Exception e) {
+            log.error("{} failed  to rollback Account {}: got exception {}", TAG, oldAccount, e.getMessage());
+        }
+    }
 }
diff --git a/src/main/java/pm/axe/services/user/TokenService.java b/src/main/java/pm/axe/services/user/TokenService.java
index 5651f1807..cf3720f88 100644
--- a/src/main/java/pm/axe/services/user/TokenService.java
+++ b/src/main/java/pm/axe/services/user/TokenService.java
@@ -36,17 +36,19 @@ public class TokenService {
      * @return {@link OperationResult} with created {@link Token} or {@link OperationResult} with error.
      */
     public OperationResult createConfirmationToken(final User user, final Account account) {
-        boolean userAlreadyHasConfirmationToken =
-                tokenDao.existsByTokenTypeAndUser(TokenType.ACCOUNT_CONFIRMATION_TOKEN, user);
-        if (userAlreadyHasConfirmationToken) {
-            return OperationResult.banned().withMessage(ERR_USER_ALREADY_HAS_TOKEN);
+        Optional<Token> optionalToken =
+                tokenDao.findByTokenTypeAndUserAndConfirmationFor(TokenType.ACCOUNT_CONFIRMATION_TOKEN, user, account);
+        Token confirmationToken;
+        if (optionalToken.isPresent()) {
+            //use it again
+            confirmationToken = optionalToken.get();
+        } else {
+            //create new
+            confirmationToken = Token.create(TokenType.ACCOUNT_CONFIRMATION_TOKEN).forUser(user);
+            confirmationToken.setConfirmationFor(account);
+            verifyTokenValueIsUnique(confirmationToken);
         }
 
-        Token confirmationToken = Token.create(TokenType.ACCOUNT_CONFIRMATION_TOKEN).forUser(user);
-        confirmationToken.setConfirmationFor(account);
-
-        verifyTokenValueIsUnique(confirmationToken);
-
         try {
             tokenDao.save(confirmationToken);
             return OperationResult.success().addPayload(confirmationToken);
diff --git a/src/main/java/pm/axe/services/user/UserOperationsService.java b/src/main/java/pm/axe/services/user/UserOperationsService.java
index c709da78a..adeeb12e4 100644
--- a/src/main/java/pm/axe/services/user/UserOperationsService.java
+++ b/src/main/java/pm/axe/services/user/UserOperationsService.java
@@ -108,26 +108,8 @@ public OperationResult registerUser(final RegisterUserInput input) {
         }
         //Create and send - confirmation email for Accounts with Email set.
         if (userAccount.getType() == AccountType.EMAIL) {
-            //Create Confirmation Token
-            OperationResult createConfirmationTokenResult =
-                    tokenService.createConfirmationToken(createdUser, userAccount);
-            if (createConfirmationTokenResult.notOk()) {
-                log.error("{} failed to create confirmation token for {}. OpResult: {}",
-                        TAG, createdUser.getUsername(), createConfirmationTokenResult);
-                return createConfirmationTokenResult;
-            }
-            Token confirmationToken = createConfirmationTokenResult.getPayload(Token.class);
-            rollbackTasks.push(RollbackTask.create(Token.class, confirmationToken));
-            //Send it
-            log.info("{} Successfully created {}({}) for user '{}'",
-                    TAG, confirmationToken.getTokenType(), confirmationToken.getToken(), createdUser.getUsername());
-            OperationResult sendResult = senders.getSender(AccountType.EMAIL).send(confirmationToken, input.getEmail());
-            if (sendResult.notOk()) {
-                log.warn("{} Unable to send created {} to {}. OpResult: {}",
-                        TAG, confirmationToken.getTokenType(), input.getEmail(), sendResult);
-                log.warn("{} Requesting Rollback", TAG);
-                rollbackService.rollback(rollbackTasks);
-            }
+            OperationResult sendConfirmationLetterResult = sendConfirmationLetter(input.getEmail(), userAccount);
+            if (sendConfirmationLetterResult.notOk()) return sendConfirmationLetterResult;
         }
         //Create Telegram Confirmation Token
         Token telegramConfirmationToken;
@@ -147,6 +129,43 @@ public OperationResult registerUser(final RegisterUserInput input) {
                 ? success : success.addPayload(TELEGRAM_TOKEN_KEY, telegramConfirmationToken.getToken());
     }
 
+    public OperationResult sendConfirmationLetter(final String email, final Account userAccount) {
+        //check inputs
+        if (StringUtils.isBlank(email)) {
+            return OperationResult.malformedInput().withMessage("Email cannot be empty");
+        }
+        if (userAccount == null) {
+            return OperationResult.malformedInput().withMessage("User Account cannot be null");
+        }
+        if (userAccount.getUser() == null) {
+            return OperationResult.malformedInput().withMessage("Given Account is not bound to any user");
+        }
+
+        //Create Confirmation Token
+        OperationResult createConfirmationTokenResult =
+                tokenService.createConfirmationToken(userAccount.getUser(), userAccount);
+        if (createConfirmationTokenResult.notOk()) {
+            log.error("{} failed to create confirmation token for {}. OpResult: {}",
+                    TAG, userAccount.getUser().getUsername(), createConfirmationTokenResult);
+            return createConfirmationTokenResult;
+        }
+        Token confirmationToken = createConfirmationTokenResult.getPayload(Token.class);
+        rollbackTasks.push(RollbackTask.create(Token.class, confirmationToken));
+        //Send it
+        log.info("{} Successfully created {}({}) for user '{}'",
+                TAG, confirmationToken.getTokenType(), confirmationToken.getToken(),
+                userAccount.getUser().getUsername());
+        OperationResult sendResult = senders.getSender(AccountType.EMAIL).send(confirmationToken, email);
+        if (sendResult.notOk()) {
+            log.warn("{} Unable to send created {} to {}. OpResult: {}",
+                    TAG, confirmationToken.getTokenType(), email, sendResult);
+            log.warn("{} Requesting Rollback", TAG);
+            rollbackService.rollback(rollbackTasks);
+            return sendResult;
+        }
+        return OperationResult.success();
+    }
+
     /**
      * Deletes User and its Accounts.
      *
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index a131f4a6a..151725f63 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -5,6 +5,7 @@
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.ListItem;
 import com.vaadin.flow.component.html.UnorderedList;
 import com.vaadin.flow.component.icon.VaadinIcon;
@@ -24,6 +25,7 @@
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.TokenService;
+import pm.axe.services.user.UserOperationsService;
 import pm.axe.services.user.UserService;
 import pm.axe.ui.elements.AreYouSureDialog;
 import pm.axe.ui.elements.Section;
@@ -48,6 +50,7 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
     private final TokenService tokenService;
     private final UserService userService;
+    private final UserOperationsService userOpsService;
     private User user;
 
     @SuppressWarnings("FieldCanBeLocal") //will be re-drawn if event received
@@ -112,12 +115,17 @@ private HorizontalLayout createUsernameLayout() {
 
     private HorizontalLayout createEmailLayout() {
         emailField.setLabel("E-mail");
-        emailField.setSuffixComponent(VaadinIcon.CHECK.create());
         emailField.setClearButtonVisible(true);
         emailField.setReadOnly(true);
         emailField.addValueChangeListener(this::onEmailChanged);
 
-        getCurrentEmail().ifPresent(emailField::setValue);
+        Optional<String> currentEmail = getCurrentEmail();
+        currentEmail.ifPresent(emailField::setValue);
+        currentEmail.ifPresent(e -> {
+            VaadinIcon confirmationStatusIcon = isCurrentEmailConfirmed()
+                    ?  VaadinIcon.CHECK : VaadinIcon.ELLIPSIS_CIRCLE;
+            emailField.setSuffixComponent(confirmationStatusIcon.create());
+        });
 
         editEmailButton.setText("Edit");
         editEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
@@ -272,6 +280,7 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
 
     private void onEditEmail(ClickEvent<Button> event) {
         emailField.setReadOnly(false);
+        emailField.setSuffixComponent(new Div());
         emailLayout.replace(editEmailButton, saveEmailButton);
     }
 
@@ -287,6 +296,11 @@ private void onSaveEmail(ClickEvent<Button> event) {
             return;
         }
 
+        if (StringUtils.isBlank(email)) {
+            onInvalidInput(emailField, "Please provide valid email");
+            return;
+        }
+
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
         if (isValidEmail) {
             //email
@@ -297,18 +311,37 @@ private void onSaveEmail(ClickEvent<Button> event) {
             }
         } else {
             //not valid email
-            onInvalidInput(emailField, "Should be valid email");
+            onInvalidInput(emailField, "Should be valid email address");
             return;
         }
 
         //clean -> save
+        Optional<Account> currentEmailRecord = accountService.getAccount(user, AccountType.EMAIL);
+
         OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
-        if (emailUpdateResult.ok()) {
-            AppUtils.showSuccessNotification("Email is updated");
-        } else {
+        if (emailUpdateResult.notOk()) {
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
+            if (currentEmailRecord.isPresent() ) {
+                emailField.setValue(currentEmail.get());
+            } else {
+                emailField.setValue("");
+            }
+
             ErrorUtils.showErrorNotification("Failed to update email. Server error");
         }
 
+        //sending confirmation letter
+        OperationResult sendConfirmationLetterResult = userOpsService.sendConfirmationLetter(email,
+                emailUpdateResult.getPayload(Account.class));
+        if (sendConfirmationLetterResult.ok()) {
+            emailField.setSuffixComponent(VaadinIcon.ELLIPSIS_CIRCLE.create());
+            AppUtils.showSuccessNotification("Send confirmation to new email. Please check your inbox.");
+        } else {
+            emailField.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
+            ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
+        }
+
         emailField.setReadOnly(true);
         emailLayout.replace(saveEmailButton, editEmailButton);
     }
@@ -352,6 +385,11 @@ private Optional<String> getCurrentEmail() {
         }
     }
 
+    private boolean isCurrentEmailConfirmed() {
+        Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
+        return emailAccount.map(Account::isConfirmed).orElse(false);
+    }
+
     private Optional<Account> getTelegramAccount() {
         return accountService.getAccount(user, AccountType.TELEGRAM);
     }

From 3577ff76a764f0eb90ad9dbb778b7b5d91d3d1a8 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 13 Feb 2023 11:34:20 +0200
Subject: [PATCH 54/69] SecurityTab. Password update validation (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../axe/ui/pages/user/RegistrationPage.java   |  3 +
 .../pages/user/profile/tabs/SecurityTab.java  | 65 +++++++++++++++++--
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 82dcf820a..a444abe12 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -263,6 +263,7 @@ private void onRegister(final ClickEvent<Button> event) {
         } else {
             //username
             if (isUsernameInvalid(userEmailInput)) {
+                //error message is already set by validator.
                 return;
             }
         }
@@ -270,12 +271,14 @@ private void onRegister(final ClickEvent<Button> event) {
         //username
         if (isUsernameInputVisible()) {
             if (isUsernameInvalid(usernameInput)) {
+                //error message is already set by validator.
                 return;
             }
         }
 
         //password
         if (fieldsValidationUtils.isPasswordInvalid(passwordInput)) {
+            //error message is already set by validator.
             return;
         }
 
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index eaa64f668..c25f61af1 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -1,6 +1,7 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
 import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
@@ -22,27 +23,29 @@
 import pm.axe.db.models.UserSettings;
 import pm.axe.internal.HasTabInit;
 import pm.axe.services.user.AccountService;
+import pm.axe.services.user.UserService;
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.elements.Section;
 import pm.axe.users.AccountType;
-import pm.axe.utils.AppUtils;
-import pm.axe.utils.AxeSessionUtils;
-import pm.axe.utils.ErrorUtils;
-import pm.axe.utils.VaadinUtils;
+import pm.axe.utils.*;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 @SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
 public class SecurityTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
+    private final UserService userService;
     private final UserSettingsService userSettingsService;
     private final AxeSessionUtils axeSessionUtils;
+    private final FieldsValidationUtils fieldsValidationUtils;
 
     private List<Account> confirmedAccounts;
 
@@ -50,6 +53,9 @@ public class SecurityTab extends VerticalLayout implements HasTabInit {
     private Section resetPasswordChannelSection;
     private Section tfaSection;
 
+    private PasswordField oldPasswordInput;
+    private PasswordField newPasswordInput;
+
     private Select<String> resetPasswordSelect;
 
     private Checkbox tfaBox;
@@ -86,14 +92,20 @@ private Section createChangePasswordSection() {
     }
 
     private VerticalLayout createChangePasswordContent() {
-        PasswordField oldPasswordInput = new PasswordField("Old Password");
-        PasswordField newPasswordInput = new PasswordField("New Password");
+        oldPasswordInput = new PasswordField("Old Password");
+
+        newPasswordInput = new PasswordField("New Password");
+        newPasswordInput.addValueChangeListener(this::onPasswordChanged);
+
         PasswordGenerator passwordGenerator = PasswordGenerator.create();
         passwordGenerator.setOpened(false);
         passwordGenerator.setCopyTarget(newPasswordInput);
+
         Button updatePasswordButton = new Button("Update");
+        updatePasswordButton.addClickListener(this::onPasswordUpdate);
         updatePasswordButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         updatePasswordButton.setWidthFull();
+
         VerticalLayout changePasswordLayout = new VerticalLayout(oldPasswordInput, newPasswordInput,
                 passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);
@@ -197,6 +209,47 @@ private VerticalLayout createTfaContent() {
         return tfaContent;
     }
 
+    private void onPasswordChanged(final AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+        boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(newPasswordInput);
+        if (isPasswordValid) {
+            newPasswordInput.setInvalid(false);
+            newPasswordInput.setErrorMessage("");
+        }
+    }
+
+    private void onPasswordUpdate(final ClickEvent<Button> event) {
+        final String oldPassword = oldPasswordInput.getValue();
+        final String newPassword = newPasswordInput.getValue();
+        if (StringUtils.isBlank(oldPassword)) {
+            onInvalidInput(oldPasswordInput, "Old Password cannot be blank");
+            return;
+        }
+
+        if (StringUtils.isBlank(newPassword)) {
+            onInvalidInput(newPasswordInput, "New Password cannot be blank");
+            return;
+        }
+
+        final boolean isNewPasswordInvalid = fieldsValidationUtils.isPasswordInvalid(newPasswordInput);
+        if (isNewPasswordInvalid) {
+            //error message is already set by validator.
+            return;
+        }
+
+        final boolean isOldPasswordValid = userService.checkPassword(user, oldPassword.trim());
+        if (!isOldPasswordValid) {
+            onInvalidInput(oldPasswordInput, "Old Password is incorrect, try again");
+            return;
+        }
+
+        //all field are valid - let's change password
+        doPasswordChange();
+    }
+
+    private void doPasswordChange() {
+        AppUtils.showSuccessNotification("Will do once implemented");
+    }
+
     private void onResetPasswordSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
         AccountType selectedAccountType = AccountType.valueOf(resetPasswordSelect.getValue());
         if (selectedAccountType != AccountType.LOCAL) {

From 3ceb975bd9ddfd4cf4265bfbed4e117b58699f2e Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@kyberorg.pm>
Date: Mon, 13 Feb 2023 11:57:10 +0200
Subject: [PATCH 55/69] PasswordGenerator. Notification (#998)

Signed-off-by: Aleksandr Muravja <aleks@kyberorg.pm>
---
 .../pm/axe/ui/elements/PasswordGenerator.java     |  3 +++
 .../ui/pages/user/profile/tabs/SecurityTab.java   |  6 +++++-
 src/main/java/pm/axe/utils/AppUtils.java          | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
index 82140b52c..11c8c1c9e 100644
--- a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
+++ b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
@@ -11,6 +11,7 @@
 import com.vaadin.flow.component.orderedlayout.FlexLayout;
 import com.vaadin.flow.component.textfield.PasswordField;
 import org.apache.commons.lang3.RandomStringUtils;
+import pm.axe.utils.AppUtils;
 import pm.axe.utils.ClipboardUtils;
 
 
@@ -67,6 +68,8 @@ private void onUseThisPasswordClicked(ClickEvent<Button> event) {
             target.getElement().callJsFunction("_setPasswordVisible", true);
             //suggestion accepted - we can close Password Generator
             getContent().setOpened(false);
+            //show info notification as well
+            AppUtils.showInfoNotification("Also copied to clipboard, so you can record it.");
         } else {
             //copy to clipboard
             ClipboardUtils.showLinkCopiedNotification("Password copied", Notification.Position.MIDDLE);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index c25f61af1..abb4d8ddb 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -210,6 +210,10 @@ private VerticalLayout createTfaContent() {
     }
 
     private void onPasswordChanged(final AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+        if (StringUtils.isBlank(newPasswordInput.getValue())) {
+            newPasswordInput.setInvalid(false);
+            newPasswordInput.setErrorMessage("");
+        }
         boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(newPasswordInput);
         if (isPasswordValid) {
             newPasswordInput.setInvalid(false);
@@ -238,7 +242,7 @@ private void onPasswordUpdate(final ClickEvent<Button> event) {
 
         final boolean isOldPasswordValid = userService.checkPassword(user, oldPassword.trim());
         if (!isOldPasswordValid) {
-            onInvalidInput(oldPasswordInput, "Old Password is incorrect, try again");
+            onInvalidInput(oldPasswordInput, "Old Password is incorrect");
             return;
         }
 
diff --git a/src/main/java/pm/axe/utils/AppUtils.java b/src/main/java/pm/axe/utils/AppUtils.java
index b5040c900..854d402e4 100644
--- a/src/main/java/pm/axe/utils/AppUtils.java
+++ b/src/main/java/pm/axe/utils/AppUtils.java
@@ -347,6 +347,21 @@ public static void showSuccessNotification(final String text) {
         notification.open();
     }
 
+    public static void showInfoNotification(final String text) {
+        Notification notification = new Notification();
+        notification.setPosition(Notification.Position.MIDDLE);
+        notification.setDuration(Axe.Defaults.NOTIFICATION_DURATION_MILLIS); //1.5 seconds
+
+        Icon icon = VaadinIcon.INFO_CIRCLE.create();
+        Div info = new Div(new Text(text));
+
+        HorizontalLayout layout = new HorizontalLayout(icon, info, createCloseBtn(notification));
+        layout.setAlignItems(FlexComponent.Alignment.CENTER);
+
+        notification.add(layout);
+        notification.open();
+    }
+
     /**
      * Creates Session Expired Notification.
      *

From 41f90a50f9fea86c249eeaa9ad075ccaff426f9b Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 13 Feb 2023 15:52:16 +0200
Subject: [PATCH 56/69] Code fixes (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 src/main/java/pm/axe/db/dao/TokenDao.java     |  8 +++
 src/main/java/pm/axe/db/models/Account.java   |  7 +++
 src/main/java/pm/axe/internal/HasTabInit.java |  9 +++
 .../pm/axe/services/user/AccountService.java  | 25 +++++++-
 .../services/user/UserOperationsService.java  | 57 ++++++++++++++-----
 .../pm/axe/services/user/UserService.java     | 10 +++-
 .../services/user/UserSettingsService.java    |  6 ++
 .../pm/axe/ui/elements/AreYouSureDialog.java  |  5 ++
 .../axe/ui/elements/DangerActionDialog.java   | 28 ++++++++-
 .../pm/axe/ui/elements/PasswordGenerator.java | 30 ++++++++--
 .../axe/ui/elements/PeriodDurationField.java  | 12 ++++
 src/main/java/pm/axe/ui/elements/Section.java |  3 +
 .../java/pm/axe/ui/elements/TelegramSpan.java | 12 +++-
 .../axe/ui/elements/UsernameRequirements.java | 18 +++++-
 .../axe/ui/pages/settings/SettingsPage.java   | 28 +++++----
 .../axe/ui/pages/tos/TermsOfServicePage.java  |  3 +
 .../axe/ui/pages/user/ConfirmAccountPage.java |  2 +-
 .../axe/ui/pages/user/ForgotPasswordPage.java |  4 +-
 .../ui/pages/user/LoginVerificationPage.java  |  4 +-
 .../axe/ui/pages/user/RegistrationPage.java   |  7 ++-
 .../ui/pages/user/profile/ProfilePage.java    |  2 +-
 .../pages/user/profile/tabs/ProfileTab.java   | 19 +++++--
 .../pages/user/profile/tabs/SecurityTab.java  |  4 +-
 .../pages/user/profile/tabs/SettingsTab.java  |  4 +-
 .../java/pm/axe/users/UsernameGenerator.java  | 11 +++-
 src/main/java/pm/axe/utils/AppUtils.java      | 12 ++++
 .../java/pm/axe/utils/AxeSessionUtils.java    | 10 ++++
 .../pm/axe/utils/FieldsValidationUtils.java   | 25 ++++++++
 src/main/java/pm/axe/utils/VaadinUtils.java   | 44 +++++++++++++-
 29 files changed, 352 insertions(+), 57 deletions(-)

diff --git a/src/main/java/pm/axe/db/dao/TokenDao.java b/src/main/java/pm/axe/db/dao/TokenDao.java
index 80021ada9..f2257df5a 100644
--- a/src/main/java/pm/axe/db/dao/TokenDao.java
+++ b/src/main/java/pm/axe/db/dao/TokenDao.java
@@ -63,6 +63,14 @@ public interface TokenDao extends TimeAwareCrudDao<Token, Long> {
      */
     Token findByTokenTypeAndUser(TokenType tokenType, User user);
 
+    /**
+     * Finds {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN} by its {@link TokenType}, {@link User} and {@link Account}
+     * @param tokenType normally {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN}.
+     * @param user {@link Token}'s owner
+     * @param account {@link Account} to be confirmed
+     *
+     * @return {@link Optional} with found {@link Token} record or {@link Optional#empty()}.
+     */
     Optional<Token> findByTokenTypeAndUserAndConfirmationFor(TokenType tokenType, User user, Account account);
 
     /**
diff --git a/src/main/java/pm/axe/db/models/Account.java b/src/main/java/pm/axe/db/models/Account.java
index b4d6fa8e3..a60c8f9f6 100644
--- a/src/main/java/pm/axe/db/models/Account.java
+++ b/src/main/java/pm/axe/db/models/Account.java
@@ -41,7 +41,14 @@ public static Account.Builder create(final AccountType accountType) {
         return new Builder(accountType);
     }
 
+    /**
+     * This method updates fields iof current {@link Account} record with values from another.
+     *
+     * @param anotherAccount another non-null {@link Account} record to copy values from.
+     * @throws IllegalArgumentException when anotherAccount is NULL.
+     */
     public void copy(final Account anotherAccount) {
+        if (anotherAccount == null) throw new IllegalArgumentException("Another Account cannot be null");
         this.setUser(anotherAccount.getUser());
         this.setType(anotherAccount.getType());
         this.setAccountName(anotherAccount.getAccountName());
diff --git a/src/main/java/pm/axe/internal/HasTabInit.java b/src/main/java/pm/axe/internal/HasTabInit.java
index b667713aa..f568737dc 100644
--- a/src/main/java/pm/axe/internal/HasTabInit.java
+++ b/src/main/java/pm/axe/internal/HasTabInit.java
@@ -1,7 +1,16 @@
 package pm.axe.internal;
 
+import com.vaadin.flow.component.tabs.Tab;
 import pm.axe.db.models.User;
 
+/**
+ * This interface determines, that {@link Tab} has {@link #tabInit(User)} method.
+ */
 public interface HasTabInit {
+    /**
+     * Method, that should be called at initialization phase.
+     *
+     * @param user bound {@link User}. Usually stored within current session.
+     */
     void tabInit(User user);
 }
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index 99d89fb58..57cec6409 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -297,6 +297,21 @@ public OperationResult deleteAccount(final Account account) {
         }
     }
 
+    /**
+     * Updates {@link AccountType#EMAIL} {@link Account}.
+     * This method marks updated {@link AccountType#EMAIL} {@link Account} as unconfirmed.
+     *
+     * @param user {@link Account} owner.
+     *
+     * @param email non-empty string with new Email Address (plain value).
+     *
+     * @return {@link OperationResult#success()} with updated {@link Account} as payload,
+     *         {@link OperationResult#malformedInput()}, when new email address not valid.
+     *         {@link OperationResult#generalFail()} with {@link #ERR_ENCRYPTION_FAILED} message,
+     *          when encryption failed.
+     *          {@link OperationResult#generalFail()} with {@link #ERR_NO_EMAIL_ACCOUNT} message,
+     *          when {@link User} has no {@link AccountType#EMAIL} {@link Account}.
+     */
     public OperationResult updateEmailAccount(final User user, final String email) {
         if (user == null) return OperationResult.malformedInput().withMessage("User cannot be NULL");
         OperationResult validationResult = mailService.isEmailValid(email);
@@ -312,7 +327,8 @@ public OperationResult updateEmailAccount(final User user, final String email) {
             if (encryptEmailResult.ok()) {
                 encryptedEmail = encryptEmailResult.getStringPayload();
             } else {
-                log.error("{} Email encryption failed. Value: {}. Error: {}", TAG, email, encryptEmailResult.getMessage());
+                log.error("{} Email encryption failed. Value: {}. Error: {}",
+                        TAG, email, encryptEmailResult.getMessage());
                 return OperationResult.generalFail().withMessage(ERR_ENCRYPTION_FAILED);
             }
             emailAccount.get().setAccountName(encryptedEmail);
@@ -333,7 +349,14 @@ public OperationResult updateEmailAccount(final User user, final String email) {
         }
     }
 
+    /**
+     * This method restores values from old {@link Account}.
+     *
+     * @param oldAccount old {@link Account} to restore values from.
+     * @throws IllegalArgumentException when old account is NULL.
+     */
     public void rollbackAccount(final Account oldAccount) {
+        if (oldAccount == null) throw new IllegalArgumentException("old account cannot be null");
         Optional<Account> currentAccount = this.getAccount(oldAccount.getUser(), oldAccount.getType());
         try {
             if (currentAccount.isPresent()) {
diff --git a/src/main/java/pm/axe/services/user/UserOperationsService.java b/src/main/java/pm/axe/services/user/UserOperationsService.java
index adeeb12e4..f65c10775 100644
--- a/src/main/java/pm/axe/services/user/UserOperationsService.java
+++ b/src/main/java/pm/axe/services/user/UserOperationsService.java
@@ -108,8 +108,16 @@ public OperationResult registerUser(final RegisterUserInput input) {
         }
         //Create and send - confirmation email for Accounts with Email set.
         if (userAccount.getType() == AccountType.EMAIL) {
-            OperationResult sendConfirmationLetterResult = sendConfirmationLetter(input.getEmail(), userAccount);
-            if (sendConfirmationLetterResult.notOk()) return sendConfirmationLetterResult;
+            Optional<Token> confirmationToken = createConfirmationToken(userAccount);
+            if (confirmationToken.isPresent()) {
+                rollbackTasks.push(RollbackTask.create(Token.class, confirmationToken.get()));
+                OperationResult sendConfirmationLetterResult =
+                        sendConfirmationLetter(confirmationToken.get(), input.getEmail(), userAccount);
+                if (sendConfirmationLetterResult.notOk()) return sendConfirmationLetterResult;
+            } else {
+                log.error("{} Failed to create confirmation {}", TAG, Token.class.getSimpleName());
+                rollbackService.rollback(rollbackTasks);
+            }
         }
         //Create Telegram Confirmation Token
         Token telegramConfirmationToken;
@@ -129,7 +137,39 @@ public OperationResult registerUser(final RegisterUserInput input) {
                 ? success : success.addPayload(TELEGRAM_TOKEN_KEY, telegramConfirmationToken.getToken());
     }
 
-    public OperationResult sendConfirmationLetter(final String email, final Account userAccount) {
+    /**
+     * Creates Confirmation {@link Token}.
+     * @param userAccount {@link Account} to confirm with given Token.
+     *
+     * @return {@link Optional} with {@link Token} or {@link Optional#empty()} if failed t create token.
+     */
+    public Optional<Token> createConfirmationToken(final Account userAccount) {
+        if (userAccount == null) {
+            throw new IllegalArgumentException("User Account cannot be null");
+        }
+        OperationResult createConfirmationTokenResult =
+                tokenService.createConfirmationToken(userAccount.getUser(), userAccount);
+        if (createConfirmationTokenResult.notOk()) {
+            log.error("{} failed to create confirmation token for {}. OpResult: {}",
+                    TAG, userAccount.getUser().getUsername(), createConfirmationTokenResult);
+            return Optional.empty();
+        }
+        return Optional.ofNullable(createConfirmationTokenResult.getPayload(Token.class));
+    }
+
+    /**
+     * Sends {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN}.
+     *
+     * @param confirmationToken {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN} {@link Token}
+     * @param email non-empty string with email
+     * @param userAccount {@link Account} to confirm with given Token
+     *
+     * @return {@link OperationResult#success()}, when email send,
+     *         {@link OperationResult#malformedInput()}, when something is wrong with params,
+     *         {@link OperationResult#generalFail()}, when failed to send letter.
+     */
+    public OperationResult sendConfirmationLetter(final Token confirmationToken, final String email,
+                                                  final Account userAccount) {
         //check inputs
         if (StringUtils.isBlank(email)) {
             return OperationResult.malformedInput().withMessage("Email cannot be empty");
@@ -141,16 +181,7 @@ public OperationResult sendConfirmationLetter(final String email, final Account
             return OperationResult.malformedInput().withMessage("Given Account is not bound to any user");
         }
 
-        //Create Confirmation Token
-        OperationResult createConfirmationTokenResult =
-                tokenService.createConfirmationToken(userAccount.getUser(), userAccount);
-        if (createConfirmationTokenResult.notOk()) {
-            log.error("{} failed to create confirmation token for {}. OpResult: {}",
-                    TAG, userAccount.getUser().getUsername(), createConfirmationTokenResult);
-            return createConfirmationTokenResult;
-        }
-        Token confirmationToken = createConfirmationTokenResult.getPayload(Token.class);
-        rollbackTasks.push(RollbackTask.create(Token.class, confirmationToken));
+
         //Send it
         log.info("{} Successfully created {}({}) for user '{}'",
                 TAG, confirmationToken.getTokenType(), confirmationToken.getToken(),
diff --git a/src/main/java/pm/axe/services/user/UserService.java b/src/main/java/pm/axe/services/user/UserService.java
index b10a214a6..2db03583c 100644
--- a/src/main/java/pm/axe/services/user/UserService.java
+++ b/src/main/java/pm/axe/services/user/UserService.java
@@ -196,7 +196,15 @@ void confirmUser(final User user) {
         userDao.update(user);
     }
 
-
+    /**
+     * Updates username.
+     *
+     * @param user {@link User}, that should be updated.
+     * @param username non-empty string with new username.
+     *
+     * @return {@link OperationResult#malformedInput()} if username doesn't meet requirements
+     * or {@link OperationResult#success()} if update was successful.
+     */
     public OperationResult updateUsername(final User user, final String username) {
         if (user == null) return OperationResult.malformedInput().withMessage("User cannot be NULL");
         OperationResult validationResult = UsernameValidator.isValid(username);
diff --git a/src/main/java/pm/axe/services/user/UserSettingsService.java b/src/main/java/pm/axe/services/user/UserSettingsService.java
index d570fde63..06e56c364 100644
--- a/src/main/java/pm/axe/services/user/UserSettingsService.java
+++ b/src/main/java/pm/axe/services/user/UserSettingsService.java
@@ -62,6 +62,12 @@ public void deleteUserSettings(final UserSettings settings) {
         userSettingsDao.delete(settings);
     }
 
+    /**
+     * Checks if user has 2FA enabled or not.
+     *
+     * @param user {@link UserSettings} owner
+     * @return true - if 2FA is enabled for given {@link User}, false - in other cases.
+     */
     public boolean isTfaEnabled(final User user) {
         Optional<UserSettings> userSettings = getUserSettings(user);
         return userSettings.map(UserSettings::isTfaEnabled).orElse(false);
diff --git a/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
index c1ba9afe4..2fbe7975d 100644
--- a/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
+++ b/src/main/java/pm/axe/ui/elements/AreYouSureDialog.java
@@ -57,6 +57,11 @@ public void show() {
         this.dialog.open();
     }
 
+    /**
+     * Sets text of {@link #actionButton}. Does nothing is text is empty.
+     *
+     * @param text non-empty string with text of {@link #actionButton}.
+     */
     public void setActionButtonText(final String text) {
         if (StringUtils.isNotBlank(text)) {
             actionButton.setText(text);
diff --git a/src/main/java/pm/axe/ui/elements/DangerActionDialog.java b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
index 1ec1c2ac0..dde7eb1b5 100644
--- a/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
+++ b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
@@ -18,9 +18,10 @@
 import com.vaadin.flow.shared.Registration;
 import org.apache.commons.lang3.StringUtils;
 import pm.axe.internal.Callback;
+import pm.axe.ui.pages.user.profile.tabs.DangerZoneTab;
 
 /**
- * Confirmation Dialog for actions in {@link pm.axe.ui.pages.user.profile.tabs.DangerZoneTab}.
+ * Confirmation Dialog for actions in {@link DangerZoneTab}.
  *
  */
 @CssImport("./css/danger_dialog.css")
@@ -54,6 +55,11 @@ public static DangerActionDialog create() {
         return new DangerActionDialog();
     }
 
+    /**
+     * Set {@link Dialog}'s title. This method hides title, when title string is empty.
+     *
+     * @param newTitleText non-empty string to set new title or empty string to hide title.
+     */
     public void setTitleText(final String newTitleText) {
         if (newTitleText.isBlank()) {
             title.setVisible(false);
@@ -61,6 +67,11 @@ public void setTitleText(final String newTitleText) {
         title.setText(newTitleText);
     }
 
+    /**
+     * Set {@link Dialog}'s main message. This method hides message span, when message string is empty.
+     *
+     * @param message non-empty string to set new message or empty string to hide it.
+     */
     public void setMessage(final String message) {
         if (StringUtils.isBlank(message)) {
             messageSpan.setVisible(false);
@@ -68,6 +79,11 @@ public void setMessage(final String message) {
         messageSpan.setText(message);
     }
 
+    /**
+     * Set warning text. This method hides warning zone, when warning text is empty.
+     *
+     * @param warningText non-empty string to set new warning message or empty string to hide warning zone.
+     */
     public void setWarningText(final String warningText) {
         if (StringUtils.isBlank(warningText)) {
             warningZone.setVisible(false);
@@ -75,6 +91,11 @@ public void setWarningText(final String warningText) {
         warningTextSpan.setText(warningText);
     }
 
+    /**
+     * Set text, that user should type to confirm this dangerous action.
+     *
+     * @param confirmationText non-empty string to set new text or empty string to hide confirmation zone at all.
+     */
     public void setConfirmationText(final String confirmationText) {
         if (StringUtils.isBlank(confirmationText)) {
             confirmationZone.setVisible(false);
@@ -101,6 +122,11 @@ public void setActionButtonAction(final Callback callback) {
         });
     }
 
+    /**
+     * Sets text of {@link #actionButton}. Does nothing is text is empty.
+     *
+     * @param text non-empty string with text of {@link #actionButton}.
+     */
     public void setActionButtonText(final String text) {
         if (StringUtils.isNotBlank(text)) {
             actionButton.setText(text);
diff --git a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
index 11c8c1c9e..0a7765bbf 100644
--- a/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
+++ b/src/main/java/pm/axe/ui/elements/PasswordGenerator.java
@@ -14,9 +14,11 @@
 import pm.axe.utils.AppUtils;
 import pm.axe.utils.ClipboardUtils;
 
-
+/**
+ * Password Generator elements. Generated password and copy and update buttons.
+ */
 @SuppressWarnings({"FieldCanBeLocal"})
-public class PasswordGenerator extends Composite<Details> {
+public final class PasswordGenerator extends Composite<Details> {
     private static final String SUMMARY_TEXT = "Password Generator";
     private static final int DEFAULT_LEN = 24;
     private final Code generatedPasswordHolder = new Code();
@@ -25,17 +27,33 @@ public class PasswordGenerator extends Composite<Details> {
 
     private PasswordField target;
 
+    /**
+     * Creates new {@link PasswordGenerator}.
+     *
+     * @return created {@link PasswordGenerator}.
+     */
     public static PasswordGenerator create() {
         return new PasswordGenerator();
     }
 
+    /**
+     * Sets {@link PasswordField} where generated password should be pasted.
+     *
+     * @param component {@link PasswordField} where new password pasted.
+     * @throws IllegalArgumentException when target component is NULL
+     */
     public void setCopyTarget(final PasswordField component) {
         if (component == null) throw new IllegalArgumentException("cannot copy to null component");
         this.target = component;
     }
 
-    public void setOpened(final boolean shouldOpen) {
-        getContent().setOpened(shouldOpen);
+    /**
+     * Opens {@link PasswordGenerator}, so content is visible.
+     *
+     * @param open should {@link PasswordGenerator} be opened. False means {@link PasswordGenerator} should be closed.
+     */
+    public void setOpened(final boolean open) {
+        getContent().setOpened(open);
     }
 
     private PasswordGenerator() {
@@ -61,7 +79,7 @@ private PasswordGenerator() {
         getContent().setContent(content);
     }
 
-    private void onUseThisPasswordClicked(ClickEvent<Button> event) {
+    private void onUseThisPasswordClicked(final ClickEvent<Button> event) {
         if (target != null) {
             //copy to component
             target.setValue(generatedPasswordHolder.getText());
@@ -76,7 +94,7 @@ private void onUseThisPasswordClicked(ClickEvent<Button> event) {
         }
     }
 
-    private void onRedoButtonClicked(ClickEvent<Button> event) {
+    private void onRedoButtonClicked(final ClickEvent<Button> event) {
         generatedPasswordHolder.setText(generatePassword());
         ClipboardUtils.setTextToCopy(generatedPasswordHolder.getText()).forComponent(useItButton);
     }
diff --git a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
index 5abec1ca3..f1d2d5a32 100644
--- a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
+++ b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
@@ -15,6 +15,9 @@
 
 import static java.time.temporal.ChronoUnit.*;
 
+/**
+ * Element, that combines amount or {@link ChronoUnit} units and {@link ChronoUnit}.
+ */
 public class PeriodDurationField extends CustomField<PeriodDuration> {
     public static final String ERROR_MESSAGE = "Invalid duration. Min: 1 minute, Max: 6 months.";
     private static final List<ChronoUnit> SUPPORTED_UNITS = List.of(MONTHS, DAYS, HOURS, MINUTES);
@@ -22,6 +25,10 @@ public class PeriodDurationField extends CustomField<PeriodDuration> {
     private final IntegerField amount;
     private final Select<String> unit;
 
+    /**
+     * Creates new {@link PeriodDurationField} with default values.
+     * 1 - as amount of units, {@link ChronoUnit#MONTHS} as unit.
+     */
     public PeriodDurationField() {
         //amount field
         amount = new IntegerField();
@@ -60,6 +67,11 @@ public PeriodDurationField() {
         add(layout);
     }
 
+    /**
+     * Examines if both {@link #amount} and {@link #unit} are valid.
+     *
+     * @return true if both are valid, false if not.
+     */
     public boolean isValid() {
         if (amount.isInvalid()) return false;
         return !unit.isInvalid();
diff --git a/src/main/java/pm/axe/ui/elements/Section.java b/src/main/java/pm/axe/ui/elements/Section.java
index 81ab49223..894609fb3 100644
--- a/src/main/java/pm/axe/ui/elements/Section.java
+++ b/src/main/java/pm/axe/ui/elements/Section.java
@@ -94,6 +94,9 @@ public void add(final Component component) {
         content.add(component);
     }
 
+    /**
+     * Aligns {@link Section} items at {@link FlexComponent.Alignment#CENTER}.
+     */
     public void setCentered() {
         self.setAlignItems(FlexComponent.Alignment.CENTER);
         content.setWidth("auto");
diff --git a/src/main/java/pm/axe/ui/elements/TelegramSpan.java b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
index 1aa3d19d8..b84a02490 100644
--- a/src/main/java/pm/axe/ui/elements/TelegramSpan.java
+++ b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
@@ -9,17 +9,27 @@
 import pm.axe.Axe;
 import pm.axe.db.models.Token;
 import pm.axe.telegram.TelegramCommand;
+import pm.axe.users.TokenType;
 import pm.axe.utils.AppUtils;
 import pm.axe.utils.ClipboardUtils;
 import pm.axe.utils.DeviceUtils;
 
+/**
+ * {@link Span} with message "Send code to link your account with Telegram".
+ */
 public class TelegramSpan extends Composite<Span> {
 
+    /**
+     * Creates new {@link TelegramSpan}.
+     *
+     * @param token {@link TokenType#TELEGRAM_CONFIRMATION_TOKEN} {@link Token}.
+     * @return new {@link TelegramSpan} with prefilled fields.
+     */
     public static TelegramSpan create(final Token token) {
         return new TelegramSpan(token);
     }
 
-    public TelegramSpan(final Token tgToken) {
+    private TelegramSpan(final Token tgToken) {
         String tgCommand = TelegramCommand.HELLO.getCommandText();
 
         Span startSpan = new Span("Send ");
diff --git a/src/main/java/pm/axe/ui/elements/UsernameRequirements.java b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
index 0d37f17a9..a93cd740c 100644
--- a/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
+++ b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
@@ -9,16 +9,30 @@
 
 import java.util.stream.Stream;
 
-public class UsernameRequirements extends Composite<Details> implements HasStyle {
-
+/**
+ * {@link Details} elements with list of requirements for username.
+ */
+public final class UsernameRequirements extends Composite<Details> implements HasStyle {
+
+    /**
+     * Creates new {@link UsernameRequirements}.
+     *
+     * @return created {@link UsernameRequirements}.
+     */
     public static UsernameRequirements create() {
         return new UsernameRequirements();
     }
 
+    /**
+     * Sets {@link UsernameRequirements} visible.
+     */
     public void show() {
         this.setVisible(true);
     }
 
+    /**
+     * Sets {@link UsernameRequirements} not visible.
+     */
     public void hide() {
         this.setVisible(false);
     }
diff --git a/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java b/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
index 1dd08c2f5..e46d4fe79 100644
--- a/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
+++ b/src/main/java/pm/axe/ui/pages/settings/SettingsPage.java
@@ -75,6 +75,23 @@ public SettingsPage(final MainView mainView, final AxeSessionUtils axeSessionUti
         pageInit();
     }
 
+    /**
+     * Trigger actions, when Dark Mode Toggle value changes. It applies dark mode,
+     * updates dark mode setting in {@link AxeSession} and {@link UserSettings}.
+     *
+     * @param event event, that holder that has toggle value.
+     */
+    public void onDarkModeChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> event) {
+        final boolean isDarkTheme = event.getValue();
+        mainView.applyTheme(isDarkTheme);
+        AxeSession.getCurrent().ifPresent(session -> session.getSettings().setDarkMode(event.getValue()));
+        //write to user settings as well,  if any bound.
+        axeSessionUtils.getCurrentUserSettings().ifPresent(us -> {
+            us.setDarkMode(event.getValue());
+            uss.updateUserSettings(us);
+        });
+    }
+
     private void pageInit() {
         setIds();
         setPageStructure();
@@ -148,17 +165,6 @@ private void onAnalyticCookiesChanged(final AbstractField.ComponentValueChangeEv
         notifyClient();
     }
 
-    public void onDarkModeChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> event) {
-        final boolean isDarkTheme = event.getValue();
-        mainView.applyTheme(isDarkTheme);
-        AxeSession.getCurrent().ifPresent(session -> session.getSettings().setDarkMode(event.getValue()));
-        //write to user settings as well,  if any bound.
-        axeSessionUtils.getCurrentUserSettings().ifPresent(us -> {
-            us.setDarkMode(event.getValue());
-            uss.updateUserSettings(us);
-        });
-    }
-
     private void onUsersFeatureSwitchChanged(final AbstractField.ComponentValueChangeEvent<ToggleButton, Boolean> e) {
         AxeSession.getCurrent().ifPresent(session -> session.getSettings().setUsersFeatureEnabled(e.getValue()));
         notifyClient();
diff --git a/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java b/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java
index 3dab3ee8e..5954a5cb8 100644
--- a/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java
+++ b/src/main/java/pm/axe/ui/pages/tos/TermsOfServicePage.java
@@ -14,6 +14,9 @@
 @Route(value = Endpoint.UI.TOS_PAGE, layout = MainView.class)
 @PageTitle("Terms of Service - Axe.pm")
 public class TermsOfServicePage extends AxeBaseLayout {
+    /**
+     * Creates {@link TermsOfServicePage}.
+     */
     public TermsOfServicePage() {
         add(new Span("Here will be Axe Terms of Service"));
     }
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index 8ecc49a35..fef6ead04 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -105,7 +105,7 @@ private Component telegramSectionContent() {
         return TelegramSpan.create(tgToken);
     }
 
-    private void onSubmitEmail(ClickEvent<Button> event) {
+    private void onSubmitEmail(final ClickEvent<Button> event) {
         if (emailInput.isInvalid()) {
             emailInput.setInvalid(true);
             emailInput.setErrorMessage("Please enter valid email");
diff --git a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
index d9eea079d..1a3393aea 100644
--- a/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ForgotPasswordPage.java
@@ -98,8 +98,8 @@ private void showSuccessMessage() {
 
     private VerticalLayout getRecoveryNote() {
         VerticalLayout recoveryNote = new VerticalLayout();
-        Span infoSpan = new Span("We will send password reset link to contact point (email etc.) " +
-                "linked with given account.");
+        Span infoSpan = new Span("We will send password reset link to contact point (email etc.) "
+                + "linked with given account.");
 
         VerticalLayout nothingLinkedContent = getAccordionContent();
 
diff --git a/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java b/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java
index 8462917bb..5ebdf4edc 100644
--- a/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/LoginVerificationPage.java
@@ -33,7 +33,7 @@ public class LoginVerificationPage extends AxeFormLayout implements BeforeEnterO
     private boolean pageAlreadyInitialized = false;
 
     @Override
-    public void beforeEnter(BeforeEnterEvent event) {
+    public void beforeEnter(final BeforeEnterEvent event) {
         if (event.isRefreshEvent()) return;
         if (pageAlreadyInitialized) {
             cleanInputs();
@@ -59,7 +59,7 @@ private void pageInit() {
         getSubmitButton().addClickListener(this::onSubmit);
     }
 
-    private void onSubmit(ClickEvent<Button> event) {
+    private void onSubmit(final ClickEvent<Button> event) {
         String otp = otpInput.getValue();
         if (StringUtils.isBlank(otp)) {
             otpInput.setInvalid(true);
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index a444abe12..fbea9eff6 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -72,7 +72,7 @@ public class RegistrationPage extends AxeFormLayout implements BeforeEnterObserv
     private boolean pageAlreadyInitialized = false;
 
     @Override
-    public void beforeEnter(BeforeEnterEvent enterEvent) {
+    public void beforeEnter(final BeforeEnterEvent enterEvent) {
         if (enterEvent.isRefreshEvent()) return;
         //redirect to landing page if user already in
         if (Objects.nonNull(axeSessionUtils.boundUserIfAny())) {
@@ -144,7 +144,8 @@ private void setupUserRequirementsSection() {
                         "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
                         "Also allowed of the dot (.), underscore (_), and hyphen (-).",
                         "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
-                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
+                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, "
+                                + "e.g., name..surname.")
                 .forEach(requirement -> requirements.add(new ListItem(requirement)));
 
         usernameRequirements.addContent(span, requirements);
@@ -237,7 +238,7 @@ private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<Tex
         }
     }
 
-    private void onPasswordChanged(AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+    private void onPasswordChanged(final AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
         boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(passwordInput);
         if (isPasswordValid) {
             passwordInput.setInvalid(false);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
index 07ede6d1d..785760838 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/ProfilePage.java
@@ -57,7 +57,7 @@ public class ProfilePage extends AxeCompactLayout implements BeforeEnterObserver
     private final Map<Tab, Component> contentMap = new LinkedHashMap<>();
 
     @Override
-    public void beforeEnter(BeforeEnterEvent event) {
+    public void beforeEnter(final BeforeEnterEvent event) {
         if (event.isRefreshEvent()) return;
         user = axeSessionUtils.boundUserIfAny();
         if (Objects.isNull(user)) {
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 151725f63..7560e6d5c 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -278,13 +278,13 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         }
     }
 
-    private void onEditEmail(ClickEvent<Button> event) {
+    private void onEditEmail(final ClickEvent<Button> event) {
         emailField.setReadOnly(false);
         emailField.setSuffixComponent(new Div());
         emailLayout.replace(editEmailButton, saveEmailButton);
     }
 
-    private void onSaveEmail(ClickEvent<Button> event) {
+    private void onSaveEmail(final ClickEvent<Button> event) {
         //is same as current ?
         Optional<String> currentEmail = getCurrentEmail();
         if (currentEmail.isEmpty()) return;
@@ -321,7 +321,7 @@ private void onSaveEmail(ClickEvent<Button> event) {
         OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
         if (emailUpdateResult.notOk()) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
-            if (currentEmailRecord.isPresent() ) {
+            if (currentEmailRecord.isPresent()) {
                 emailField.setValue(currentEmail.get());
             } else {
                 emailField.setValue("");
@@ -330,9 +330,18 @@ private void onSaveEmail(ClickEvent<Button> event) {
             ErrorUtils.showErrorNotification("Failed to update email. Server error");
         }
 
+        //creating confirmation token
+        Account userAccount = emailUpdateResult.getPayload(Account.class);
+        Optional<Token> confirmationToken = userOpsService.createConfirmationToken(userAccount);
+        if (confirmationToken.isEmpty()) {
+            emailField.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
+            ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
+            return;
+        }
         //sending confirmation letter
-        OperationResult sendConfirmationLetterResult = userOpsService.sendConfirmationLetter(email,
-                emailUpdateResult.getPayload(Account.class));
+        OperationResult sendConfirmationLetterResult =
+                userOpsService.sendConfirmationLetter(confirmationToken.get(), email, userAccount);
         if (sendConfirmationLetterResult.ok()) {
             emailField.setSuffixComponent(VaadinIcon.ELLIPSIS_CIRCLE.create());
             AppUtils.showSuccessNotification("Send confirmation to new email. Please check your inbox.");
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index abb4d8ddb..f35267ec5 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -129,7 +129,7 @@ private VerticalLayout createResetPasswordChannelContent() {
 
         Label sendResetLinkToLabel = new Label("Send reset password link to:");
         resetPasswordSelect = new Select<>();
-        resetPasswordSelect.addValueChangeListener(this::onResetPasswordSelectModified);
+        resetPasswordSelect.addValueChangeListener(this::onResetPassSelectModified);
 
         HorizontalLayout resetPasswordFieldLayout = new HorizontalLayout(sendResetLinkToLabel, resetPasswordField);
         VaadinUtils.fitLayoutInWindow(resetPasswordFieldLayout);
@@ -254,7 +254,7 @@ private void doPasswordChange() {
         AppUtils.showSuccessNotification("Will do once implemented");
     }
 
-    private void onResetPasswordSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
+    private void onResetPassSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> e) {
         AccountType selectedAccountType = AccountType.valueOf(resetPasswordSelect.getValue());
         if (selectedAccountType != AccountType.LOCAL) {
             saveResetPasswordChannel(selectedAccountType);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
index 7f6ebc8a7..af4bba220 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SettingsTab.java
@@ -126,7 +126,7 @@ private Component darkModeLayout() {
         return layout;
     }
 
-    private void onLandingPageSelectChanged(AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
+    private void onLandingPageSelectChanged(final AbstractField.ComponentValueChangeEvent<Select<String>, String> e) {
         LandingPage landingPage = LandingPage.valueOf(landingPageSelect.getValue());
         Optional<UserSettings> userSettings = axeSessionUtils.getCurrentUserSettings();
         if (userSettings.isPresent()) {
@@ -140,7 +140,7 @@ private void onDarkModeToggleChanged(final AbstractField.ComponentValueChangeEve
         settingsPage.onDarkModeChanged(event); // do same action as in Settings Page
     }
 
-    private void onSessionDurationSaved(ClickEvent<Button> event) {
+    private void onSessionDurationSaved(final ClickEvent<Button> event) {
         axeSessionUtils.getCurrentUserSettings().ifPresent(us -> {
             if (pdField.isValid()) {
                 us.setLoginSessionDuration(pdField.getValue());
diff --git a/src/main/java/pm/axe/users/UsernameGenerator.java b/src/main/java/pm/axe/users/UsernameGenerator.java
index dc98200d6..cf402072c 100644
--- a/src/main/java/pm/axe/users/UsernameGenerator.java
+++ b/src/main/java/pm/axe/users/UsernameGenerator.java
@@ -58,7 +58,16 @@ public OperationResult generateRandom() {
         }
     }
 
+    /**
+     * Generates new username from provided email.
+     *
+     * @param emailAddress non-empty string with email address.
+     * @return {@link OperationResult#success()} with generated name {@link String} in payload or
+     *         {@link OperationResult#malformedInput()}, when email address is not valid.
+     * @throws IllegalArgumentException when email address is NULL.
+     */
     public OperationResult generateFromEmail(final String emailAddress) {
+        if (emailAddress == null) throw new IllegalArgumentException("Email address cannot be NULL");
         String[] parts = emailAddress.split(Axe.C.AT);
         if (parts.length < 2) {
             return OperationResult.malformedInput().withMessage(String.format("%s is not valid email", emailAddress));
@@ -75,7 +84,7 @@ public OperationResult generateFromEmail(final String emailAddress) {
         boolean isUsernameAlreadyExist = userService.isUserExists(nameFromEmail);
         if (isUsernameAlreadyExist) {
             String generatedName;
-            for (int i=1; i <= MAX_ROUNDS; i++) {
+            for (int i = 1; i <= MAX_ROUNDS; i++) {
                 generatedName = nameFromEmail + i;
                 nameValidationResult = UsernameValidator.isValid(generatedName);
                 if (nameValidationResult.notOk()) {
diff --git a/src/main/java/pm/axe/utils/AppUtils.java b/src/main/java/pm/axe/utils/AppUtils.java
index 854d402e4..25357ee59 100644
--- a/src/main/java/pm/axe/utils/AppUtils.java
+++ b/src/main/java/pm/axe/utils/AppUtils.java
@@ -331,6 +331,12 @@ public static Notification getNotification(final String text, final Notification
         return notification;
     }
 
+    /**
+     * Shows Notification, when action succeeded.
+     * Notification closes after {@link Axe.Defaults#NOTIFICATION_DURATION_MILLIS}.
+     *
+     * @param text not-empty string with notification text.
+     */
     public static void showSuccessNotification(final String text) {
         Notification notification = new Notification();
         notification.addThemeVariants(NotificationVariant.LUMO_SUCCESS);
@@ -347,6 +353,12 @@ public static void showSuccessNotification(final String text) {
         notification.open();
     }
 
+    /**
+     * Shows Informational notification.
+     * Notification closes after {@link Axe.Defaults#NOTIFICATION_DURATION_MILLIS}.
+     *
+     * @param text not-empty string with notification text.
+     */
     public static void showInfoNotification(final String text) {
         Notification notification = new Notification();
         notification.setPosition(Notification.Position.MIDDLE);
diff --git a/src/main/java/pm/axe/utils/AxeSessionUtils.java b/src/main/java/pm/axe/utils/AxeSessionUtils.java
index 97359948c..f41a2de72 100644
--- a/src/main/java/pm/axe/utils/AxeSessionUtils.java
+++ b/src/main/java/pm/axe/utils/AxeSessionUtils.java
@@ -35,6 +35,11 @@ public Optional<UserSettings> getCurrentUserSettings() {
         }
     }
 
+    /**
+     * Extracts {@link User} from current {@link AxeSession}.
+     *
+     * @return bound {@link User} or {@code null}.
+     */
     public User boundUserIfAny() {
         Optional<AxeSession> axeSession = AxeSession.getCurrent();
         if (axeSession.isPresent()) {
@@ -48,6 +53,11 @@ public User boundUserIfAny() {
         }
     }
 
+    /**
+     * Gets {@link LandingPage} from {@link UserSettings}.
+     *
+     * @return {@link LandingPage} from {@link UserSettings} or default value {@link LandingPage#HOME_PAGE}.
+     */
     public LandingPage getLandingPage() {
         final User user = this.boundUserIfAny();
         final Optional<UserSettings> us = this.getCurrentUserSettings();
diff --git a/src/main/java/pm/axe/utils/FieldsValidationUtils.java b/src/main/java/pm/axe/utils/FieldsValidationUtils.java
index dbea4de03..66eba7f81 100644
--- a/src/main/java/pm/axe/utils/FieldsValidationUtils.java
+++ b/src/main/java/pm/axe/utils/FieldsValidationUtils.java
@@ -15,6 +15,7 @@
 
 import static pm.axe.utils.VaadinUtils.onInvalidInput;
 
+
 @RequiredArgsConstructor
 @Component
 @UIScope
@@ -22,7 +23,15 @@ public class FieldsValidationUtils {
     private final AccountService accountService;
     private final UserService userService;
 
+    /**
+     * Checks if username is valid or not.
+     *
+     * @param usernameInput {@link TextField} with username.
+     * @return true if username is valid, false if not.
+     * @throws IllegalArgumentException when usernameInput is NULL
+     */
     public boolean isUsernameInvalid(final TextField usernameInput) {
+        if (usernameInput == null) throw new IllegalArgumentException("usernameInput cannot be NULL");
         String userOrEmail = usernameInput.getValue().trim();
         boolean isInputEmpty = StringUtils.isBlank(userOrEmail);
         if (isInputEmpty) {
@@ -38,7 +47,15 @@ public boolean isUsernameInvalid(final TextField usernameInput) {
         }
     }
 
+    /**
+     * Checks if email address is valid or not.
+     *
+     * @param emailInput {@link TextField} with email address.
+     * @return true if email address is valid, false if not.
+     * @throws IllegalArgumentException when emailInput is NULL
+     */
     public boolean isEmailInvalid(final TextField emailInput) {
+        if (emailInput == null) throw new IllegalArgumentException("email input cannot be null");
         final String email = emailInput.getValue().trim();
         boolean isEmail = EmailValidator.getInstance().isValid(email);
         if (!isEmail) {
@@ -54,7 +71,15 @@ public boolean isEmailInvalid(final TextField emailInput) {
         }
     }
 
+    /**
+     * Checks if password is valid or not.
+     *
+     * @param passwordInput {@link PasswordField} with password to check
+     * @return true if password is valid, false - is not.
+     * @throws IllegalArgumentException when passwordInput is NULL
+     */
     public boolean isPasswordInvalid(final PasswordField passwordInput) {
+        if (passwordInput == null) throw new IllegalArgumentException("password input cannot be null");
         String password = passwordInput.getValue().trim();
         OperationResult passwordValidationOp = PasswordValidator.isPasswordValid(password);
         if (passwordValidationOp.notOk()) {
diff --git a/src/main/java/pm/axe/utils/VaadinUtils.java b/src/main/java/pm/axe/utils/VaadinUtils.java
index 9d11055db..4c280a3c4 100644
--- a/src/main/java/pm/axe/utils/VaadinUtils.java
+++ b/src/main/java/pm/axe/utils/VaadinUtils.java
@@ -5,6 +5,7 @@
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.BeforeEvent;
 import com.vaadin.flow.router.QueryParameters;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Optional;
 
@@ -47,6 +48,11 @@ public static Optional<String> getParamValue(final String paramName, final Befor
         }
     }
 
+    /**
+     * Fit Layout into available windows. This helps to fit elements to small screens.
+     *
+     * @param layout {@link FlexComponent} layout to fit.
+     */
     public static void fitLayoutInWindow(final FlexComponent layout) {
         layout.addClassName("fit-in-window");
         layout.setAlignItems(FlexComponent.Alignment.BASELINE);
@@ -62,29 +68,63 @@ public static void setWrap(final FlexComponent layout) {
         layout.getStyle().set("flex-wrap", "wrap");
     }
 
+    /**
+     * Sets small spacing between elements in {@link HorizontalLayout}.
+     *
+     * @param layout target {@link HorizontalLayout}.
+     */
     public static void setSmallSpacing(final HorizontalLayout layout) {
         layout.setSpacing(false);
         layout.getThemeList().add("spacing-s");
     }
 
+    /**
+     * Aligns given element at center.
+     *
+     * @param component element to center.
+     */
     public static void setCentered(final HasStyle component) {
         component.addClassName("centered-element");
     }
 
+    /**
+     * Sets flex value. This is needed because Vaadin doesn't provide methods to change it.
+     *
+     * @param component target element to apply flex value to.
+     * @param flexValue non-empty string with flex value.
+     * @throws IllegalArgumentException when component or flex value is null.
+     */
     public static void setFlex(final HasStyle component, final String flexValue) {
+        if (component == null) throw new IllegalArgumentException("Component cannot be null");
+        if (StringUtils.isBlank(flexValue)) throw new IllegalArgumentException("Flex Value cannot be blank");
         component.getStyle().set("flex", flexValue);
     }
 
+    /**
+     * Marks {@link Component} as invalid, sets error message and sets focus if {@link Component} is {@link Focusable}.
+     *
+     * @param component {@link Component} to check.
+     * @param errorMessage non-empty string with error message. If error message is empty - no message will be set.
+     * @throws IllegalArgumentException when component is NULL
+     */
     public static void onInvalidInput(final HasValidation component, final String errorMessage) {
+        if (component == null) throw new IllegalArgumentException("component cannot be null");
         component.setInvalid(true);
-        component.setErrorMessage(errorMessage);
+        if (StringUtils.isNotBlank(errorMessage)) {
+            component.setErrorMessage(errorMessage);
+        }
         if (component instanceof Focusable<?>) {
             ((Focusable<?>) component).focus();
         }
     }
 
+    /**
+     * Cleans input's value, validation state and error message.
+     *
+     * @param input {@link Component} to clean.
+     */
     public static void cleanInput(final Component input) {
-        if (input instanceof HasValue<?,?>) {
+        if (input instanceof HasValue<?, ?>) {
             ((HasValue<?, ?>) input).clear();
         }
         if (input instanceof HasValidation) {

From 956345890294b874e22a8bfa07983a529b14aef5 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 13 Feb 2023 16:06:43 +0200
Subject: [PATCH 57/69] Code fixes 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 src/main/java/pm/axe/db/dao/TokenDao.java     |  3 ++-
 .../axe/ui/elements/DangerActionDialog.java   |  4 ++--
 .../axe/ui/elements/PeriodDurationField.java  | 22 ++++++++++---------
 .../java/pm/axe/ui/elements/TelegramSpan.java |  2 +-
 .../axe/ui/elements/UsernameRequirements.java |  2 +-
 .../axe/ui/pages/user/RegistrationPage.java   |  4 ++--
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/pm/axe/db/dao/TokenDao.java b/src/main/java/pm/axe/db/dao/TokenDao.java
index f2257df5a..f705469f7 100644
--- a/src/main/java/pm/axe/db/dao/TokenDao.java
+++ b/src/main/java/pm/axe/db/dao/TokenDao.java
@@ -64,7 +64,8 @@ public interface TokenDao extends TimeAwareCrudDao<Token, Long> {
     Token findByTokenTypeAndUser(TokenType tokenType, User user);
 
     /**
-     * Finds {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN} by its {@link TokenType}, {@link User} and {@link Account}
+     * Finds {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN} by its {@link TokenType}, {@link User} and {@link Account}.
+     *
      * @param tokenType normally {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN}.
      * @param user {@link Token}'s owner
      * @param account {@link Account} to be confirmed
diff --git a/src/main/java/pm/axe/ui/elements/DangerActionDialog.java b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
index dde7eb1b5..fedc86320 100644
--- a/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
+++ b/src/main/java/pm/axe/ui/elements/DangerActionDialog.java
@@ -114,7 +114,7 @@ public void setActionButtonAction(final Callback callback) {
             boolean isConfirmed = checkConfirmationInput();
             if (!isConfirmed) {
                 confirmInput.setInvalid(true);
-                confirmInput.setErrorMessage("Please type exactly '" + confirmationTextSpan.getText() +"'");
+                confirmInput.setErrorMessage("Please type exactly '" + confirmationTextSpan.getText() + "'");
                 return;
             }
             callback.execute();
@@ -201,7 +201,7 @@ private VerticalLayout createDialogLayout() {
     }
 
     private boolean checkConfirmationInput() {
-        if (!confirmationZone.isVisible()) { return true; }
+        if (!confirmationZone.isVisible()) return true;
 
         String inputText = confirmInput.getValue();
         if (StringUtils.isBlank(inputText)) return false;
diff --git a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
index f1d2d5a32..e1073eaa7 100644
--- a/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
+++ b/src/main/java/pm/axe/ui/elements/PeriodDurationField.java
@@ -25,6 +25,11 @@ public class PeriodDurationField extends CustomField<PeriodDuration> {
     private final IntegerField amount;
     private final Select<String> unit;
 
+    private static final int SIX_MONTHS = 6;
+    private static final int SIX_MONTHS_IN_DAYS = 182;
+    private static final int SIX_MONTHS_IN_HOURS = 4383;
+    private static final int SIX_MONTHS_IN_MINUTES  = 263000;
+
     /**
      * Creates new {@link PeriodDurationField} with default values.
      * 1 - as amount of units, {@link ChronoUnit#MONTHS} as unit.
@@ -34,7 +39,7 @@ public PeriodDurationField() {
         amount = new IntegerField();
         amount.setValue(1);
         amount.setMin(1);
-        amount.setMax(6); //max varies per unit
+        amount.setMax(SIX_MONTHS); //max varies per unit
         amount.setStepButtonsVisible(true);
         amount.addValueChangeListener(this::onAmountChanged);
 
@@ -91,10 +96,10 @@ private void onUnitChanged(final ComponentValueChangeEvent<Select<String>, Strin
         if (isSupported(chronoUnit)) {
             switch (chronoUnit) {
                 //max 6 months
-                case MONTHS -> amount.setMax(6);
-                case DAYS -> amount.setMax(182);
-                case HOURS -> amount.setMax(4383);
-                case MINUTES -> amount.setMax(263000);
+                case MONTHS -> amount.setMax(SIX_MONTHS);
+                case DAYS -> amount.setMax(SIX_MONTHS_IN_DAYS);
+                case HOURS -> amount.setMax(SIX_MONTHS_IN_HOURS);
+                case MINUTES -> amount.setMax(SIX_MONTHS_IN_MINUTES);
                 default -> {
                     amount.setMax(1);
                     amount.setEnabled(false);
@@ -151,11 +156,8 @@ protected PeriodDuration generateModelValue() {
     }
 
     @Override
-    protected void setPresentationValue(PeriodDuration periodDuration) {
-        if (periodDuration.isZero()) {
-            //zero - set default
-            periodDuration = Axe.Defaults.LOGIN_SESSION_DURATION;
-        }
+    protected void setPresentationValue(final PeriodDuration duration) {
+        PeriodDuration periodDuration = duration.isZero() ? Axe.Defaults.LOGIN_SESSION_DURATION : duration;
 
         if (periodDuration.getDuration().isZero()) {
             //period
diff --git a/src/main/java/pm/axe/ui/elements/TelegramSpan.java b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
index b84a02490..43c82fd02 100644
--- a/src/main/java/pm/axe/ui/elements/TelegramSpan.java
+++ b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
@@ -17,7 +17,7 @@
 /**
  * {@link Span} with message "Send code to link your account with Telegram".
  */
-public class TelegramSpan extends Composite<Span> {
+public final class TelegramSpan extends Composite<Span> {
 
     /**
      * Creates new {@link TelegramSpan}.
diff --git a/src/main/java/pm/axe/ui/elements/UsernameRequirements.java b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
index a93cd740c..62eaa28d5 100644
--- a/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
+++ b/src/main/java/pm/axe/ui/elements/UsernameRequirements.java
@@ -55,7 +55,7 @@ private UnorderedList getRequirements() {
                         "Alphanumeric characters (a-zA-Z0-9), lowercase, or uppercase.",
                         "Also allowed of the dot (.), underscore (_), and hyphen (-).",
                         "The dot (.), underscore (_), or hyphen (-) must not be the first or last character.",
-                        "The dot (.), underscore (_), or hyphen (-) does not appear consecutively, e.g., name..surname.")
+                        "The dot (.), underscore (_), or hyphen (-) doesn't appear consecutively, e.g., name..surname.")
                 .forEach(requirement -> requirements.add(new ListItem(requirement)));
         return requirements;
     }
diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index fbea9eff6..9d1af113a 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -160,8 +160,8 @@ private void setupPasswordSection() {
         passwordInput.setValueChangeMode(ValueChangeMode.ON_CHANGE);
         passwordInput.addValueChangeListener(this::onPasswordChanged);
         passwordInput.setClassName("input");
-        passwordInput.setHelperText(String.format("Should be %d-%d symbols long. " +
-                        "Tip: Use password generator - make it strong.",
+        passwordInput.setHelperText(String.format("Should be %d-%d symbols long. "
+                        + "Tip: Use password generator - make it strong.",
                 PasswordValidator.PASSWORD_MIN_LENGTH, PasswordValidator.PASSWORD_MAX_LENGTH));
     }
 

From eabcf0d19664aabbe098d8cea31378ec09830ed6 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 13 Feb 2023 16:28:55 +0200
Subject: [PATCH 58/69] New confirmation token ident generation logic (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 src/main/java/pm/axe/core/IdentGenerator.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/pm/axe/core/IdentGenerator.java b/src/main/java/pm/axe/core/IdentGenerator.java
index 05c2c9e34..673251978 100644
--- a/src/main/java/pm/axe/core/IdentGenerator.java
+++ b/src/main/java/pm/axe/core/IdentGenerator.java
@@ -34,9 +34,6 @@ public final class IdentGenerator {
     public static final String VALID_IDENT_PATTERN = "^[a-zA-Z0-9]([._-](?![._-])|[a-zA-Z0-9]){0,"
             + IDENT_MAX_LENGTH_WITHOUT_FIRST_AND_LAST_CHARS + "}[a-zA-Z0-9]$";
 
-    private static final int TOKEN_SUBSTRING_START_INDEX = 0;
-    private static final int TOKEN_SUBSTRING_END_INDEX = 5;
-
     private IdentGenerator() {
         throw new UnsupportedOperationException("Utility class");
     }
@@ -68,8 +65,7 @@ public static String generateTokenIdent(final Token token) {
 
     private static String generateAccountConfirmationIdent(final Token token) {
         String prefix = token.getTokenType().getIdentPrefix();
-        String firstPartOfToken = token.getToken().substring(TOKEN_SUBSTRING_START_INDEX, TOKEN_SUBSTRING_END_INDEX);
-        String randomPart = RandomStringUtils.randomAlphanumeric(2); //for re-used tokens
-        return String.join("", prefix, firstPartOfToken, randomPart);
+        String randomPart = RandomStringUtils.randomAlphanumeric(Axe.C.FOUR);
+        return String.join("", prefix, randomPart);
     }
 }

From f37eea2e7f6801d30ed34a538398addbeb930e04 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Wed, 15 Feb 2023 12:46:21 +0200
Subject: [PATCH 59/69] Fixes (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 frontend/css/axe_form_styles.css              |  2 +-
 frontend/css/common_styles.css                |  2 +-
 frontend/css/forgot_password_page.css         |  2 +-
 frontend/css/profile_page.css                 |  7 +-
 frontend/css/registration_page.css            |  2 +-
 src/main/java/pm/axe/core/IdentGenerator.java |  6 +-
 .../pm/axe/services/user/AccountService.java  | 17 +++--
 .../java/pm/axe/ui/elements/TelegramSpan.java |  3 +-
 .../pages/user/profile/tabs/ProfileTab.java   | 72 +++++++++++++------
 9 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/frontend/css/axe_form_styles.css b/frontend/css/axe_form_styles.css
index 1514f8aa7..0e132d0bd 100644
--- a/frontend/css/axe_form_styles.css
+++ b/frontend/css/axe_form_styles.css
@@ -21,4 +21,4 @@
 .space-after-fields {
     padding-left: 1rem;
     max-width: 99%;
-}
\ No newline at end of file
+}
diff --git a/frontend/css/common_styles.css b/frontend/css/common_styles.css
index 7c2035f74..26a712a62 100644
--- a/frontend/css/common_styles.css
+++ b/frontend/css/common_styles.css
@@ -224,4 +224,4 @@ vaadin-icon[icon="vaadin:sign-in"] {
 
 .fit-in-window > * {
     flex: 1 0 auto;
-}
\ No newline at end of file
+}
diff --git a/frontend/css/forgot_password_page.css b/frontend/css/forgot_password_page.css
index eaad35b3c..88ea3cab4 100644
--- a/frontend/css/forgot_password_page.css
+++ b/frontend/css/forgot_password_page.css
@@ -1,3 +1,3 @@
 .result-span {
     padding-left: 1rem;
-}
\ No newline at end of file
+}
diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index 3e43f2ea2..cd782bbdc 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -16,4 +16,9 @@
     .fit-in-section {
         width: min-content;
     }
-}
\ No newline at end of file
+}
+
+.telegram-details {
+    display: block;
+    max-width: 290px;
+}
diff --git a/frontend/css/registration_page.css b/frontend/css/registration_page.css
index e695a23d9..87200051b 100644
--- a/frontend/css/registration_page.css
+++ b/frontend/css/registration_page.css
@@ -5,4 +5,4 @@
 
 .info-button {
     border-radius: 100%;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/pm/axe/core/IdentGenerator.java b/src/main/java/pm/axe/core/IdentGenerator.java
index 673251978..63733fe4f 100644
--- a/src/main/java/pm/axe/core/IdentGenerator.java
+++ b/src/main/java/pm/axe/core/IdentGenerator.java
@@ -65,7 +65,9 @@ public static String generateTokenIdent(final Token token) {
 
     private static String generateAccountConfirmationIdent(final Token token) {
         String prefix = token.getTokenType().getIdentPrefix();
-        String randomPart = RandomStringUtils.randomAlphanumeric(Axe.C.FOUR);
-        return String.join("", prefix, randomPart);
+        String randomNumber = RandomStringUtils.randomNumeric(1);
+        String randomChar = RandomStringUtils.randomAlphanumeric(1);
+        String randomNum = RandomStringUtils.randomNumeric(1);
+        return String.join("", prefix, randomNumber, randomChar, randomNum);
     }
 }
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index 57cec6409..b2fe4519f 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -26,7 +26,6 @@
 public class AccountService {
     private static final String TAG = "[" + AccountService.class.getSimpleName() + "]";
     private static final String ERR_ACCOUNT_IS_EMPTY = "Account is null";
-    private static final String ERR_NO_EMAIL_ACCOUNT = "User has no Email Account";
 
     private final AccountDao accountDao;
     private final SymmetricCryptTool cryptTool;
@@ -309,8 +308,6 @@ public OperationResult deleteAccount(final Account account) {
      *         {@link OperationResult#malformedInput()}, when new email address not valid.
      *         {@link OperationResult#generalFail()} with {@link #ERR_ENCRYPTION_FAILED} message,
      *          when encryption failed.
-     *          {@link OperationResult#generalFail()} with {@link #ERR_NO_EMAIL_ACCOUNT} message,
-     *          when {@link User} has no {@link AccountType#EMAIL} {@link Account}.
      */
     public OperationResult updateEmailAccount(final User user, final String email) {
         if (user == null) return OperationResult.malformedInput().withMessage("User cannot be NULL");
@@ -321,7 +318,9 @@ public OperationResult updateEmailAccount(final User user, final String email) {
 
 
         Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
+        boolean userHasEmailAccount;
         if (emailAccount.isPresent()) {
+            userHasEmailAccount = true;
             String encryptedEmail;
             OperationResult encryptEmailResult = cryptTool.encrypt(email);
             if (encryptEmailResult.ok()) {
@@ -334,13 +333,17 @@ public OperationResult updateEmailAccount(final User user, final String email) {
             emailAccount.get().setAccountName(encryptedEmail);
             emailAccount.get().setConfirmed(false);
         } else {
-            return OperationResult.generalFail().withMessage(ERR_NO_EMAIL_ACCOUNT);
+            userHasEmailAccount = false;
         }
 
         try {
-            accountDao.save(emailAccount.get());
-            log.info("{} Updated email account for {} {}", TAG, User.class.getSimpleName(), user.getUsername());
-            return OperationResult.success().addPayload(emailAccount.get());
+            if (userHasEmailAccount) {
+                accountDao.save(emailAccount.get());
+                log.info("{} Updated email account for {} {}", TAG, User.class.getSimpleName(), user.getUsername());
+                return OperationResult.success().addPayload(emailAccount.get());
+            } else {
+                return createEmailAccount(user, email);
+            }
         } catch (CannotCreateTransactionException e) {
             return OperationResult.databaseDown();
         } catch (Exception e) {
diff --git a/src/main/java/pm/axe/ui/elements/TelegramSpan.java b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
index 43c82fd02..850540f0c 100644
--- a/src/main/java/pm/axe/ui/elements/TelegramSpan.java
+++ b/src/main/java/pm/axe/ui/elements/TelegramSpan.java
@@ -1,6 +1,7 @@
 package pm.axe.ui.elements;
 
 import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.HasStyle;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.icon.Icon;
@@ -17,7 +18,7 @@
 /**
  * {@link Span} with message "Send code to link your account with Telegram".
  */
-public final class TelegramSpan extends Composite<Span> {
+public final class TelegramSpan extends Composite<Span> implements HasStyle {
 
     /**
      * Creates new {@link TelegramSpan}.
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 7560e6d5c..a0f96365c 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -75,6 +75,9 @@ public void tabInit(final User user) {
         add(accountsSection);
 
         usernameRequirements.hide();
+        if (StringUtils.isBlank(emailField.getValue())) {
+            emailField.focus();
+        }
     }
 
     private Section createAccountSection() {
@@ -83,7 +86,7 @@ private Section createAccountSection() {
         Details emailUsageDetails = createEmailUsageDetails();
         HorizontalLayout telegramLayout = createTelegramLayout();
 
-        Stream.of(usernameLayout, emailLayout, telegramLayout).forEach(VaadinUtils::setCentered);
+        Stream.of(usernameLayout, emailLayout).forEach(VaadinUtils::setCentered);
 
         Section section = new Section("Accounts");
         section.setContent(usernameLayout, usernameRequirements, emailLayout, emailUsageDetails, telegramLayout);
@@ -94,6 +97,7 @@ private Section createAccountSection() {
     private HorizontalLayout createUsernameLayout() {
         usernameField.setLabel("Username");
         usernameField.setValue(user.getUsername());
+        usernameField.setWidthFull();
         usernameField.addValueChangeListener(this::onUsernameChanged);
         usernameField.setClearButtonVisible(true);
         usernameField.setReadOnly(true);
@@ -117,22 +121,25 @@ private HorizontalLayout createEmailLayout() {
         emailField.setLabel("E-mail");
         emailField.setClearButtonVisible(true);
         emailField.setReadOnly(true);
+        emailField.setWidthFull();
         emailField.addValueChangeListener(this::onEmailChanged);
 
         Optional<String> currentEmail = getCurrentEmail();
         currentEmail.ifPresent(emailField::setValue);
-        currentEmail.ifPresent(e -> {
-            VaadinIcon confirmationStatusIcon = isCurrentEmailConfirmed()
-                    ?  VaadinIcon.CHECK : VaadinIcon.ELLIPSIS_CIRCLE;
-            emailField.setSuffixComponent(confirmationStatusIcon.create());
-        });
+        currentEmail.ifPresent(e -> setConfirmationStatus());
 
         editEmailButton.setText("Edit");
         editEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         saveEmailButton.setText("Save");
         saveEmailButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
-        emailLayout.add(emailField, editEmailButton);
+        if (currentEmail.isPresent()) {
+            emailLayout.add(emailField, editEmailButton);
+        } else {
+            emailField.setReadOnly(false);
+            emailLayout.add(emailField, saveEmailButton);
+        }
+
         emailLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(emailLayout);
         VaadinUtils.setSmallSpacing(emailLayout);
@@ -168,6 +175,7 @@ private HorizontalLayout createTelegramLayout() {
             Optional<Token> tgToken = getTelegramToken();
             if (tgToken.isPresent()) {
                 Details telegramDetails = new Details("Link Telegram Account");
+                telegramDetails.setClassName("telegram-details");
                 telegramDetails.setOpened(true);
                 TelegramSpan telegramSpan = TelegramSpan.create(tgToken.get());
                 telegramDetails.setContent(telegramSpan);
@@ -255,16 +263,17 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         final String email = event.getValue().trim();
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
         if (StringUtils.isBlank(email)) {
-            usernameField.setInvalid(false);
-            usernameField.setErrorMessage("");
+            emailField.setInvalid(false);
+            emailField.setErrorMessage("");
             return;
         }
 
         Optional<String> currentEmail = getCurrentEmail();
-        if (currentEmail.isEmpty()) return;
-        boolean isSameAsCurrent = currentEmail.get().equals(email);
-        if (isSameAsCurrent) {
-            return;
+        if (currentEmail.isPresent()) {
+            boolean isSameAsCurrent = currentEmail.get().equals(email);
+            if (isSameAsCurrent) {
+                return;
+            }
         }
 
         if (isValidEmail) {
@@ -285,20 +294,25 @@ private void onEditEmail(final ClickEvent<Button> event) {
     }
 
     private void onSaveEmail(final ClickEvent<Button> event) {
-        //is same as current ?
-        Optional<String> currentEmail = getCurrentEmail();
-        if (currentEmail.isEmpty()) return;
         final String email = emailField.getValue().trim();
-        boolean isSameAsCurrent = currentEmail.get().equals(email);
-        if (isSameAsCurrent) {
+        if (StringUtils.isBlank(email)) {
+            setConfirmationStatus(); //for some reason is removes it.
+            //FIXME update existing to void
             emailField.setReadOnly(true);
             emailLayout.replace(saveEmailButton, editEmailButton);
             return;
         }
 
-        if (StringUtils.isBlank(email)) {
-            onInvalidInput(emailField, "Please provide valid email");
-            return;
+        //is same as current ?
+        Optional<String> currentEmail = getCurrentEmail();
+        if (currentEmail.isPresent()) {
+            boolean isSameAsCurrent = currentEmail.get().equals(email);
+            if (isSameAsCurrent) {
+                setConfirmationStatus(); //for some reason is removes it.
+                emailField.setReadOnly(true);
+                emailLayout.replace(saveEmailButton, editEmailButton);
+                return;
+            }
         }
 
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
@@ -321,13 +335,13 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
         if (emailUpdateResult.notOk()) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
-            if (currentEmailRecord.isPresent()) {
+            if (currentEmail.isPresent()) {
                 emailField.setValue(currentEmail.get());
             } else {
                 emailField.setValue("");
             }
-
             ErrorUtils.showErrorNotification("Failed to update email. Server error");
+            return;
         }
 
         //creating confirmation token
@@ -339,6 +353,7 @@ private void onSaveEmail(final ClickEvent<Button> event) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
             return;
         }
+
         //sending confirmation letter
         OperationResult sendConfirmationLetterResult =
                 userOpsService.sendConfirmationLetter(confirmationToken.get(), email, userAccount);
@@ -399,6 +414,17 @@ private boolean isCurrentEmailConfirmed() {
         return emailAccount.map(Account::isConfirmed).orElse(false);
     }
 
+    private void setConfirmationStatus() {
+        boolean hasEmail = getCurrentEmail().isPresent();
+        if (hasEmail) {
+            VaadinIcon confirmationStatusIcon = isCurrentEmailConfirmed()
+                    ?  VaadinIcon.CHECK : VaadinIcon.ELLIPSIS_CIRCLE;
+            emailField.setSuffixComponent(confirmationStatusIcon.create());
+        } else {
+            emailField.setSuffixComponent(new Div());
+        }
+    }
+
     private Optional<Account> getTelegramAccount() {
         return accountService.getAccount(user, AccountType.TELEGRAM);
     }

From d873dda5d2a430e6a27529f2e5767bca27aaac90 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Wed, 15 Feb 2023 14:31:27 +0200
Subject: [PATCH 60/69] More fixes (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 frontend/css/profile_page.css                     |  2 +-
 .../ui/pages/user/profile/tabs/ProfileTab.java    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index cd782bbdc..b608c3def 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -20,5 +20,5 @@
 
 .telegram-details {
     display: block;
-    max-width: 290px;
+    max-width: min(290px, 90vw);
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index a0f96365c..54bc0354c 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -27,10 +27,7 @@
 import pm.axe.services.user.TokenService;
 import pm.axe.services.user.UserOperationsService;
 import pm.axe.services.user.UserService;
-import pm.axe.ui.elements.AreYouSureDialog;
-import pm.axe.ui.elements.Section;
-import pm.axe.ui.elements.TelegramSpan;
-import pm.axe.ui.elements.UsernameRequirements;
+import pm.axe.ui.elements.*;
 import pm.axe.users.AccountType;
 import pm.axe.users.UsernameValidator;
 import pm.axe.utils.AppUtils;
@@ -67,6 +64,8 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final Button saveEmailButton = new Button();
     private final HorizontalLayout emailLayout = new HorizontalLayout();
 
+    private final DeleteConfirmationDialog deleteConfirmationDialog = DeleteConfirmationDialog.create();
+
     @Override
     public void tabInit(final User user) {
         this.user = user;
@@ -133,6 +132,8 @@ private HorizontalLayout createEmailLayout() {
         saveEmailButton.setText("Save");
         saveEmailButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
+        deleteConfirmationDialog.setDeleteButtonAction(this::deleteEmail);
+
         if (currentEmail.isPresent()) {
             emailLayout.add(emailField, editEmailButton);
         } else {
@@ -298,6 +299,7 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         if (StringUtils.isBlank(email)) {
             setConfirmationStatus(); //for some reason is removes it.
             //FIXME update existing to void
+
             emailField.setReadOnly(true);
             emailLayout.replace(saveEmailButton, editEmailButton);
             return;
@@ -444,4 +446,9 @@ private Optional<Token> getTelegramToken() {
         }
         return Optional.ofNullable(tgToken);
     }
+
+    private void deleteEmail() {
+        Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
+        emailAccount.ifPresent(accountService::deleteAccount);
+    }
 }

From 63969a139d90d3bb4d17d2bccedeed9ed4a6cd43 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Wed, 15 Feb 2023 14:33:45 +0200
Subject: [PATCH 61/69] More fixes 2 (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 .../java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 54bc0354c..0d1e6233e 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -64,7 +64,7 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     private final Button saveEmailButton = new Button();
     private final HorizontalLayout emailLayout = new HorizontalLayout();
 
-    private final DeleteConfirmationDialog deleteConfirmationDialog = DeleteConfirmationDialog.create();
+    private final DeleteConfirmationDialog emailDeleteConfirmationDialog = DeleteConfirmationDialog.create();
 
     @Override
     public void tabInit(final User user) {
@@ -132,7 +132,7 @@ private HorizontalLayout createEmailLayout() {
         saveEmailButton.setText("Save");
         saveEmailButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
-        deleteConfirmationDialog.setDeleteButtonAction(this::deleteEmail);
+        emailDeleteConfirmationDialog.setDeleteButtonAction(this::deleteEmail);
 
         if (currentEmail.isPresent()) {
             emailLayout.add(emailField, editEmailButton);
@@ -164,6 +164,7 @@ private HorizontalLayout createTelegramLayout() {
                 TextField telegramField = new TextField("Telegram");
                 telegramField.setReadOnly(true);
                 telegramField.setPrefixComponent(VaadinIcon.AT.create());
+                telegramField.setWidthFull();
                 telegramField.setValue(telegramUsername.get());
                 Button unlinkButton = new Button("Unlink");
                 unlinkButton.addThemeVariants(ButtonVariant.LUMO_ERROR);
@@ -298,7 +299,7 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         final String email = emailField.getValue().trim();
         if (StringUtils.isBlank(email)) {
             setConfirmationStatus(); //for some reason is removes it.
-            //FIXME update existing to void
+            emailDeleteConfirmationDialog.show();
 
             emailField.setReadOnly(true);
             emailLayout.replace(saveEmailButton, editEmailButton);

From ef4a9fbbd167442f7934d1ec6b125bf19f1e2edd Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Wed, 15 Feb 2023 21:05:57 +0200
Subject: [PATCH 62/69] Update profile_page.css

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 frontend/css/profile_page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index b608c3def..a901c639a 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -20,5 +20,5 @@
 
 .telegram-details {
     display: block;
-    max-width: min(290px, 90vw);
+    max-width: min(290px, 80vw);
 }

From 12db48df52b13cf2185203d4642135183649a518 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Wed, 15 Feb 2023 21:49:32 +0200
Subject: [PATCH 63/69] Percentage approach

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 frontend/css/profile_page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index a901c639a..53db12094 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -20,5 +20,5 @@
 
 .telegram-details {
     display: block;
-    max-width: min(290px, 80vw);
+    max-width: min(290px, 97%);
 }

From accb8c357ca9ac9c0ecd89a67b85b1ee993eef17 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Thu, 16 Feb 2023 10:47:17 +0200
Subject: [PATCH 64/69] CSS fix (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 frontend/css/profile_page.css                               | 6 +++++-
 .../java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java  | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/css/profile_page.css b/frontend/css/profile_page.css
index 53db12094..9495a5365 100644
--- a/frontend/css/profile_page.css
+++ b/frontend/css/profile_page.css
@@ -20,5 +20,9 @@
 
 .telegram-details {
     display: block;
-    max-width: min(290px, 97%);
+    max-width: min(290px, 100%);
+}
+
+.telegram-details div {
+    margin: 0.5rem;
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 0d1e6233e..fa36a2a7c 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -85,7 +85,7 @@ private Section createAccountSection() {
         Details emailUsageDetails = createEmailUsageDetails();
         HorizontalLayout telegramLayout = createTelegramLayout();
 
-        Stream.of(usernameLayout, emailLayout).forEach(VaadinUtils::setCentered);
+        Stream.of(usernameLayout, emailLayout, emailUsageDetails, telegramLayout).forEach(VaadinUtils::setCentered);
 
         Section section = new Section("Accounts");
         section.setContent(usernameLayout, usernameRequirements, emailLayout, emailUsageDetails, telegramLayout);
@@ -107,7 +107,6 @@ private HorizontalLayout createUsernameLayout() {
         saveUsernameButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
         usernameLayout.add(usernameField, editUsernameButton);
-        usernameLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(usernameLayout);
         VaadinUtils.setSmallSpacing(usernameLayout);
 
@@ -141,7 +140,6 @@ private HorizontalLayout createEmailLayout() {
             emailLayout.add(emailField, saveEmailButton);
         }
 
-        emailLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(emailLayout);
         VaadinUtils.setSmallSpacing(emailLayout);
 
@@ -153,7 +151,6 @@ private HorizontalLayout createEmailLayout() {
     private HorizontalLayout createTelegramLayout() {
         HorizontalLayout telegramLayout = new HorizontalLayout();
         telegramLayout.setAlignItems(Alignment.BASELINE);
-        telegramLayout.addClassName("fit-in-section");
         VaadinUtils.fitLayoutInWindow(telegramLayout);
         VaadinUtils.setSmallSpacing(telegramLayout);
 

From 159c05e7ca49abe18b52fe14dfa8524e553f2724 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Thu, 16 Feb 2023 22:51:05 +0200
Subject: [PATCH 65/69] Confirm Account page (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 .../pm/axe/mail/EmailConfirmationStatus.java  |  19 ++
 .../pm/axe/services/user/AccountService.java  |  19 ++
 .../axe/ui/elements/ConfirmedEmailField.java  |  40 ++++
 .../axe/ui/pages/user/ConfirmAccountPage.java | 198 ++++++++++++++++--
 4 files changed, 261 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/pm/axe/mail/EmailConfirmationStatus.java
 create mode 100644 src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java

diff --git a/src/main/java/pm/axe/mail/EmailConfirmationStatus.java b/src/main/java/pm/axe/mail/EmailConfirmationStatus.java
new file mode 100644
index 000000000..73d77914e
--- /dev/null
+++ b/src/main/java/pm/axe/mail/EmailConfirmationStatus.java
@@ -0,0 +1,19 @@
+package pm.axe.mail;
+
+import com.vaadin.flow.component.icon.VaadinIcon;
+import lombok.Getter;
+
+public enum EmailConfirmationStatus {
+    CONFIRMED(VaadinIcon.CHECK, "Email confirmed"),
+    PENDING(VaadinIcon.ELLIPSIS_CIRCLE, "Validation pending..."),
+    FAILED(VaadinIcon.FIRE, "Validation failed"),
+    NONE(VaadinIcon.COG, "No status defined yet");
+
+    @Getter
+    private final VaadinIcon icon;
+    @Getter private final String statusString;
+    EmailConfirmationStatus(final VaadinIcon icon, final String statusString) {
+        this.icon = icon;
+        this.statusString = statusString;
+    }
+}
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index b2fe4519f..a5e94a819 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -374,4 +374,23 @@ public void rollbackAccount(final Account oldAccount) {
             log.error("{} failed  to rollback Account {}: got exception {}", TAG, oldAccount, e.getMessage());
         }
     }
+
+    public Optional<String> getCurrentEmail(final User user) {
+        if (user == null) throw new IllegalArgumentException("User cannot be NULL");
+
+        Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
+        if (emailAccount.isEmpty()) return Optional.empty();
+        Optional<String> plainTextEmail = decryptAccountName(emailAccount.get());
+        if (plainTextEmail.isEmpty()) return Optional.empty();
+        if (StringUtils.isNotBlank(plainTextEmail.get())) {
+            return plainTextEmail;
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public boolean isCurrentEmailConfirmed(final User user) {
+        Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
+        return emailAccount.map(Account::isConfirmed).orElse(false);
+    }
 }
diff --git a/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
new file mode 100644
index 000000000..1b0326786
--- /dev/null
+++ b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
@@ -0,0 +1,40 @@
+package pm.axe.ui.elements;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.shared.Tooltip;
+import com.vaadin.flow.component.textfield.EmailField;
+import lombok.Getter;
+import pm.axe.mail.EmailConfirmationStatus;
+
+public class ConfirmedEmailField extends Composite<EmailField> {
+    @Getter private final EmailConfirmationStatus status;
+
+    @Getter private final Button statusButton;
+
+    public ConfirmedEmailField() {
+        status = EmailConfirmationStatus.NONE;
+
+        statusButton = new Button();
+        statusButton.addThemeVariants(ButtonVariant.LUMO_ICON, ButtonVariant.LUMO_TERTIARY_INLINE);
+        statusButton.setVisible(false); //no status by default
+
+        getContent().setSuffixComponent(statusButton);
+        getContent().setTooltipText(status.getStatusString());
+
+        Tooltip tooltip = getContent().getTooltip().withManual(true);
+        statusButton.addClickListener(e -> tooltip.setOpened(!tooltip.isOpened()));
+    }
+    
+    public void setStatus(final EmailConfirmationStatus status) {
+        getContent().setTooltipText(status.getStatusString());
+        statusButton.setIcon(status.getIcon().create());
+        statusButton.setVisible(status != EmailConfirmationStatus.NONE);
+    }
+
+    public EmailField get() {
+        return getContent();
+    }
+
+}
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index fef6ead04..92d4f5128 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -1,12 +1,16 @@
 package pm.axe.ui.pages.user;
 
+import com.vaadin.flow.component.AbstractField;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.details.Details;
+import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.H3;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
@@ -15,21 +19,33 @@
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import com.vaadin.flow.spring.annotation.UIScope;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.EmailValidator;
 import pm.axe.Endpoint;
+import pm.axe.db.models.Account;
 import pm.axe.db.models.Token;
 import pm.axe.db.models.User;
+import pm.axe.mail.EmailConfirmationStatus;
 import pm.axe.result.OperationResult;
+import pm.axe.services.user.AccountService;
 import pm.axe.services.user.TokenService;
+import pm.axe.services.user.UserOperationsService;
 import pm.axe.ui.MainView;
+import pm.axe.ui.elements.ConfirmedEmailField;
 import pm.axe.ui.elements.Section;
 import pm.axe.ui.elements.TelegramSpan;
 import pm.axe.ui.layouts.AxeCompactLayout;
+import pm.axe.users.AccountType;
+import pm.axe.utils.AppUtils;
 import pm.axe.utils.AxeSessionUtils;
+import pm.axe.utils.ErrorUtils;
 import pm.axe.utils.VaadinUtils;
 
 import java.util.Objects;
 import java.util.Optional;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 @SpringComponent
 @UIScope
 @RequiredArgsConstructor
@@ -37,14 +53,19 @@
 @PageTitle("Confirm Account - Axe.pm")
 public class ConfirmAccountPage extends AxeCompactLayout implements BeforeEnterObserver {
     private final TokenService tokenService;
+    private final AccountService accountService;
+    private final UserOperationsService userOperationsService;
     private final AxeSessionUtils axeSessionUtils;
     private boolean pageAlreadyInitialized = false;
     private User user;
 
+    private boolean hasEmail = false;
+    private boolean hasConfirmedEmail = false;
+
     private HorizontalLayout emailLayout;
-    private EmailField emailInput;
+    private ConfirmedEmailField emailInput;
     private Button submitEmailButton;
-    private Span sentSpan;
+    private Span emailSpan;
 
     private Section telegramSection;
 
@@ -62,32 +83,78 @@ public void beforeEnter(final BeforeEnterEvent event) {
     }
 
     private void initPage() {
+        hasEmail = accountService.getAccount(user, AccountType.EMAIL).isPresent();
+
+        if (hasEmail) {
+            hasConfirmedEmail = accountService.isCurrentEmailConfirmed(user);
+        }
+
         H3 title = new H3("Confirm your Account");
 
-        Section emailSection =  new Section("Using Email");
+        Section emailSection = new Section("Using Email");
         emailSection.setCustomContent(emailSectionContent());
 
         telegramSection = new Section("Using Telegram");
         telegramSection.setCustomContent(telegramSectionContent());
 
         add(title, emailSection, telegramSection);
+
+        if (hasConfirmedEmail) {
+            emailSection.setVisible(false);
+        }
     }
 
     private Component emailSectionContent() {
-        emailInput = new EmailField("Email address here");
-        emailInput.setHelperText("Axe will send confirmation letter there");
+        emailInput = new ConfirmedEmailField();
+        emailInput.get().setLabel("Email address here");
+        emailInput.get().setHelperText("Axe will send confirmation letter there");
+        emailInput.get().setClearButtonVisible(true);
+        emailInput.get().addValueChangeListener(this::onEmailChanged);
+
+        Optional<String> currentEmail = accountService.getCurrentEmail(user);
+        currentEmail.ifPresent(email -> emailInput.get().setValue(email));
+
         submitEmailButton = new Button("Submit");
         submitEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         submitEmailButton.addClickListener(this::onSubmitEmail);
-        sentSpan = new Span("Sent!");
-        sentSpan.setClassName("green");
 
-        emailLayout = new HorizontalLayout(emailInput, submitEmailButton);
+        emailSpan = new Span();
+
+        Details nothingCame = null;
+
+        if (hasEmail) {
+            //user has hasEmail - RO input + span
+            emailInput.get().setReadOnly(true);
+            EmailConfirmationStatus status = hasConfirmedEmail ?
+                    EmailConfirmationStatus.CONFIRMED : EmailConfirmationStatus.PENDING;
+            emailInput.setStatus(status);
+            emailSpan.setText(status.getStatusString());
+            if (status == EmailConfirmationStatus.CONFIRMED) {
+                emailSpan.setClassName("green");
+            } else {
+                emailInput.get().setHelperText("Axe sent confirmation letter to given email.");
+                nothingCame = getNothingCameDetails();
+            }
+            emailLayout = new HorizontalLayout(emailInput, emailSpan);
+        } else {
+            //no email - input + button
+            emailLayout = new HorizontalLayout(emailInput, submitEmailButton);
+        }
+
+        emailLayout.setWidthFull();
         VaadinUtils.fitLayoutInWindow(emailLayout);
         VaadinUtils.setSmallSpacing(emailLayout);
-        return emailLayout;
+
+        if (nothingCame != null) {
+            VerticalLayout layout = new VerticalLayout(emailLayout, nothingCame);
+            layout.setPadding(false);
+            return layout;
+        } else {
+            return emailLayout;
+        }
     }
 
+
     private Component telegramSectionContent() {
         Optional<Token> telegramToken = tokenService.getTelegramToken(user);
         Token tgToken;
@@ -105,14 +172,115 @@ private Component telegramSectionContent() {
         return TelegramSpan.create(tgToken);
     }
 
+    private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailField, String> e) {
+        if (!e.isFromClient()) return;
+        final String email = e.getValue().trim();
+        boolean isValidEmail = EmailValidator.getInstance().isValid(email);
+        if (StringUtils.isBlank(email)) {
+            emailInput.get().setInvalid(false);
+            emailInput.get().setErrorMessage("");
+            if (!submitEmailButton.isEnabled()) {
+                submitEmailButton.setEnabled(true);
+            }
+            return;
+        }
+        if (isValidEmail) {
+            boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
+            if (emailExists) {
+                onInvalidInput(emailInput.get(), "Email already taken");
+                submitEmailButton.setEnabled(false);
+            } else {
+                emailInput.get().setInvalid(false);
+                emailInput.get().setErrorMessage("");
+                if (!submitEmailButton.isEnabled()) {
+                    submitEmailButton.setEnabled(true);
+                }
+            }
+        } else {
+            //not valid email
+            onInvalidInput(emailInput.get(), "Should be valid email");
+            submitEmailButton.setEnabled(false);
+        }
+    }
+
     private void onSubmitEmail(final ClickEvent<Button> event) {
-        if (emailInput.isInvalid()) {
-            emailInput.setInvalid(true);
-            emailInput.setErrorMessage("Please enter valid email");
+        final String email = emailInput.get().getValue().trim();
+        if (StringUtils.isBlank(email)) {
+            emailInput.get().setInvalid(true);
+            emailInput.get().setErrorMessage("Please enter valid email");
+            return;
+        }
+        boolean isValidEmail = EmailValidator.getInstance().isValid(email);
+        if (isValidEmail) {
+            //email
+            boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
+            if (emailExists) {
+                onInvalidInput(emailInput.get(), "Email already taken");
+                return;
+            }
+        } else {
+            //not valid email
+            onInvalidInput(emailInput.get(), "Should be valid email address");
+            return;
+        }
+
+        //clean -> save
+        Optional<Account> currentEmailRecord = accountService.getAccount(user, AccountType.EMAIL);
+        OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
+        if (emailUpdateResult.notOk()) {
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
+            emailInput.setStatus(EmailConfirmationStatus.FAILED);
+            ErrorUtils.showErrorNotification("Failed to update email. Server error");
+            return;
+        }
+        //creating confirmation token
+        Account userAccount = emailUpdateResult.getPayload(Account.class);
+        Optional<Token> confirmationToken = userOperationsService.createConfirmationToken(userAccount);
+        if (confirmationToken.isEmpty()) {
+            emailInput.setStatus(EmailConfirmationStatus.FAILED);
+            ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
             return;
         }
-        //TODO implement sent confirmation letter call here
-        emailInput.setReadOnly(true);
-        emailLayout.replace(submitEmailButton, sentSpan);
+        OperationResult sendConfirmationLetterResult =
+                userOperationsService.sendConfirmationLetter(confirmationToken.get(), email, userAccount);
+        if (sendConfirmationLetterResult.ok()) {
+            emailInput.setStatus(EmailConfirmationStatus.PENDING);
+            emailSpan.setText("Sent! Confirmation is pending");
+            emailSpan.setClassName("green");
+            AppUtils.showSuccessNotification("Send confirmation to new email. Please check your inbox.");
+        } else {
+            emailInput.setStatus(EmailConfirmationStatus.FAILED);
+
+            emailSpan.setText("Failed to send confirmation letter");
+            emailSpan.setClassName("red");
+            ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
+            currentEmailRecord.ifPresent(accountService::rollbackAccount);
+        }
+        emailInput.get().setValue(email);
+        emailInput.get().setReadOnly(true);
+        emailLayout.replace(submitEmailButton, emailSpan);
+    }
+
+    private Details getNothingCameDetails() {
+        Details details = new Details("Didn't receive email?");
+
+        //body
+        Span checkFolders = new Span("Please check inbox or spam folders. ");
+
+        Span stillNothing = new Span("Still nothing? ");
+
+        Span goBack = new Span("Go back to ");
+        Anchor profilePage = new Anchor(Endpoint.UI.PROFILE_PAGE, "Profile Page");
+        Span tryAgain = new Span(" and try again with another email.");
+
+        Span stillNothingSpan = new Span(stillNothing, goBack, profilePage, tryAgain);
+
+        VerticalLayout body = new VerticalLayout(checkFolders, stillNothingSpan);
+        body.setPadding(false);
+        body.setSpacing(false);
+
+        details.setContent(body);
+        return details;
     }
 }

From 0f1333ceaf12a9ce9efdad336cc54a69cb510925 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Fri, 17 Feb 2023 11:04:00 +0200
Subject: [PATCH 66/69] Confirm Account page is ready (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 src/main/java/pm/axe/db/dao/AccountDao.java   |  9 +++++
 .../pm/axe/services/user/AccountService.java  | 11 ++++++
 .../pm/axe/services/user/TokenService.java    |  8 +++--
 .../services/user/UserOperationsService.java  | 16 +++++++++
 .../axe/ui/pages/user/ConfirmAccountPage.java | 36 +++++++++++++++----
 .../pages/user/profile/tabs/ProfileTab.java   | 12 ++++++-
 6 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/src/main/java/pm/axe/db/dao/AccountDao.java b/src/main/java/pm/axe/db/dao/AccountDao.java
index 4f900536c..d25408fde 100644
--- a/src/main/java/pm/axe/db/dao/AccountDao.java
+++ b/src/main/java/pm/axe/db/dao/AccountDao.java
@@ -21,6 +21,15 @@ public interface AccountDao extends CrudRepository<Account, Long> {
      */
     Optional<Account> findByUserAndType(User user, AccountType accountType);
 
+    /**
+     * Searching for User's Account by its {@link AccountType}.
+     *
+     * @param user        account's owner
+     * @param accountType type of account
+     * @return true - if found or false - if not.
+     */
+    boolean existsByUserAndType(User user, AccountType accountType);
+
     /**
      * Lists all {@link Account}s of given {@link AccountType}.
      *
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index a5e94a819..68342cfd3 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -209,6 +209,17 @@ public Optional<Account> getAccount(final User user, final AccountType accountTy
         return accountDao.findByUserAndType(user, accountType);
     }
 
+    /**
+     * Checks if Account with given  {@link User} and {@link AccountType} exists.
+     *
+     * @param user        account's owner
+     * @param accountType account's type
+     * @return true if exists, false if not.
+     */
+    public boolean isAccountExist(final User user, final AccountType accountType) {
+        return accountDao.existsByUserAndType(user, accountType);
+    }
+
     /**
      * Searches {@link Account} by plain-text {@link Account} name and {@link AccountType}.
      *
diff --git a/src/main/java/pm/axe/services/user/TokenService.java b/src/main/java/pm/axe/services/user/TokenService.java
index cf3720f88..81a57c8cf 100644
--- a/src/main/java/pm/axe/services/user/TokenService.java
+++ b/src/main/java/pm/axe/services/user/TokenService.java
@@ -24,8 +24,6 @@
 public class TokenService {
     private static final String TAG = "[" + TokenService.class.getSimpleName() + "]";
 
-    private static final String ERR_USER_ALREADY_HAS_TOKEN = "User already has token";
-
     private final TokenDao tokenDao;
 
     /**
@@ -174,7 +172,13 @@ public Optional<Token> getToken(final String tokenString) {
         return token.isPresent() ? returnOnlyValidToken(token.get()) : Optional.empty();
     }
 
+    public Optional<Token> getToken(final User user, final TokenType tokenType) {
+        if (user == null) throw new IllegalArgumentException("user cannot be null");
+        if (tokenType == null) throw new IllegalArgumentException("token type cannot be null");
 
+        Token token = tokenDao.findByTokenTypeAndUser(tokenType, user);
+        return token != null ? returnOnlyValidToken(token) : Optional.empty();
+    }
 
     /**
      * Provides {@link User}'s {@link TokenType#TELEGRAM_CONFIRMATION_TOKEN} token.
diff --git a/src/main/java/pm/axe/services/user/UserOperationsService.java b/src/main/java/pm/axe/services/user/UserOperationsService.java
index f65c10775..b615e2c02 100644
--- a/src/main/java/pm/axe/services/user/UserOperationsService.java
+++ b/src/main/java/pm/axe/services/user/UserOperationsService.java
@@ -296,4 +296,20 @@ public OperationResult deleteUser(final User user, final boolean force) {
         EventBus.getDefault().post(UserDeletedEvent.createWith(user));
         return deletionResult;
     }
+
+    public OperationResult deleteAccountOnly(final Account account) {
+        if (account == null) throw new IllegalArgumentException("Account cannot be null");
+        if (account.getUser() == null) throw new IllegalStateException("Account has no owner");
+
+        Optional<Token> accountConfirmationToken = tokenService.getToken(account.getUser(),
+                TokenType.ACCOUNT_CONFIRMATION_TOKEN);
+        if (accountConfirmationToken.isPresent()) {
+            //because we need to delete it in @Sync manner
+            OperationResult tokenDeletionResult = tokenService.deleteToken(accountConfirmationToken.get().getToken());
+            if (tokenDeletionResult.notOk()) {
+                return tokenDeletionResult;
+            }
+        }
+        return accountService.deleteAccount(account);
+    }
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index 92d4f5128..d54ef6e78 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -9,6 +9,8 @@
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.H3;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
@@ -83,7 +85,7 @@ public void beforeEnter(final BeforeEnterEvent event) {
     }
 
     private void initPage() {
-        hasEmail = accountService.getAccount(user, AccountType.EMAIL).isPresent();
+        hasEmail = accountService.isAccountExist(user, AccountType.EMAIL);
 
         if (hasEmail) {
             hasConfirmedEmail = accountService.isCurrentEmailConfirmed(user);
@@ -91,17 +93,22 @@ private void initPage() {
 
         H3 title = new H3("Confirm your Account");
 
+       Component emailSectionContent = hasConfirmedEmail ?
+               createAccountConfirmedSection(AccountType.EMAIL) : emailSectionContent();
+
         Section emailSection = new Section("Using Email");
-        emailSection.setCustomContent(emailSectionContent());
+        emailSection.setCustomContent(emailSectionContent);
+
+        //TG account is already confirmed
+        boolean hasConfirmedTelegram = accountService.isAccountExist(user, AccountType.TELEGRAM);
+
+        Component telegramSectionContent = hasConfirmedTelegram ?
+                createAccountConfirmedSection(AccountType.TELEGRAM) : telegramSectionContent();
 
         telegramSection = new Section("Using Telegram");
-        telegramSection.setCustomContent(telegramSectionContent());
+        telegramSection.setCustomContent(telegramSectionContent);
 
         add(title, emailSection, telegramSection);
-
-        if (hasConfirmedEmail) {
-            emailSection.setVisible(false);
-        }
     }
 
     private Component emailSectionContent() {
@@ -172,6 +179,21 @@ private Component telegramSectionContent() {
         return TelegramSpan.create(tgToken);
     }
 
+    private Component createAccountConfirmedSection(final AccountType accountType) {
+        if (accountType == null) throw new IllegalArgumentException("accountType cannot be null");
+        Icon successMark = VaadinIcon.CHECK.create();
+        successMark.setColor("green");
+        Span text = new Span("You have successfully confirmed your ");
+        Span accType = new Span(StringUtils.capitalize(accountType.name().toLowerCase()));
+        Span account = new Span(" account");
+
+        Span textSpan = new Span(text, accType, account);
+        HorizontalLayout layout = new HorizontalLayout(successMark, textSpan);
+        layout.setAlignItems(Alignment.CENTER);
+        layout.setMaxHeight("100%");
+        return layout;
+    }
+
     private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailField, String> e) {
         if (!e.isFromClient()) return;
         final String email = e.getValue().trim();
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index fa36a2a7c..2576dd6d5 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -447,6 +447,16 @@ private Optional<Token> getTelegramToken() {
 
     private void deleteEmail() {
         Optional<Account> emailAccount = accountService.getAccount(user, AccountType.EMAIL);
-        emailAccount.ifPresent(accountService::deleteAccount);
+        if (emailAccount.isPresent()) {
+            OperationResult result = userOpsService.deleteAccountOnly(emailAccount.get());
+            if (result.ok()) {
+                AppUtils.showSuccessNotification("Email successfully deleted");
+                //TODO update status to NONE
+            } else {
+                ErrorUtils.showErrorNotification("Failed to delete email. System error");
+                //TODO update status to FAILED
+            }
+        }
+
     }
 }

From 06770f4511aa56757a7ee65599d6664829ae887a Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 20 Feb 2023 11:01:53 +0200
Subject: [PATCH 67/69] Confirm Account page is ready. Removing get() (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 .../axe/ui/elements/ConfirmedEmailField.java  | 15 +++----
 .../axe/ui/pages/user/ConfirmAccountPage.java | 40 +++++++++----------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
index 1b0326786..5552a9a6b 100644
--- a/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
+++ b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
@@ -1,6 +1,5 @@
 package pm.axe.ui.elements;
 
-import com.vaadin.flow.component.Composite;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.shared.Tooltip;
@@ -8,7 +7,7 @@
 import lombok.Getter;
 import pm.axe.mail.EmailConfirmationStatus;
 
-public class ConfirmedEmailField extends Composite<EmailField> {
+public class ConfirmedEmailField extends EmailField {
     @Getter private final EmailConfirmationStatus status;
 
     @Getter private final Button statusButton;
@@ -20,21 +19,17 @@ public ConfirmedEmailField() {
         statusButton.addThemeVariants(ButtonVariant.LUMO_ICON, ButtonVariant.LUMO_TERTIARY_INLINE);
         statusButton.setVisible(false); //no status by default
 
-        getContent().setSuffixComponent(statusButton);
-        getContent().setTooltipText(status.getStatusString());
+        this.setSuffixComponent(statusButton);
+        this.setTooltipText(status.getStatusString());
 
-        Tooltip tooltip = getContent().getTooltip().withManual(true);
+        Tooltip tooltip = this.getTooltip().withManual(true);
         statusButton.addClickListener(e -> tooltip.setOpened(!tooltip.isOpened()));
     }
     
     public void setStatus(final EmailConfirmationStatus status) {
-        getContent().setTooltipText(status.getStatusString());
+        this.setTooltipText(status.getStatusString());
         statusButton.setIcon(status.getIcon().create());
         statusButton.setVisible(status != EmailConfirmationStatus.NONE);
     }
 
-    public EmailField get() {
-        return getContent();
-    }
-
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index d54ef6e78..29bb19bca 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -113,13 +113,13 @@ private void initPage() {
 
     private Component emailSectionContent() {
         emailInput = new ConfirmedEmailField();
-        emailInput.get().setLabel("Email address here");
-        emailInput.get().setHelperText("Axe will send confirmation letter there");
-        emailInput.get().setClearButtonVisible(true);
-        emailInput.get().addValueChangeListener(this::onEmailChanged);
+        emailInput.setLabel("Email address here");
+        emailInput.setHelperText("Axe will send confirmation letter there");
+        emailInput.setClearButtonVisible(true);
+        emailInput.addValueChangeListener(this::onEmailChanged);
 
         Optional<String> currentEmail = accountService.getCurrentEmail(user);
-        currentEmail.ifPresent(email -> emailInput.get().setValue(email));
+        currentEmail.ifPresent(email -> emailInput.setValue(email));
 
         submitEmailButton = new Button("Submit");
         submitEmailButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
@@ -131,7 +131,7 @@ private Component emailSectionContent() {
 
         if (hasEmail) {
             //user has hasEmail - RO input + span
-            emailInput.get().setReadOnly(true);
+            emailInput.setReadOnly(true);
             EmailConfirmationStatus status = hasConfirmedEmail ?
                     EmailConfirmationStatus.CONFIRMED : EmailConfirmationStatus.PENDING;
             emailInput.setStatus(status);
@@ -139,7 +139,7 @@ private Component emailSectionContent() {
             if (status == EmailConfirmationStatus.CONFIRMED) {
                 emailSpan.setClassName("green");
             } else {
-                emailInput.get().setHelperText("Axe sent confirmation letter to given email.");
+                emailInput.setHelperText("Axe sent confirmation letter to given email.");
                 nothingCame = getNothingCameDetails();
             }
             emailLayout = new HorizontalLayout(emailInput, emailSpan);
@@ -199,8 +199,8 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         final String email = e.getValue().trim();
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
         if (StringUtils.isBlank(email)) {
-            emailInput.get().setInvalid(false);
-            emailInput.get().setErrorMessage("");
+            emailInput.setInvalid(false);
+            emailInput.setErrorMessage("");
             if (!submitEmailButton.isEnabled()) {
                 submitEmailButton.setEnabled(true);
             }
@@ -209,27 +209,27 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         if (isValidEmail) {
             boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
             if (emailExists) {
-                onInvalidInput(emailInput.get(), "Email already taken");
+                onInvalidInput(emailInput, "Email already taken");
                 submitEmailButton.setEnabled(false);
             } else {
-                emailInput.get().setInvalid(false);
-                emailInput.get().setErrorMessage("");
+                emailInput.setInvalid(false);
+                emailInput.setErrorMessage("");
                 if (!submitEmailButton.isEnabled()) {
                     submitEmailButton.setEnabled(true);
                 }
             }
         } else {
             //not valid email
-            onInvalidInput(emailInput.get(), "Should be valid email");
+            onInvalidInput(emailInput, "Should be valid email");
             submitEmailButton.setEnabled(false);
         }
     }
 
     private void onSubmitEmail(final ClickEvent<Button> event) {
-        final String email = emailInput.get().getValue().trim();
+        final String email = emailInput.getValue().trim();
         if (StringUtils.isBlank(email)) {
-            emailInput.get().setInvalid(true);
-            emailInput.get().setErrorMessage("Please enter valid email");
+            emailInput.setInvalid(true);
+            emailInput.setErrorMessage("Please enter valid email");
             return;
         }
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
@@ -237,12 +237,12 @@ private void onSubmitEmail(final ClickEvent<Button> event) {
             //email
             boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
             if (emailExists) {
-                onInvalidInput(emailInput.get(), "Email already taken");
+                onInvalidInput(emailInput, "Email already taken");
                 return;
             }
         } else {
             //not valid email
-            onInvalidInput(emailInput.get(), "Should be valid email address");
+            onInvalidInput(emailInput, "Should be valid email address");
             return;
         }
 
@@ -279,8 +279,8 @@ private void onSubmitEmail(final ClickEvent<Button> event) {
             ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
         }
-        emailInput.get().setValue(email);
-        emailInput.get().setReadOnly(true);
+        emailInput.setValue(email);
+        emailInput.setReadOnly(true);
         emailLayout.replace(submitEmailButton, emailSpan);
     }
 

From 34061de6e6b4ea61a472caa1891fd43cd10608b5 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 20 Feb 2023 11:48:54 +0200
Subject: [PATCH 68/69] Updating channels as well (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 .../pm/axe/services/user/AccountService.java  |  1 -
 .../services/user/UserOperationsService.java  | 58 +++++++++++++++++++
 .../axe/ui/pages/user/ConfirmAccountPage.java |  2 +-
 .../pages/user/profile/tabs/ProfileTab.java   |  2 +-
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index 68342cfd3..4bb9013e5 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -327,7 +327,6 @@ public OperationResult updateEmailAccount(final User user, final String email) {
             return validationResult;
         }
 
-
         Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
         boolean userHasEmailAccount;
         if (emailAccount.isPresent()) {
diff --git a/src/main/java/pm/axe/services/user/UserOperationsService.java b/src/main/java/pm/axe/services/user/UserOperationsService.java
index b615e2c02..9e304b147 100644
--- a/src/main/java/pm/axe/services/user/UserOperationsService.java
+++ b/src/main/java/pm/axe/services/user/UserOperationsService.java
@@ -296,6 +296,19 @@ public OperationResult deleteUser(final User user, final boolean force) {
         EventBus.getDefault().post(UserDeletedEvent.createWith(user));
         return deletionResult;
     }
+    
+    public OperationResult updateEmailAccount(final User user, final String email) {
+        OperationResult accountUpdateResult = accountService.updateEmailAccount(user, email);
+        if (accountUpdateResult.notOk()) {
+            return accountUpdateResult;
+        }
+        Account account = accountUpdateResult.getPayload(Account.class);
+        OperationResult resetResult = resetChannels(account);
+        if (resetResult.notOk()) {
+            return resetResult;
+        }
+        return OperationResult.success().addPayload(account);
+    }
 
     public OperationResult deleteAccountOnly(final Account account) {
         if (account == null) throw new IllegalArgumentException("Account cannot be null");
@@ -310,6 +323,51 @@ public OperationResult deleteAccountOnly(final Account account) {
                 return tokenDeletionResult;
             }
         }
+
+        //also reset channels (tfa, reset)
+        OperationResult resetResult = resetChannels(account);
+        if (resetResult.notOk()) {
+            return resetResult;
+        }
+
+        //and finally, delete it
         return accountService.deleteAccount(account);
     }
+
+    private OperationResult resetChannels(final Account account) {
+        if (account == null) throw new IllegalArgumentException("account cannot be null");
+        if (account.getUser() == null) throw new IllegalStateException("account has no owner");
+        
+        Optional<UserSettings> userSettings = userSettingsService.getUserSettings(account.getUser());
+        if (userSettings.isPresent()) {
+            UserSettings us = userSettings.get();
+            if (us.getTfaChannel() == account.getType()) {
+                us.setTfaChannel(getAnotherConfirmedAccount(us.getUser()));
+            }
+            if (us.getPasswordResetChannel() == account.getType()) {
+                us.setPasswordResetChannel(getAnotherConfirmedAccount(us.getUser()));
+            }
+            return userSettingsService.updateUserSettings(us);
+        } else {
+            return OperationResult.generalFail().withMessage("UserSettings not found for " 
+                    + account.getUser().getUsername());
+        }
+    }
+
+    private AccountType getAnotherConfirmedAccount(final User user) {
+        if (user == null) throw new IllegalArgumentException("user cannot be null");
+        List<Account> confirmedAccounts = accountService.getAllAccountsLinkedWithUser(user).stream()
+                .filter(Account::isConfirmed).toList();
+        if (confirmedAccounts.size() > 1) {
+            //more than one confirmed account - user should decide, which one to use.
+            return AccountType.LOCAL;
+        } else if (confirmedAccounts.size() == 1) {
+            //just using another confirmed account
+            return confirmedAccounts.get(0).getType();
+        } else {
+            //no more confirmed accounts - reset
+            return AccountType.LOCAL;
+        }
+    }
+
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
index 29bb19bca..9bab9fb72 100644
--- a/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/ConfirmAccountPage.java
@@ -248,7 +248,7 @@ private void onSubmitEmail(final ClickEvent<Button> event) {
 
         //clean -> save
         Optional<Account> currentEmailRecord = accountService.getAccount(user, AccountType.EMAIL);
-        OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
+        OperationResult emailUpdateResult = userOperationsService.updateEmailAccount(user, email);
         if (emailUpdateResult.notOk()) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
             emailInput.setStatus(EmailConfirmationStatus.FAILED);
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index 2576dd6d5..c2d06fa20 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -332,7 +332,7 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         //clean -> save
         Optional<Account> currentEmailRecord = accountService.getAccount(user, AccountType.EMAIL);
 
-        OperationResult emailUpdateResult = accountService.updateEmailAccount(user, email);
+        OperationResult emailUpdateResult = userOpsService.updateEmailAccount(user, email);
         if (emailUpdateResult.notOk()) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
             if (currentEmail.isPresent()) {

From ff936c0065ddf4dd1902d5e38cdbe01d9b8ab7b6 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <aleks@karhu.ee>
Date: Mon, 20 Feb 2023 17:14:25 +0200
Subject: [PATCH 69/69] Code style (#998)

Signed-off-by: Aleksandr Muravja <aleks@karhu.ee>
---
 checkstyle.xml                                |   8 +-
 .../pm/axe/services/user/AccountService.java  |  12 ++
 .../pm/axe/services/user/TokenService.java    |   9 ++
 .../services/user/UserOperationsService.java  |  16 +-
 .../axe/ui/elements/ConfirmedEmailField.java  |  15 +-
 .../pages/user/profile/tabs/ProfileTab.java   | 141 ++++++++++--------
 6 files changed, 135 insertions(+), 66 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 18b066a50..85f193cdf 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -146,7 +146,13 @@
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
+        <module name="OperatorWrap">
+            <property name="tokens"
+                      value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
+           SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/>
+            <property name="option" value="eol"/>
+        </module>
+
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
diff --git a/src/main/java/pm/axe/services/user/AccountService.java b/src/main/java/pm/axe/services/user/AccountService.java
index 4bb9013e5..9a8e89685 100644
--- a/src/main/java/pm/axe/services/user/AccountService.java
+++ b/src/main/java/pm/axe/services/user/AccountService.java
@@ -385,6 +385,12 @@ public void rollbackAccount(final Account oldAccount) {
         }
     }
 
+    /**
+     * Returns current email address.
+     *
+     * @param user email's owner
+     * @return {@link Optional} with email address or {@link Optional#empty()}.
+     */
     public Optional<String> getCurrentEmail(final User user) {
         if (user == null) throw new IllegalArgumentException("User cannot be NULL");
 
@@ -399,6 +405,12 @@ public Optional<String> getCurrentEmail(final User user) {
         }
     }
 
+    /**
+     * Is current {@link User} confirmed.
+     *
+     * @param user email's owner
+     * @return true if email confirmed, false if email not confirmed or email doesn't exist.
+     */
     public boolean isCurrentEmailConfirmed(final User user) {
         Optional<Account> emailAccount = getAccount(user, AccountType.EMAIL);
         return emailAccount.map(Account::isConfirmed).orElse(false);
diff --git a/src/main/java/pm/axe/services/user/TokenService.java b/src/main/java/pm/axe/services/user/TokenService.java
index 81a57c8cf..ada86ff0a 100644
--- a/src/main/java/pm/axe/services/user/TokenService.java
+++ b/src/main/java/pm/axe/services/user/TokenService.java
@@ -172,6 +172,15 @@ public Optional<Token> getToken(final String tokenString) {
         return token.isPresent() ? returnOnlyValidToken(token.get()) : Optional.empty();
     }
 
+    /**
+     * Gets Token by {@link User} and {@link TokenType}.
+     *
+     * @param user {@link Token}'s owner
+     * @param tokenType {@link Token}'s type
+     *
+     * @return {@link Optional} with valid {@link Token} or {@link Optional#empty()}
+     * @throws IllegalArgumentException when user or token typer params are null
+     */
     public Optional<Token> getToken(final User user, final TokenType tokenType) {
         if (user == null) throw new IllegalArgumentException("user cannot be null");
         if (tokenType == null) throw new IllegalArgumentException("token type cannot be null");
diff --git a/src/main/java/pm/axe/services/user/UserOperationsService.java b/src/main/java/pm/axe/services/user/UserOperationsService.java
index 9e304b147..3c7e1f1ce 100644
--- a/src/main/java/pm/axe/services/user/UserOperationsService.java
+++ b/src/main/java/pm/axe/services/user/UserOperationsService.java
@@ -296,7 +296,14 @@ public OperationResult deleteUser(final User user, final boolean force) {
         EventBus.getDefault().post(UserDeletedEvent.createWith(user));
         return deletionResult;
     }
-    
+
+    /**
+     * Updates email and also resets channel.
+     *
+     * @param user email account owner
+     * @param email plain text email address
+     * @return {@link OperationResult} with update email {@link Account} or {@link OperationResult} with fail state.
+     */
     public OperationResult updateEmailAccount(final User user, final String email) {
         OperationResult accountUpdateResult = accountService.updateEmailAccount(user, email);
         if (accountUpdateResult.notOk()) {
@@ -310,6 +317,13 @@ public OperationResult updateEmailAccount(final User user, final String email) {
         return OperationResult.success().addPayload(account);
     }
 
+    /**
+     * Deletes {@link Account} and resets channels in {@link UserSettings}.
+     *
+     * @param account non-empty {@link Account} to update.
+     * @return delete account {@link OperationResult}.
+     *
+     */
     public OperationResult deleteAccountOnly(final Account account) {
         if (account == null) throw new IllegalArgumentException("Account cannot be null");
         if (account.getUser() == null) throw new IllegalStateException("Account has no owner");
diff --git a/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
index 5552a9a6b..b62f0eb7b 100644
--- a/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
+++ b/src/main/java/pm/axe/ui/elements/ConfirmedEmailField.java
@@ -7,11 +7,16 @@
 import lombok.Getter;
 import pm.axe.mail.EmailConfirmationStatus;
 
+/**
+ * {@link EmailField} with {@link EmailConfirmationStatus} in suffix.
+ */
 public class ConfirmedEmailField extends EmailField {
     @Getter private final EmailConfirmationStatus status;
-
     @Getter private final Button statusButton;
 
+    /**
+     * Creates {@link ConfirmedEmailField}.
+     */
     public ConfirmedEmailField() {
         status = EmailConfirmationStatus.NONE;
 
@@ -25,11 +30,15 @@ public ConfirmedEmailField() {
         Tooltip tooltip = this.getTooltip().withManual(true);
         statusButton.addClickListener(e -> tooltip.setOpened(!tooltip.isOpened()));
     }
-    
+
+    /**
+     * Updates {@link ConfirmedEmailField} with new {@link EmailConfirmationStatus}.
+     *
+     * @param status new {@link EmailConfirmationStatus}.
+     */
     public void setStatus(final EmailConfirmationStatus status) {
         this.setTooltipText(status.getStatusString());
         statusButton.setIcon(status.getIcon().create());
         statusButton.setVisible(status != EmailConfirmationStatus.NONE);
     }
-
 }
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
index c2d06fa20..e2baa91ea 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -1,6 +1,7 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
 import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
@@ -22,6 +23,7 @@
 import pm.axe.db.models.Token;
 import pm.axe.db.models.User;
 import pm.axe.internal.HasTabInit;
+import pm.axe.mail.EmailConfirmationStatus;
 import pm.axe.result.OperationResult;
 import pm.axe.services.user.AccountService;
 import pm.axe.services.user.TokenService;
@@ -53,17 +55,19 @@ public class ProfileTab extends VerticalLayout implements HasTabInit {
     @SuppressWarnings("FieldCanBeLocal") //will be re-drawn if event received
     private Section accountsSection;
 
-    private final TextField usernameField = new TextField();
+    private final TextField usernameInput = new TextField();
     private final UsernameRequirements usernameRequirements = UsernameRequirements.create();
     private final Button editUsernameButton = new Button();
     private final Button saveUsernameButton = new Button();
     private final HorizontalLayout usernameLayout = new HorizontalLayout();
 
-    private final EmailField emailField = new EmailField();
+    private final ConfirmedEmailField emailInput = new ConfirmedEmailField();
     private final Button editEmailButton = new Button();
     private final Button saveEmailButton = new Button();
     private final HorizontalLayout emailLayout = new HorizontalLayout();
 
+    private Details emailUsageDetails;
+
     private final DeleteConfirmationDialog emailDeleteConfirmationDialog = DeleteConfirmationDialog.create();
 
     @Override
@@ -74,15 +78,23 @@ public void tabInit(final User user) {
         add(accountsSection);
 
         usernameRequirements.hide();
-        if (StringUtils.isBlank(emailField.getValue())) {
-            emailField.focus();
+    }
+
+    @Override
+    protected void onAttach(final AttachEvent attachEvent) {
+        if (StringUtils.isBlank(emailInput.getValue())) {
+            emailInput.focus();
+            if (emailUsageDetails != null) {
+                emailUsageDetails.setOpened(true);
+            }
         }
     }
 
     private Section createAccountSection() {
         HorizontalLayout usernameLayout = createUsernameLayout();
         HorizontalLayout emailLayout = createEmailLayout();
-        Details emailUsageDetails = createEmailUsageDetails();
+
+        emailUsageDetails = createEmailUsageDetails();
         HorizontalLayout telegramLayout = createTelegramLayout();
 
         Stream.of(usernameLayout, emailLayout, emailUsageDetails, telegramLayout).forEach(VaadinUtils::setCentered);
@@ -94,19 +106,19 @@ private Section createAccountSection() {
     }
 
     private HorizontalLayout createUsernameLayout() {
-        usernameField.setLabel("Username");
-        usernameField.setValue(user.getUsername());
-        usernameField.setWidthFull();
-        usernameField.addValueChangeListener(this::onUsernameChanged);
-        usernameField.setClearButtonVisible(true);
-        usernameField.setReadOnly(true);
+        usernameInput.setLabel("Username");
+        usernameInput.setValue(user.getUsername());
+        usernameInput.setWidthFull();
+        usernameInput.addValueChangeListener(this::onUsernameChanged);
+        usernameInput.setClearButtonVisible(true);
+        usernameInput.setReadOnly(true);
 
         editUsernameButton.setText("Edit");
         editUsernameButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         saveUsernameButton.setText("Save");
         saveUsernameButton.addThemeVariants(ButtonVariant.LUMO_SUCCESS, ButtonVariant.LUMO_PRIMARY);
 
-        usernameLayout.add(usernameField, editUsernameButton);
+        usernameLayout.add(usernameInput, editUsernameButton);
         VaadinUtils.fitLayoutInWindow(usernameLayout);
         VaadinUtils.setSmallSpacing(usernameLayout);
 
@@ -116,14 +128,14 @@ private HorizontalLayout createUsernameLayout() {
     }
 
     private HorizontalLayout createEmailLayout() {
-        emailField.setLabel("E-mail");
-        emailField.setClearButtonVisible(true);
-        emailField.setReadOnly(true);
-        emailField.setWidthFull();
-        emailField.addValueChangeListener(this::onEmailChanged);
+        emailInput.setLabel("E-mail");
+        emailInput.setClearButtonVisible(true);
+        emailInput.setReadOnly(true);
+        emailInput.setWidthFull();
+        emailInput.addValueChangeListener(this::onEmailChanged);
 
         Optional<String> currentEmail = getCurrentEmail();
-        currentEmail.ifPresent(emailField::setValue);
+        currentEmail.ifPresent(emailInput::setValue);
         currentEmail.ifPresent(e -> setConfirmationStatus());
 
         editEmailButton.setText("Edit");
@@ -134,10 +146,10 @@ private HorizontalLayout createEmailLayout() {
         emailDeleteConfirmationDialog.setDeleteButtonAction(this::deleteEmail);
 
         if (currentEmail.isPresent()) {
-            emailLayout.add(emailField, editEmailButton);
+            emailLayout.add(emailInput, editEmailButton);
         } else {
-            emailField.setReadOnly(false);
-            emailLayout.add(emailField, saveEmailButton);
+            emailInput.setReadOnly(false);
+            emailLayout.add(emailInput, saveEmailButton);
         }
 
         VaadinUtils.fitLayoutInWindow(emailLayout);
@@ -206,7 +218,7 @@ private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<Tex
         String input = event.getValue().trim();
         boolean isInputEmpty = StringUtils.isBlank(input);
         if (isInputEmpty) {
-            usernameField.setInvalid(false);
+            usernameInput.setInvalid(false);
             usernameRequirements.hide();
             return;
         }
@@ -216,45 +228,45 @@ private void onUsernameChanged(final AbstractField.ComponentValueChangeEvent<Tex
             return;
         }
 
-        final boolean isUsernameValid = !isUsernameInvalid(usernameField);
+        final boolean isUsernameValid = !isUsernameInvalid(usernameInput);
         if (isUsernameValid) {
-            usernameField.setInvalid(false);
-            usernameField.setErrorMessage("");
+            usernameInput.setInvalid(false);
+            usernameInput.setErrorMessage("");
         }
     }
 
     private void onEditUsername(final ClickEvent<Button> event) {
-        usernameField.setReadOnly(false);
+        usernameInput.setReadOnly(false);
         usernameLayout.replace(editUsernameButton, saveUsernameButton);
     }
 
     private void onSaveUsername(final ClickEvent<Button> event) {
-        if (StringUtils.isBlank(usernameField.getValue().trim())) {
-            usernameField.setInvalid(true);
-            usernameField.setErrorMessage("Username cannot be empty");
+        if (StringUtils.isBlank(usernameInput.getValue().trim())) {
+            usernameInput.setInvalid(true);
+            usernameInput.setErrorMessage("Username cannot be empty");
             return;
         }
         //is same as current ?
-        boolean isSameAsCurrent = user.getUsername().equals(usernameField.getValue().trim());
+        boolean isSameAsCurrent = user.getUsername().equals(usernameInput.getValue().trim());
         if (isSameAsCurrent) {
-            usernameField.setReadOnly(true);
+            usernameInput.setReadOnly(true);
             usernameLayout.replace(saveUsernameButton, editUsernameButton);
             return;
         }
 
         //changed -> validate
-        if (isUsernameInvalid(usernameField)) {
+        if (isUsernameInvalid(usernameInput)) {
             return;
         }
 
         //clean -> save
-        OperationResult usernameUpdate = userService.updateUsername(user, usernameField.getValue());
+        OperationResult usernameUpdate = userService.updateUsername(user, usernameInput.getValue());
         if (usernameUpdate.ok()) {
             AppUtils.showSuccessNotification("Username is updated");
         } else {
             ErrorUtils.showErrorNotification("Failed to update Username. Server error");
         }
-        usernameField.setReadOnly(true);
+        usernameInput.setReadOnly(true);
         usernameLayout.replace(saveUsernameButton, editUsernameButton);
     }
 
@@ -262,8 +274,8 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         final String email = event.getValue().trim();
         boolean isValidEmail = EmailValidator.getInstance().isValid(email);
         if (StringUtils.isBlank(email)) {
-            emailField.setInvalid(false);
-            emailField.setErrorMessage("");
+            emailInput.setInvalid(false);
+            emailInput.setErrorMessage("");
             return;
         }
 
@@ -278,39 +290,46 @@ private void onEmailChanged(final AbstractField.ComponentValueChangeEvent<EmailF
         if (isValidEmail) {
             boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
             if (emailExists) {
-                onInvalidInput(emailField, "Email already taken");
+                onInvalidInput(emailInput, "Email already taken");
             }
         } else {
             //not valid email
-            onInvalidInput(emailField, "Should be valid email");
+            onInvalidInput(emailInput, "Should be valid email");
         }
     }
 
     private void onEditEmail(final ClickEvent<Button> event) {
-        emailField.setReadOnly(false);
-        emailField.setSuffixComponent(new Div());
+        emailInput.setReadOnly(false);
+        emailInput.setSuffixComponent(new Div());
         emailLayout.replace(editEmailButton, saveEmailButton);
     }
 
     private void onSaveEmail(final ClickEvent<Button> event) {
-        final String email = emailField.getValue().trim();
-        if (StringUtils.isBlank(email)) {
-            setConfirmationStatus(); //for some reason is removes it.
+        final String email = emailInput.getValue().trim();
+        Optional<String> currentEmail = getCurrentEmail();
+        if (StringUtils.isBlank(email) && currentEmail.isPresent()) {
             emailDeleteConfirmationDialog.show();
 
-            emailField.setReadOnly(true);
+            emailInput.setReadOnly(true);
+            emailLayout.replace(saveEmailButton, editEmailButton);
+            return;
+        } else if (StringUtils.isBlank(email)) {
+            emailInput.setInvalid(false);
+            emailInput.setErrorMessage("");
+
+            emailInput.setReadOnly(true);
             emailLayout.replace(saveEmailButton, editEmailButton);
             return;
         }
 
         //is same as current ?
-        Optional<String> currentEmail = getCurrentEmail();
         if (currentEmail.isPresent()) {
             boolean isSameAsCurrent = currentEmail.get().equals(email);
             if (isSameAsCurrent) {
-                setConfirmationStatus(); //for some reason is removes it.
-                emailField.setReadOnly(true);
+                emailInput.setReadOnly(true);
                 emailLayout.replace(saveEmailButton, editEmailButton);
+
+                setConfirmationStatus();
                 return;
             }
         }
@@ -320,12 +339,12 @@ private void onSaveEmail(final ClickEvent<Button> event) {
             //email
             boolean emailExists = accountService.isAccountAlreadyExists(email, AccountType.EMAIL);
             if (emailExists) {
-                onInvalidInput(emailField, "Email already taken");
+                onInvalidInput(emailInput, "Email already taken");
                 return;
             }
         } else {
             //not valid email
-            onInvalidInput(emailField, "Should be valid email address");
+            onInvalidInput(emailInput, "Should be valid email address");
             return;
         }
 
@@ -336,9 +355,9 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         if (emailUpdateResult.notOk()) {
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
             if (currentEmail.isPresent()) {
-                emailField.setValue(currentEmail.get());
+                emailInput.setValue(currentEmail.get());
             } else {
-                emailField.setValue("");
+                emailInput.setValue("");
             }
             ErrorUtils.showErrorNotification("Failed to update email. Server error");
             return;
@@ -348,7 +367,7 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         Account userAccount = emailUpdateResult.getPayload(Account.class);
         Optional<Token> confirmationToken = userOpsService.createConfirmationToken(userAccount);
         if (confirmationToken.isEmpty()) {
-            emailField.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
+            emailInput.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
             ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
             return;
@@ -358,15 +377,15 @@ private void onSaveEmail(final ClickEvent<Button> event) {
         OperationResult sendConfirmationLetterResult =
                 userOpsService.sendConfirmationLetter(confirmationToken.get(), email, userAccount);
         if (sendConfirmationLetterResult.ok()) {
-            emailField.setSuffixComponent(VaadinIcon.ELLIPSIS_CIRCLE.create());
+            emailInput.setSuffixComponent(VaadinIcon.ELLIPSIS_CIRCLE.create());
             AppUtils.showSuccessNotification("Send confirmation to new email. Please check your inbox.");
         } else {
-            emailField.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
+            emailInput.setSuffixComponent(VaadinIcon.EXCLAMATION_CIRCLE.create());
             ErrorUtils.showErrorNotification("Failed to send confirmation letter. Please try again later.");
             currentEmailRecord.ifPresent(accountService::rollbackAccount);
         }
 
-        emailField.setReadOnly(true);
+        emailInput.setReadOnly(true);
         emailLayout.replace(saveEmailButton, editEmailButton);
     }
 
@@ -417,11 +436,11 @@ private boolean isCurrentEmailConfirmed() {
     private void setConfirmationStatus() {
         boolean hasEmail = getCurrentEmail().isPresent();
         if (hasEmail) {
-            VaadinIcon confirmationStatusIcon = isCurrentEmailConfirmed()
-                    ?  VaadinIcon.CHECK : VaadinIcon.ELLIPSIS_CIRCLE;
-            emailField.setSuffixComponent(confirmationStatusIcon.create());
+            EmailConfirmationStatus confirmationStatus = isCurrentEmailConfirmed()
+                    ?  EmailConfirmationStatus.CONFIRMED : EmailConfirmationStatus.PENDING;
+            emailInput.setStatus(confirmationStatus);
         } else {
-            emailField.setSuffixComponent(new Div());
+            emailInput.setStatus(EmailConfirmationStatus.NONE);
         }
     }
 
@@ -451,10 +470,10 @@ private void deleteEmail() {
             OperationResult result = userOpsService.deleteAccountOnly(emailAccount.get());
             if (result.ok()) {
                 AppUtils.showSuccessNotification("Email successfully deleted");
-                //TODO update status to NONE
+                emailInput.setStatus(EmailConfirmationStatus.NONE);
             } else {
                 ErrorUtils.showErrorNotification("Failed to delete email. System error");
-                //TODO update status to FAILED
+                emailInput.setStatus(EmailConfirmationStatus.FAILED);
             }
         }