chore: bump api version to 26 [skip ci]

* feat: add last activity date time

* chore: update missing files

* chore: improve last seen message to inclute timezone

* chore: remove the formatting from backend

* chore: fix client issues

* fix: add utd to formatting in the client

* fix lint issue

* chore: fix lastLogin always showing the current login

* fix: address sidebar and sign-in review comments

Agent-Logs-Url: https://github.com/RMCampos/tasknote/sessions/04a13c25-87ea-44cc-ac53-cfefd16e0262

Co-authored-by: RMCampos <2219519+RMCampos@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: RMCampos <2219519+RMCampos@users.noreply.github.com>

.gemini/agents/client-updater-bot.md

@@ -0,0 +1,23 @@
+---
+name: client-updater
+description: A bot that updates the client software to the latest version.
+tools: [run_shell_command, read_file, write_file, replace, list_directory, glob, grep_search, ask_user]
+---
+# Instructions
+1. Navigate to the `client` directory.
+2. Execute the following command to check for updates:
+   `npx npm-check-updates --target minor`
+3. Display the resulting list of available minor updates to the user.
+4. If there are packages to update:
+   - Run `npx npm-check-updates --target minor -u` to update `package.json`.
+   - Run `npm install` to update the `package-lock.json` and install the new versions.
+5. Run the validation script to ensure stability:
+   `../tools/check-frontend.sh`
+6. If the validation passes:
+   - Create a new branch (e.g., `update-deps-[date]`).
+   - Commit the changes to `package.json` and `package-lock.json`.
+   - Push and create a Pull Request (using `gh pr create` if available).
+7. If validation fails (lint, build, or test issues):
+   - Diagnose the failure using `grep_search` and `read_file`.
+   - Fix the issues, then retry the validation and PR steps.
+8. Report the final status and the PR link to the user.

.gemini/commands/issue.toml

@@ -0,0 +1,12 @@
+description = "Create a formatted GitHub issue"
+prompt = """
+Act as a project manager. Based on the following input: {{args}}
+Create a GitHub issue using the `gh` CLI tool with this exact structure:
+- Title: [Feat/Bug] <short summary>
+- Body: A detailed description, technical requirements, and acceptance criteria.
+- Label: Automatically determine if it's 'bug', 'enhencement', or 'task'.
+
+Once the user confirms the plan, execute the command:
+`gh issue create --title "[Type] Title" --body "..." --label "..."
+"""
+

.github/workflows/cd-main.yml

@@ -109,6 +109,8 @@ jobs:
             -var="db_name=${{ secrets.DB_NAME }}" \
             -var="security_key=${{ secrets.JWT_SECURITY_KEY }}" \
             -var="mailgun_apikey=${{ secrets.MAILGUN_API_KEY }}" \
+            -var="r2_access_key=${{ secrets.R2_ACCESS_KEY_ID }}" \
+            -var="r2_secret_key=${{ secrets.R2_SECRET_ACCESS_KEY }}" \
             -var="backend_image=${{ steps.deploy-vars.outputs.backend_image }}" \
             -var="frontend_image=${{ steps.deploy-vars.outputs.frontend_image }}"
           terraform show -json tfplan > tfplan.json

.github/workflows/cd-pr.yml

@@ -23,8 +23,6 @@ jobs:
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v3
-        with:
-          terraform_version: "1.10.0"
 
       - name: Show Terraform provider versions
         working-directory: terraform-stg
@@ -68,61 +66,13 @@ jobs:
         working-directory: terraform-stg
         run: terraform validate
 
-      - name: Test TLS from subprocess
-        run: |
-          cat > /tmp/tlstest.sh << 'EOF'
-          #!/bin/bash
-          echo "Testing from subprocess PID: $$"
-          echo "GODEBUG=$GODEBUG"
-          openssl s_client -connect 191.252.159.227:6443 </dev/null 2>&1 | grep -E "CONNECTED|error|timeout|TLS"
-          EOF
-          chmod +x /tmp/tlstest.sh
-          # Run in a subprocess the same way Terraform spawns providers
-          bash /tmp/tlstest.sh &
-          wait $!
-
-      - name: Check system resources
-        run: |
-          echo "--- Memory ---"
-          free -h
-          echo "--- Ulimits ---"
-          ulimit -a
-          echo "--- OOM kills ---"
-          sudo dmesg | grep -i "killed process\|oom" | tail -20
-
-      - name: Test provider binary directly
-        working-directory: terraform-stg
-        run: |
-          PROVIDER=".terraform/providers/registry.terraform.io/hashicorp/kubernetes/2.38.0/linux_amd64/terraform-provider-kubernetes_v2.38.0_x5"
-          echo "--- Provider binary info ---"
-          ls -lh $PROVIDER
-          file $PROVIDER
-          echo "--- Run provider directly ---"
-          timeout 5 $PROVIDER --help 2>&1 || true
-
-      - name: Test TLS with CA verification like Terraform does
-        run: |
-          kubectl config view --raw -o jsonpath='{.clusters[0].cluster.certificate-authority-data}' | base64 -d > /tmp/ca.crt
-          kubectl config view --raw -o jsonpath='{.users[0].user.client-certificate-data}' | base64 -d > /tmp/client.crt
-          kubectl config view --raw -o jsonpath='{.users[0].user.client-key-data}' | base64 -d > /tmp/client.key
-      
-          echo "--- Test with CA verification (exactly like Terraform) ---"
-          curl -v \
-            --cacert /tmp/ca.crt \
-            --cert /tmp/client.crt \
-            --key /tmp/client.key \
-            https://191.252.159.227:6443/api/v1/namespaces/tasknote-stg 2>&1 | grep -E "TLS|SSL|Connected|error|timeout|HTTP|issuer|subject"
-
       - name: Terraform Plan
         id: check-changes
         working-directory: terraform-stg
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          TF_LOG: DEBUG
-          GODEBUG: http2client=1
         run: |
-          echo "Start: $(date)"
           timeout 3m terraform plan -input=false -out=tfplan \
             -var="db_user=${{ secrets.DB_USER }}" \
             -var="db_password=${{ secrets.DB_PASSWORD }}" \
@@ -132,7 +82,6 @@ jobs:
             -var="backend_image=${{ steps.deploy-vars.outputs.backend_image }}" \
             -var="frontend_image=${{ steps.deploy-vars.outputs.frontend_image }}" \
             -var="deploy_version=${{ github.run_id }}"
-          echo "End: $(date)"
           terraform show -json tfplan > tfplan.json
           if jq -e '.resource_changes | length == 0' tfplan.json >/dev/null; then
             echo "no_changes=true" >> "$GITHUB_OUTPUT"
@@ -173,7 +122,7 @@ jobs:
 
       - name: Setup Kubeconfig
         run: |
-          mkdir -p ${{ runner.temp }}/.kube
+          mkdir -p ~/.kube
           echo "${{ secrets.KUBECONFIG_DATA }}" | base64 -d > ~/.kube/config
           chmod 600 ~/.kube/config
 

.github/workflows/ci-pr-backend.yml

@@ -10,6 +10,7 @@ on:
       - 'server/**/*.java'
       - 'server/**/*.xml'
       - 'server/pom.xml'
+      - 'server/**/*.yml'
       - '.github/workflows/server-ci.yml'
 
 jobs:

.gitignore

@@ -7,6 +7,8 @@ client.pnp.js
 
 # testing
 client/coverage
+client/cypress/videos
+client/cypress/screenshots
 
 # production
 client/build
@@ -34,3 +36,19 @@ yarn-error.log*
 
 # Schema Spy
 schemaspy/output/
+
+# Terraform
+.terraform/
+*.tfstate
+*.tfstate.backup
+*.tfplan
+tfplan
+*.tfvars
+*.tfvars.json
+override.tf
+override.tf.json
+_override.tf
+_override.tf.json
+.terraformrc
+terraform.rc
+

AGENTS.md

@@ -9,22 +9,27 @@
 ## Architecture details that matter
 - Frontend route split is auth-state driven in `client/src/App.tsx` + `client/src/routes/ProtectedRoute/index.tsx`; private screens render through `client/src/layout/PrivateLayout/index.tsx`.
 - Home view (`client/src/views/Home/index.tsx`) is a key integration surface: loads tasks/notes/tags, applies client-side filtering, and drives note sharing (`/rest/notes/{id}/share` + `/public/notes/{token}`).
+- Three React Contexts are active at runtime: `AuthProvider` (JWT lifecycle), `FilterProvider` (search text + option persisted to `localStorage` as `FILTER_TEXT`/`FILTER_OPTION`), and `SidebarProvider` (sidebar open/close state) — all under `client/src/context/`.
 - Backend follows controller -> service -> repository layering (`server/src/main/java/br/com/tasknoteapp/server/{controller,service,repository}`).
+- `HomeController` (`/rest/home`) exposes aggregated data such as `/rest/home/tasks/tags`; it is separate from `TaskController` and `NoteController`.
 - Global API error shape comes from `server/src/main/java/br/com/tasknoteapp/server/controller/RestExceptionController.java`; frontend expects `message` or `fields[].fieldMessage` (`client/src/api-service/api.ts`).
 - Email and password-reset flows are Mailgun-backed (`server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java`) and use templates under `server/src/main/java/br/com/tasknoteapp/server/templates/` + `mailgun-templates/`.
+- Backend targets **Java 25** and **Spring Boot 4.x** (`server/pom.xml`).
 
 ## Developer workflows (use these first)
 - Frontend quality gate: `bash tools/check-frontend.sh` (runs `npm ci`, `lint:fix`, `build`, `test:no-watch`).
 - Backend quality gate: `bash tools/check-backend.sh` (runs checkstyle, compile, then `clean verify -P tests`).
+- Backend dependency freshness check: `bash tools/check-be-deps.sh` (verifies that `failsafe`, `surefire`, `jacoco`, `checkstyle`, and Spring Boot plugin versions in `pom.xml` match the latest releases on Maven Central; must be run from the repo root or `server/`).
 - Important Maven default: tests/checkstyle/jacoco are skipped unless profile `-P tests` is enabled (`server/pom.xml`).
 - Dev stack via Docker Compose/Taskfile (`Taskfile.yml`, `docker-compose.dev.yml`): app `5000`, API `8585`, Java debug port `5005`, Postgres `5432`.
 - Frontend local dev: run from `client/` with `npm start`; backend local dev: run from `server/` with `./mvnw spring-boot:run`.
 
 ## CI/CD and release behavior
-- PR workflows (`.github/workflows/client-ci.yml`, `.github/workflows/server-ci.yml`) run checks then push `:candidate` images to GHCR.
-- Main workflows (`.github/workflows/main-client.yml`, `.github/workflows/main-server.yml`) push versioned tags + `latest`; backend workflow also increments `server/pom.xml` version.
-- Deploy workflows (`.github/workflows/deploy-stg.yml`, `.github/workflows/deploy.yml`) apply Terraform in `terraform-stg/` and `terraform/` to Kubernetes.
-- Infra wiring (secrets, services, ingress, image vars) is defined in `terraform/main.tf`.
+- PR workflows (`.github/workflows/ci-pr-frontend.yml`, `.github/workflows/ci-pr-backend.yml`) run checks then push `:candidate` and `:pr-<N>` images to GHCR.
+- Main workflows (`.github/workflows/ci-main-frontend.yml`, `.github/workflows/ci-main-backend.yml`) push versioned tags (`app-v<date>.<run>` / `api-v<pom-version>`) + `latest`; backend workflow also increments `server/pom.xml` version.
+- Staging deploy workflow (`.github/workflows/cd-pr.yml`) triggers on completion of either PR CI workflow and applies Terraform in `terraform-stg/` using a plan→apply split.
+- Production deploy workflow (`.github/workflows/cd-main.yml`) triggers on completion of either Main CI workflow and applies Terraform in `terraform/` using a plan→apply split; `apply` can be skipped if there are no Terraform changes.
+- Infra wiring (secrets, services, ingress, image vars) is defined in `terraform/main.tf`; an alternative GCP target is under `terraform-gcp/`.
 
 ## Project conventions to preserve
 - Frontend style is ESLint flat config + stylistic rules (2-space indent, single quotes, semicolons) in `client/eslint.config.mjs`.
@@ -37,4 +42,3 @@
 - Keep API contract compatibility with frontend `ApiConfig` paths; changing endpoint paths requires synchronized client updates.
 - When changing auth/session behavior, update both backend filters/controllers and frontend `AuthProvider` token lifecycle.
 - If you change CI/build/deploy commands, update both `README.md` and this `AGENTS.md` to keep workflows discoverable.
-

client/Caddyfile

@@ -34,7 +34,7 @@
       media-src 'self';
       object-src 'none';
       script-src 'unsafe-inline' 'report-sample' 'self' https://*.cloudfront.net;
-      style-src 'report-sample' 'self' https://cdn.jsdelivr.net/ https://fonts.googleapis.com;
+      style-src 'report-sample' 'self' https://cdn.jsdelivr.net/ https://fonts.googleapis.com 'sha256-+OsIn6RhyCZCUkkvtHxFtP0kU3CGdGeLjDd9Fzqdl3o=';
       worker-src 'none';
     "
     Referrer-Policy "same-origin"

client/cypress.config.ts

@@ -0,0 +1,16 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:5000',
+    specPattern: 'cypress/e2e/**/*.cy.{ts,tsx}',
+    supportFile: 'cypress/support/e2e.ts',
+    videosFolder: 'cypress/videos',
+    screenshotsFolder: 'cypress/screenshots',
+    viewportWidth: 1280,
+    viewportHeight: 720,
+    setupNodeEvents(on, config) {
+      return config;
+    }
+  }
+});

client/cypress/e2e/auth.cy.ts

@@ -0,0 +1,141 @@
+/**
+ * E2E tests for authentication flows: User Signup and Login.
+ *
+ * These tests cover the primary user journeys for account creation
+ * and logging in to the TaskNote application.
+ */
+describe('Authentication', () => {
+  /**
+   * User Signup (Registration) flow
+   */
+  describe('Signup', () => {
+    beforeEach(() => {
+      cy.visit('/register');
+    });
+
+    it('displays the registration form', () => {
+      cy.contains('h2', 'Create account').should('be.visible');
+      cy.get('input[name="email"]').should('be.visible');
+      cy.get('input[name="password"]').should('be.visible');
+      cy.get('input[name="passwordAgain"]').should('be.visible');
+      cy.get('button[type="submit"]').should('be.visible').and('contain', 'Create account');
+    });
+
+    it('shows a validation error when the form is submitted empty', () => {
+      cy.get('button[type="submit"]').click();
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('shows a validation error when passwords do not match', () => {
+      cy.get('input[name="email"]').type('testuser@example.com');
+      cy.get('input[name="password"]').type('Password1!');
+      cy.get('input[name="passwordAgain"]').type('DifferentPass1!');
+      cy.get('button[type="submit"]').click();
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('navigates to the login page via the login link', () => {
+      cy.contains('a', 'Login').first().click();
+      cy.url().should('include', '/login');
+    });
+
+    it('navigates back to the landing page via the back-to-home link', () => {
+      cy.contains('a', 'Back to home').click();
+      cy.url().should('eq', `${Cypress.config('baseUrl')}/`);
+    });
+
+    it('submits the signup form and shows a confirmation message on success', () => {
+      cy.intercept({ method: 'PUT', url: /\/auth\/sign-up/ }, {
+        statusCode: 201,
+        body: { message: 'User created' }
+      }).as('signUp');
+
+      cy.get('input[name="email"]').type(`newuser${Date.now()}@example.com`);
+      cy.get('input[name="password"]').type('Password1!');
+      cy.get('input[name="passwordAgain"]').type('Password1!');
+      cy.get('button[type="submit"]').click();
+
+      cy.wait('@signUp');
+      cy.get('.alert-success').should('be.visible');
+    });
+
+    it('displays an error alert when the API returns an error on signup', () => {
+      cy.intercept({ method: 'PUT', url: /\/auth\/sign-up/ }, {
+        statusCode: 409,
+        body: { message: 'Email already in use' }
+      }).as('signUpFail');
+
+      cy.get('input[name="email"]').type(`existing${Date.now()}@example.com`);
+      cy.get('input[name="password"]').type('Password1!');
+      cy.get('input[name="passwordAgain"]').type('Password1!');
+      cy.get('button[type="submit"]').click();
+
+      cy.wait('@signUpFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+  });
+
+  /**
+   * User Login flow
+   */
+  describe('Login', () => {
+    beforeEach(() => {
+      cy.visit('/login');
+    });
+
+    it('displays the login form', () => {
+      cy.contains('h2', 'Login').should('be.visible');
+      cy.get('input[name="email"]').should('be.visible');
+      cy.get('input[name="password"]').should('be.visible');
+      cy.get('button[type="submit"]').should('be.visible').and('contain', 'Login');
+    });
+
+    it('shows a validation error when the form is submitted empty', () => {
+      cy.get('button[type="submit"]').click();
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('navigates to the register page via the create account link', () => {
+      cy.contains('a', 'Create account').click();
+      cy.url().should('include', '/register');
+    });
+
+    it('navigates back to the landing page via the back-to-home link', () => {
+      cy.contains('a', 'Back to home').click();
+      cy.url().should('eq', `${Cypress.config('baseUrl')}/`);
+    });
+
+    it('navigates to the reset password page via the forgot password link', () => {
+      cy.contains('a', 'Forgot your password?').click();
+      cy.url().should('include', '/reset-password');
+    });
+
+    it('redirects to home after a successful login', () => {
+      cy.intercept({ method: 'POST', url: /\/auth\/sign-in/ }, {
+        statusCode: 200,
+        body: { token: 'fake-jwt-token', email: 'user@example.com' }
+      }).as('signIn');
+
+      cy.get('input[name="email"]').type('user@example.com');
+      cy.get('input[name="password"]').type('Password1!');
+      cy.get('button[type="submit"]').click();
+
+      cy.wait('@signIn');
+      cy.url().should('include', '/home');
+    });
+
+    it('displays an error alert when the API returns an error on login', () => {
+      cy.intercept({ method: 'POST', url: /\/auth\/sign-in/ }, {
+        statusCode: 401,
+        body: { message: 'Invalid credentials' }
+      }).as('signInFail');
+
+      cy.get('input[name="email"]').type('user@example.com');
+      cy.get('input[name="password"]').type('wrongpassword');
+      cy.get('button[type="submit"]').click();
+
+      cy.wait('@signInFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+  });
+});

client/cypress/e2e/home.cy.ts

@@ -0,0 +1,199 @@
+/**
+ * E2E tests for Home page management: searching and filtering tasks and notes.
+ */
+
+const mockUser = {
+  userId: 1,
+  name: 'Test User',
+  email: 'test@example.com',
+  admin: false,
+  createdAt: '2026-01-01T00:00:00.000Z',
+  gravatarImageUrl: '',
+  lang: 'en'
+};
+
+const mockTasks = [
+  {
+    id: 1,
+    description: 'Buy groceries',
+    done: false,
+    highPriority: true,
+    dueDate: '2026-06-01',
+    dueDateFmt: 'Jun 1, 2026',
+    lastUpdate: '2026-05-01',
+    tag: 'personal',
+    urls: []
+  },
+  {
+    id: 2,
+    description: 'Write report',
+    done: false,
+    highPriority: false,
+    dueDate: '',
+    dueDateFmt: '',
+    lastUpdate: '2026-05-02',
+    tag: 'work',
+    urls: []
+  }
+];
+
+const mockNotes = [
+  {
+    id: 1,
+    title: 'Meeting notes',
+    description: 'Discuss quarterly goals',
+    url: null,
+    tag: 'work',
+    lastUpdate: '2026-05-01',
+    shared: false,
+    shareToken: null
+  },
+  {
+    id: 2,
+    title: 'Recipe',
+    description: 'Pasta carbonara recipe',
+    url: null,
+    tag: 'personal',
+    lastUpdate: '2026-05-02',
+    shared: false,
+    shareToken: null
+  }
+];
+
+const mockTags = ['personal', 'work'];
+
+describe('Home Management', () => {
+  beforeEach(() => {
+    cy.intercept('GET', /\/rest\/user-sessions\/refresh/, {
+      statusCode: 200,
+      body: { token: 'fake-jwt-token', ...mockUser }
+    }).as('refreshToken');
+
+    cy.intercept('GET', /\/rest\/home\/tasks\/tags/, {
+      statusCode: 200,
+      body: mockTags
+    }).as('getTags');
+
+    cy.intercept('GET', /\/rest\/tasks$/, {
+      statusCode: 200,
+      body: mockTasks
+    }).as('getTasks');
+
+    cy.intercept('GET', /\/rest\/notes$/, {
+      statusCode: 200,
+      body: mockNotes
+    }).as('getNotes');
+
+    cy.visit('/home', {
+      onBeforeLoad(win) {
+        win.localStorage.setItem('TASKNOTE-TOKEN', 'fake-jwt-token');
+        win.localStorage.setItem('TASKNOTE-USER', JSON.stringify(mockUser));
+      }
+    });
+  });
+
+  /**
+   * Home page display
+   */
+  describe('Display', () => {
+    it('shows tasks and notes after loading', () => {
+      cy.wait('@getTasks');
+      cy.wait('@getNotes');
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Write report').should('be.visible');
+      cy.contains('Meeting notes').should('be.visible');
+      cy.contains('Recipe').should('be.visible');
+    });
+  });
+
+  /**
+   * Search / text filtering
+   */
+  describe('Search', () => {
+    beforeEach(() => {
+      cy.wait('@getTasks');
+      cy.wait('@getNotes');
+    });
+
+    it('filters items by search text matching a task description', () => {
+      cy.get('input[placeholder="Filter tasks & notes"]').type('groceries');
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Write report').should('not.exist');
+      cy.contains('Meeting notes').should('not.exist');
+      cy.contains('Recipe').should('not.exist');
+    });
+
+    it('filters items by search text matching a note title', () => {
+      cy.get('input[placeholder="Filter tasks & notes"]').type('Meeting');
+
+      cy.contains('Meeting notes').should('be.visible');
+      cy.contains('Buy groceries').should('not.exist');
+      cy.contains('Recipe').should('not.exist');
+    });
+
+    it('restores all items after clearing the search', () => {
+      cy.get('input[placeholder="Filter tasks & notes"]').type('groceries');
+      cy.contains('Write report').should('not.exist');
+
+      cy.get('input[placeholder="Filter tasks & notes"]').clear();
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Meeting notes').should('be.visible');
+    });
+  });
+
+  /**
+   * Dropdown filter
+   */
+  describe('Dropdown Filter', () => {
+    beforeEach(() => {
+      cy.wait('@getTasks');
+      cy.wait('@getNotes');
+    });
+
+    it('shows only tasks when Tasks filter is selected', () => {
+      cy.get('[data-testid="dropdown-tag-filter"]').click();
+      cy.contains('Tasks').click();
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Write report').should('be.visible');
+      cy.contains('Meeting notes').should('not.exist');
+      cy.contains('Recipe').should('not.exist');
+    });
+
+    it('shows only notes when Notes filter is selected', () => {
+      cy.get('[data-testid="dropdown-tag-filter"]').click();
+      cy.contains('Notes').click();
+
+      cy.contains('Meeting notes').should('be.visible');
+      cy.contains('Recipe').should('be.visible');
+      cy.contains('Buy groceries').should('not.exist');
+      cy.contains('Write report').should('not.exist');
+    });
+
+    it('shows everything when Everything filter is selected', () => {
+      cy.get('[data-testid="dropdown-tag-filter"]').click();
+      cy.contains('Tasks').click();
+
+      cy.get('[data-testid="dropdown-tag-filter"]').click();
+      cy.contains('Everything').click();
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Meeting notes').should('be.visible');
+    });
+
+    it('filters by tag when a tag is selected', () => {
+      cy.wait('@getTags');
+
+      cy.get('[data-testid="dropdown-tag-filter"]').click();
+      cy.contains('#personal').click();
+
+      cy.contains('Buy groceries').should('be.visible');
+      cy.contains('Recipe').should('be.visible');
+      cy.contains('Write report').should('not.exist');
+      cy.contains('Meeting notes').should('not.exist');
+    });
+  });
+});

client/cypress/e2e/notes.cy.ts

@@ -0,0 +1,268 @@
+/**
+ * E2E tests for Notes Management: Create, Update, Delete, and Share notes.
+ */
+
+const mockUser = {
+  userId: 1,
+  name: 'Test User',
+  email: 'test@example.com',
+  admin: false,
+  createdAt: '2026-01-01T00:00:00.000Z',
+  gravatarImageUrl: '',
+  lang: 'en'
+};
+
+const mockNote = {
+  id: 1,
+  title: 'Meeting notes',
+  description: 'Discuss quarterly goals',
+  url: null,
+  tag: 'work',
+  lastUpdate: '2026-05-01',
+  shared: false,
+  shareToken: null
+};
+
+describe('Notes Management', () => {
+  /**
+   * Sets up authentication intercepts and visits the given path.
+   *
+   * @param {string} path - The path to visit.
+   */
+  const visitWithAuth = (path: string): void => {
+    cy.intercept('GET', /\/rest\/user-sessions\/refresh/, {
+      statusCode: 200,
+      body: { token: 'fake-jwt-token', ...mockUser }
+    }).as('refreshToken');
+
+    cy.intercept('GET', /\/rest\/home\/tasks\/tags/, {
+      statusCode: 200,
+      body: ['work', 'personal']
+    }).as('getTags');
+
+    cy.visit(path, {
+      onBeforeLoad(win) {
+        win.localStorage.setItem('TASKNOTE-TOKEN', 'fake-jwt-token');
+        win.localStorage.setItem('TASKNOTE-USER', JSON.stringify(mockUser));
+      }
+    });
+  };
+
+  /**
+   * Create note
+   */
+  describe('Create', () => {
+    beforeEach(() => {
+      visitWithAuth('/notes/new');
+    });
+
+    it('displays the add note form', () => {
+      cy.contains('Add Note').should('be.visible');
+      cy.get('input[name="note_title"]').should('be.visible');
+      cy.get('textarea[name="note_description"]').should('be.visible');
+      cy.contains('button', 'Save note').should('be.visible');
+    });
+
+    it('shows a validation error when submitted without a title', () => {
+      cy.contains('button', 'Save note').click();
+
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('shows a validation error when submitted without content', () => {
+      cy.get('input[name="note_title"]').type('A note title');
+      cy.contains('button', 'Save note').click();
+
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('creates a note and navigates to home on success', () => {
+      cy.intercept('POST', /\/rest\/notes/, {
+        statusCode: 201,
+        body: {
+          id: 10,
+          title: 'New note',
+          description: 'Some content',
+          url: null,
+          tag: '',
+          lastUpdate: '',
+          shared: false,
+          shareToken: null
+        }
+      }).as('createNote');
+
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.get('input[name="note_title"]').type('New note');
+      cy.get('textarea[name="note_description"]').type('Some content');
+      cy.contains('button', 'Save note').click();
+
+      cy.wait('@createNote');
+      cy.url().should('include', '/home');
+    });
+
+    it('shows an error alert when the API returns an error on create', () => {
+      cy.intercept('POST', /\/rest\/notes/, {
+        statusCode: 500,
+        body: { message: 'Internal Server Error' }
+      }).as('createNoteFail');
+
+      cy.get('input[name="note_title"]').type('Failing note');
+      cy.get('textarea[name="note_description"]').type('Some content');
+      cy.contains('button', 'Save note').click();
+
+      cy.wait('@createNoteFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('navigates back to home when Cancel is clicked', () => {
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.contains('button', 'Cancel').click();
+
+      cy.url().should('include', '/home');
+    });
+  });
+
+  /**
+   * Update note
+   */
+  describe('Update', () => {
+    beforeEach(() => {
+      cy.intercept('GET', /\/rest\/notes\/\d+/, {
+        statusCode: 200,
+        body: mockNote
+      }).as('getNote');
+
+      visitWithAuth('/notes/edit/1');
+      cy.wait('@getNote');
+    });
+
+    it('pre-fills the form with the existing note data', () => {
+      cy.get('input[name="note_title"]').should('have.value', 'Meeting notes');
+      cy.get('textarea[name="note_description"]').should('have.value', 'Discuss quarterly goals');
+    });
+
+    it('updates the note and navigates to home on success', () => {
+      cy.intercept('PATCH', /\/rest\/notes\/\d+/, {
+        statusCode: 200,
+        body: { ...mockNote, title: 'Updated meeting notes' }
+      }).as('updateNote');
+
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.get('input[name="note_title"]').clear().type('Updated meeting notes');
+      cy.contains('button', 'Save note').click();
+
+      cy.wait('@updateNote');
+      cy.url().should('include', '/home');
+    });
+
+    it('shows an error alert when the update API call fails', () => {
+      cy.intercept('PATCH', /\/rest\/notes\/\d+/, {
+        statusCode: 500,
+        body: { message: 'Internal Server Error' }
+      }).as('updateNoteFail');
+
+      cy.get('input[name="note_title"]').clear().type('Updated note');
+      cy.contains('button', 'Save note').click();
+
+      cy.wait('@updateNoteFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+  });
+
+  /**
+   * Delete note
+   */
+  describe('Delete', () => {
+    beforeEach(() => {
+      cy.intercept('GET', /\/rest\/tasks$/, {
+        statusCode: 200,
+        body: []
+      }).as('getTasks');
+
+      cy.intercept('GET', /\/rest\/notes$/, {
+        statusCode: 200,
+        body: [mockNote]
+      }).as('getNotes');
+
+      visitWithAuth('/home');
+      cy.wait('@getNotes');
+    });
+
+    it('deletes a note via the note dropdown menu', () => {
+      cy.intercept('DELETE', /\/rest\/notes\/\d+/, {
+        statusCode: 204
+      }).as('deleteNote');
+
+      cy.get('[data-testid="note-dropdown-menu-1"]').click();
+      cy.get('[data-testid="note-dropdown-delete-item-1"]').click();
+
+      cy.wait('@deleteNote');
+    });
+  });
+
+  /**
+   * Share note
+   */
+  describe('Share', () => {
+    beforeEach(() => {
+      cy.intercept('GET', /\/rest\/tasks$/, {
+        statusCode: 200,
+        body: []
+      }).as('getTasks');
+
+      cy.intercept('GET', /\/rest\/notes$/, {
+        statusCode: 200,
+        body: [mockNote]
+      }).as('getNotes');
+
+      visitWithAuth('/home');
+      cy.wait('@getNotes');
+    });
+
+    it('shares a note via the note dropdown menu', () => {
+      cy.intercept('PUT', /\/rest\/notes\/\d+\/share/, {
+        statusCode: 200,
+        body: { ...mockNote, shared: true, shareToken: 'abc123' }
+      }).as('shareNote');
+
+      cy.get('[data-testid="note-dropdown-menu-1"]').click();
+      cy.get('[data-testid="note-dropdown-share-item-1"]').click();
+
+      cy.wait('@shareNote');
+    });
+
+    it('unshares a shared note via the note dropdown menu', () => {
+      const sharedNote = { ...mockNote, shared: true, shareToken: 'abc123' };
+
+      cy.intercept('GET', /\/rest\/notes$/, {
+        statusCode: 200,
+        body: [sharedNote]
+      }).as('getSharedNotes');
+
+      cy.intercept('PUT', /\/rest\/notes\/\d+\/unshare/, {
+        statusCode: 200,
+        body: { ...sharedNote, shared: false, shareToken: null }
+      }).as('unshareNote');
+
+      cy.visit('/home', {
+        onBeforeLoad(win) {
+          win.localStorage.setItem('TASKNOTE-TOKEN', 'fake-jwt-token');
+          win.localStorage.setItem('TASKNOTE-USER', JSON.stringify(mockUser));
+        }
+      });
+
+      cy.wait('@getSharedNotes');
+
+      cy.get('[data-testid="note-dropdown-menu-1"]').click();
+      cy.get('[data-testid="note-dropdown-share-item-1"]').click();
+
+      cy.wait('@unshareNote');
+    });
+  });
+});

client/cypress/e2e/tasks.cy.ts

@@ -0,0 +1,226 @@
+/**
+ * E2E tests for Task Management: Create, Update, and Delete tasks.
+ */
+
+const mockUser = {
+  userId: 1,
+  name: 'Test User',
+  email: 'test@example.com',
+  admin: false,
+  createdAt: '2026-01-01T00:00:00.000Z',
+  gravatarImageUrl: '',
+  lang: 'en'
+};
+
+const mockTask = {
+  id: 1,
+  description: 'Buy groceries',
+  done: false,
+  highPriority: false,
+  dueDate: '',
+  dueDateFmt: '',
+  lastUpdate: '2026-05-01',
+  tag: 'personal',
+  urls: []
+};
+
+describe('Task Management', () => {
+  /**
+   * Sets up authentication intercepts and visits the given path.
+   *
+   * @param {string} path - The path to visit.
+   */
+  const visitWithAuth = (path: string): void => {
+    cy.intercept('GET', /\/rest\/user-sessions\/refresh/, {
+      statusCode: 200,
+      body: { token: 'fake-jwt-token', ...mockUser }
+    }).as('refreshToken');
+
+    cy.intercept('GET', /\/rest\/home\/tasks\/tags/, {
+      statusCode: 200,
+      body: ['personal', 'work']
+    }).as('getTags');
+
+    cy.visit(path, {
+      onBeforeLoad(win) {
+        win.localStorage.setItem('TASKNOTE-TOKEN', 'fake-jwt-token');
+        win.localStorage.setItem('TASKNOTE-USER', JSON.stringify(mockUser));
+      }
+    });
+  };
+
+  /**
+   * Create task
+   */
+  describe('Create', () => {
+    beforeEach(() => {
+      visitWithAuth('/tasks/new');
+    });
+
+    it('displays the add task form', () => {
+      cy.contains('Add Task').should('be.visible');
+      cy.get('input[name="description"]').should('be.visible');
+      cy.get('input[name="url"]').should('be.visible');
+      cy.get('input[name="tag"]').should('be.visible');
+      cy.contains('button', 'Save task').should('be.visible');
+    });
+
+    it('shows a validation error when submitted without a description', () => {
+      cy.contains('button', 'Save task').click();
+
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('creates a task and navigates to home on success', () => {
+      cy.intercept('POST', /\/rest\/tasks/, {
+        statusCode: 201,
+        body: {
+          id: 10,
+          description: 'New task',
+          done: false,
+          highPriority: false,
+          dueDate: '',
+          dueDateFmt: '',
+          lastUpdate: '',
+          tag: '',
+          urls: []
+        }
+      }).as('createTask');
+
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.get('input[name="description"]').type('New task');
+      cy.contains('button', 'Save task').click();
+
+      cy.wait('@createTask');
+      cy.url().should('include', '/home');
+    });
+
+    it('shows an error alert when the API returns an error on create', () => {
+      cy.intercept('POST', /\/rest\/tasks/, {
+        statusCode: 500,
+        body: { message: 'Internal Server Error' }
+      }).as('createTaskFail');
+
+      cy.get('input[name="description"]').type('Failing task');
+      cy.contains('button', 'Save task').click();
+
+      cy.wait('@createTaskFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+
+    it('navigates back to home when Cancel is clicked', () => {
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.contains('button', 'Cancel').click();
+
+      cy.url().should('include', '/home');
+    });
+  });
+
+  /**
+   * Update task
+   */
+  describe('Update', () => {
+    beforeEach(() => {
+      cy.intercept('GET', /\/rest\/tasks\/\d+/, {
+        statusCode: 200,
+        body: mockTask
+      }).as('getTask');
+
+      visitWithAuth('/tasks/edit/1');
+      cy.wait('@getTask');
+    });
+
+    it('pre-fills the form with the existing task data', () => {
+      cy.get('input[name="description"]').should('have.value', 'Buy groceries');
+    });
+
+    it('updates the task and navigates to home on success', () => {
+      cy.intercept('PATCH', /\/rest\/tasks\/\d+/, {
+        statusCode: 200,
+        body: { ...mockTask, description: 'Buy more groceries' }
+      }).as('updateTask');
+
+      cy.intercept('GET', /\/rest\/tasks$/, { statusCode: 200, body: [] }).as('getTasks');
+      cy.intercept('GET', /\/rest\/notes$/, { statusCode: 200, body: [] }).as('getNotes');
+
+      cy.get('input[name="description"]').clear().type('Buy more groceries');
+      cy.contains('button', 'Save task').click();
+
+      cy.wait('@updateTask');
+      cy.url().should('include', '/home');
+    });
+
+    it('shows an error alert when the update API call fails', () => {
+      cy.intercept('PATCH', /\/rest\/tasks\/\d+/, {
+        statusCode: 500,
+        body: { message: 'Internal Server Error' }
+      }).as('updateTaskFail');
+
+      cy.get('input[name="description"]').clear().type('Updated task');
+      cy.contains('button', 'Save task').click();
+
+      cy.wait('@updateTaskFail');
+      cy.get('.alert-danger').should('be.visible');
+    });
+  });
+
+  /**
+   * Mark as done / undone
+   */
+  describe('Mark as Done', () => {
+    beforeEach(() => {
+      cy.intercept('GET', /\/rest\/tasks$/, {
+        statusCode: 200,
+        body: [mockTask]
+      }).as('getTasks');
+
+      cy.intercept('GET', /\/rest\/notes$/, {
+        statusCode: 200,
+        body: []
+      }).as('getNotes');
+
+      visitWithAuth('/home');
+      cy.wait('@getTasks');
+    });
+
+    it('marks a task as done via the task dropdown menu', () => {
+      cy.intercept('DELETE', /\/rest\/tasks\/\d+/, {
+        statusCode: 204
+      }).as('markDone');
+
+      cy.get('[data-testid="task-dropdown-menu-1"]').click();
+      cy.get('[data-testid="task-dropdown-done-item-1"]').click();
+
+      cy.wait('@markDone');
+    });
+
+    it('marks a done task as undone via the task dropdown menu', () => {
+      cy.intercept('GET', /\/rest\/tasks$/, {
+        statusCode: 200,
+        body: [{ ...mockTask, done: true }]
+      }).as('getDoneTasks');
+
+      cy.intercept('DELETE', /\/rest\/tasks\/\d+/, {
+        statusCode: 204
+      }).as('markUndone');
+
+      cy.visit('/home', {
+        onBeforeLoad(win) {
+          win.localStorage.setItem('TASKNOTE-TOKEN', 'fake-jwt-token');
+          win.localStorage.setItem('TASKNOTE-USER', JSON.stringify(mockUser));
+        }
+      });
+
+      cy.wait('@getDoneTasks');
+
+      cy.get('[data-testid="task-dropdown-menu-1"]').click();
+      cy.get('[data-testid="task-dropdown-done-item-1"]').click();
+
+      cy.wait('@markUndone');
+    });
+  });
+});

client/cypress/support/commands.ts

@@ -0,0 +1,26 @@
+// Custom Cypress commands.
+// Add any project-wide custom commands here.
+
+// Prevent TypeScript errors for cy.login usage
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    interface Chainable {
+      /**
+       * Custom command to log in via the UI.
+       * @param email - User email address
+       * @param password - User password
+       */
+      login(email: string, password: string): Chainable<void>;
+    }
+  }
+}
+
+Cypress.Commands.add('login', (email: string, password: string) => {
+  cy.visit('/login');
+  cy.get('input[name="email"]').clear().type(email);
+  cy.get('input[name="password"]').clear().type(password);
+  cy.get('button[type="submit"]').click();
+});
+
+export {};

client/cypress/support/e2e.ts

@@ -0,0 +1,4 @@
+// Support file for Cypress E2E tests.
+// This file is loaded before each spec file.
+
+import './commands';

client/cypress/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": ["ESNext", "dom"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "types": ["cypress", "node"],
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": false,
+    "skipLibCheck": true
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx"
+  ]
+}

client/eslint.config.mjs

@@ -21,6 +21,7 @@ export default [
   {
     ignores: [
       '**/__test__/*',
+      'cypress/**',
       '**/assets/*',
       '**/*.scss',
       '**/*.css',

client/package.json

@@ -13,25 +13,25 @@
   "private": true,
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.7.0",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.2.0",
+    "@vitejs/plugin-react": "^6.0.1",
     "bootstrap": "^5.3.8",
-    "dompurify": "^3.4.1",
-    "i18next": "^25.10.10",
-    "react": "^19.2.5",
+    "dompurify": "^3.4.2",
+    "i18next": "^26.1.0",
+    "react": "^19.2.6",
     "react-bootstrap": "^2.10.10",
     "react-bootstrap-icons": "^1.11.6",
     "react-charts": "^3.0.0-beta.57",
     "react-datepicker": "^9.1.0",
-    "react-dom": "^19.2.5",
-    "react-i18next": "^16.6.6",
+    "react-dom": "^19.2.6",
+    "react-i18next": "^17.0.7",
     "react-markdown": "^10.1.0",
-    "react-router": "^7.14.2",
+    "react-router": "^7.15.0",
     "react-router-bootstrap": "^0.26.3",
     "remark-gfm": "^4.0.1",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.2"
+    "typescript": "^6.0.3",
+    "vite": "^8.0.12"
   },
   "scripts": {
     "start": "vite --host",
@@ -41,7 +41,10 @@
     "test:no-watch": "vitest --watch=false",
     "test:coverage": "vitest run --coverage --watch=false",
     "lint": "./node_modules/.bin/eslint",
-    "lint:fix": "./node_modules/.bin/eslint --fix"
+    "lint:fix": "./node_modules/.bin/eslint --fix",
+    "cypress:open": "cypress open",
+    "cypress:run": "cypress run",
+    "cypress:run:headless": "cypress run --headless"
   },
   "eslintConfig": {
     "extends": [
@@ -62,7 +65,7 @@
     ]
   },
   "devDependencies": {
-    "@eslint/compat": "^2.0.5",
+    "@eslint/compat": "^2.1.0",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.4",
     "@stylistic/eslint-plugin": "^5.10.0",
@@ -72,20 +75,21 @@
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.14",
     "@types/react-router-bootstrap": "^0.26.8",
-    "@vitest/coverage-v8": "^4.1.5",
+    "@vitest/coverage-v8": "^4.1.6",
+    "cypress": "^15.14.2",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-jsdoc": "^62.9.0",
-    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-n": "^18.0.1",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.5.0",
-    "jsdom": "^29.1.0",
+    "globals": "^17.6.0",
+    "jsdom": "^29.1.1",
     "prettier": "^3.8.3",
     "sass": "^1.99.0",
     "source-map-support": "^0.5.21",
-    "typescript-eslint": "^8.59.1",
-    "vitest": "^4.1.5"
+    "typescript-eslint": "^8.59.3",
+    "vitest": "^4.1.6"
   }
 }

client/src/App.tsx

@@ -27,7 +27,7 @@ import './styles/custom.scss';
  * @returns {React.ReactNode} The rendered component.
  */
 function App(): React.ReactNode {
-  const { signed, checkCurrentAuthUser } = useContext(AuthContext);
+  const { signed, loading } = useContext(AuthContext);
   const [theme, setTheme] = useState(() => {
     return localStorage.getItem('theme') ?? 'light';
   });
@@ -103,7 +103,7 @@ function App(): React.ReactNode {
 
   /**
    * Determines the appropriate router based on the user's authentication status.
-   * @returns {Router} The configured router.
+   * @returns The configured router.
    */
   const getBrowserRouter = () => {
     if (signed) {
@@ -114,10 +114,6 @@ function App(): React.ReactNode {
 
   const browserRouter = getBrowserRouter();
 
-  useEffect(() => {
-    checkCurrentAuthUser(window.location.pathname);
-  }, []);
-
   useEffect(() => {
     document.body.setAttribute('data-bs-theme', theme);
     localStorage.setItem('theme', theme);
@@ -138,9 +134,9 @@ function App(): React.ReactNode {
       </button>
 
       {/* Your routes or content here */}
-      <RouterProvider router={browserRouter} />
+      {!loading && <RouterProvider router={browserRouter} />}
     </>
   );
-};
+}
 
 export default App;

client/src/__test__/App.test.tsx

@@ -1,16 +1,24 @@
-import React from 'react';
+import React, { act } from 'react';
 import { test, vi } from 'vitest';
 import App from '../App';
-import { act, render } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import AuthContext from '../context/AuthContext';
 import authContextMock from './__mocks__/authContextMock';
 import SidebarContext from '../context/SidebarContext';
+import FilterContext from '../context/FilterContext';
 
 const sidebarContextMock = {
   currentPage: '/home',
   setNewPage: vi.fn()
 };
 
+const filterContextMock = {
+  filterText: '',
+  selectedOption: 'everything',
+  setFilterText: vi.fn(),
+  setSelectedOption: vi.fn()
+};
+
 vi.mock('react-charts', () => ({
   Chart: ({ options }) => <div data-testid="mocked-chart">Mocked Chart</div>
 }));
@@ -20,7 +28,9 @@ test('Renders the app', async () => {
     render(
       <AuthContext.Provider value={authContextMock}>
         <SidebarContext.Provider value={sidebarContextMock}>
-          <App />
+          <FilterContext.Provider value={filterContextMock}>
+            <App />
+          </FilterContext.Provider>
         </SidebarContext.Provider>
       </AuthContext.Provider>
     );

client/src/__test__/__mocks__/authContextMock.ts

@@ -2,6 +2,7 @@ import { vi } from "vitest";
 
 const authContextMock = {
   signed: true,
+  loading: false,
   user: undefined,
   checkCurrentAuthUser: vi.fn(),
   signIn: vi.fn(),

client/src/__test__/components/AlertError.test.tsx

@@ -7,7 +7,7 @@ describe('AlertError Component tests', () => {
   const dataTestId: string = "alert-error-msg-tests";
   const renderAlert = (message?: string) => {
     return render(
-      <AlertError errorMessage={message} dataTestid={dataTestId} />
+      <AlertError errorMessage={message} dataTestId={dataTestId} />
     );
   };
 

client/src/__test__/components/LoginForm.test.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import React, { act } from 'react';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { BrowserRouter } from 'react-router';
 import { fireEvent, render, screen } from '@testing-library/react';
 import LoginForm from '../../components/LoginForm';
@@ -119,6 +119,7 @@ describe('LoginForm Component test', () => {
   });
 
   it('should disable resend button and show countdown for "register" prefix', async () => {
+    vi.useFakeTimers();
     renderFn("register");
 
     const emailInput = screen.getByTestId('register_email_input');
@@ -129,9 +130,36 @@ describe('LoginForm Component test', () => {
     fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
     fireEvent.change(passwordInput, { target: { value: 'password123' } });
     fireEvent.change(repeatPasswordInput, { target: { value: 'password123' } });
-    fireEvent.click(submitButton);
+    
+    await act(async () => {
+      fireEvent.click(submitButton);
+    });
 
     const resendButton = screen.queryByRole('button', { name: /resend confirmation email/i }) as HTMLButtonElement;
     expect(resendButton).toBeNull();
+    
+    vi.useRealTimers();
+  });
+
+  it('should display resend button when login fails with "Email not confirmed!"', async () => {
+    authContextMock.signIn.mockRejectedValue(new Error('Email not confirmed!'));
+    renderFn("login");
+
+    const emailInput = screen.getByTestId('login_email_input');
+    const passwordInput = screen.getByTestId('account-password-login');
+    const submitButton = screen.getByRole('button', { name: /login/i });
+
+    fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
+    fireEvent.change(passwordInput, { target: { value: 'password123' } });
+    
+    await act(async () => {
+      fireEvent.click(submitButton);
+    });
+
+    const errorMessage = await screen.findByText(/email not confirmed/i);
+    expect(errorMessage).toBeDefined();
+
+    const resendButton = screen.getByRole('button', { name: /resend confirmation email/i });
+    expect(resendButton).toBeDefined();
   });
 });

client/src/__test__/context/AuthProvider.test.tsx

@@ -1,7 +1,7 @@
 // AuthProvider.test.tsx
-import React, { useContext } from 'react';
+import React, { useContext, act } from 'react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, act, waitFor, cleanup } from '@testing-library/react';
+import { render, waitFor, cleanup } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import AuthProvider from '../../context/AuthProvider';
 import AuthContext, { AuthContextData } from '../../context/AuthContext';
@@ -15,6 +15,7 @@ vi.mock('../../api-service/api');
 const ConsumerComponent: React.FC = () => {
   const {
     signed,
+    loading,
     user,
     signIn,
     register,
@@ -26,6 +27,7 @@ const ConsumerComponent: React.FC = () => {
   return (
     <div>
       <div data-testid="signed">{signed ? 'true' : 'false'}</div>
+      <div data-testid="loading">{loading ? 'true' : 'false'}</div>
       <div data-testid="user">{user ? user.name : 'none'}</div>
       <button
         data-testid="signIn"
@@ -89,15 +91,57 @@ describe('AuthProvider', () => {
     cleanup();
   });
 
-  it('should render the default context values', () => {
+  it('should render the default context values', async () => {
     const { getByTestId } = render(
       <AuthProvider>
         <ConsumerComponent />
       </AuthProvider>
     );
 
+    await waitFor(() => {
+      expect(getByTestId('signed').textContent).toBe('false');
+      expect(getByTestId('user').textContent).toBe('none');
+    });
+  });
+
+  it('should set loading to false after initial auth check with no token', async () => {
+    // No token in localStorage, so fetchCurrentSession returns immediately.
+    const { getByTestId } = render(
+      <AuthProvider>
+        <ConsumerComponent />
+      </AuthProvider>
+    );
+
+    await waitFor(() =>
+      expect(getByTestId('loading').textContent).toBe('false')
+    );
     expect(getByTestId('signed').textContent).toBe('false');
-    expect(getByTestId('user').textContent).toBe('none');
+  });
+
+  it('should set loading to false and signed to true after successful initial auth check', async () => {
+    const fakeResponse = {
+      token: 'refresh-token',
+      userId: '789',
+      name: 'Refreshed User',
+      email: 'refreshed@example.com',
+      admin: false,
+      createdAt: new Date().toISOString(),
+      gravatarImageUrl: 'http://dummyimage.com'
+    };
+
+    vi.spyOn(api, 'getJSON').mockResolvedValue(fakeResponse);
+    localStorage.setItem(API_TOKEN, 'dummy');
+
+    const { getByTestId } = render(
+      <AuthProvider>
+        <ConsumerComponent />
+      </AuthProvider>
+    );
+
+    await waitFor(() =>
+      expect(getByTestId('loading').textContent).toBe('false')
+    );
+    expect(getByTestId('signed').textContent).toBe('true');
   });
 
   it('should sign in a user successfully', async () => {
@@ -120,9 +164,7 @@ describe('AuthProvider', () => {
       </AuthProvider>
     );
 
-    await act(async () => {
-      userEvent.click(getByTestId('signIn'));
-    });
+    await userEvent.click(getByTestId('signIn'));
 
     await waitFor(() =>
       expect(getByTestId('signed').textContent).toBe('true')
@@ -169,18 +211,14 @@ describe('AuthProvider', () => {
     );
 
     // Make sure that the context initially renders with the signed user by triggering a signIn.
-    await act(async () => {
-      userEvent.click(getByTestId('signIn'));
-    });
+    await userEvent.click(getByTestId('signIn'));
 
     await waitFor(() =>
       expect(getByTestId('signed').textContent).toBe('true')
     );
 
     // Now sign out
-    await act(async () => {
-      userEvent.click(getByTestId('sign-out-btn'));
-    });
+    await userEvent.click(getByTestId('sign-out-btn'));
 
     await waitFor(() =>
       expect(getByTestId('signed').textContent).toBe('false')
@@ -198,14 +236,10 @@ describe('AuthProvider', () => {
       </AuthProvider>
     );
 
-    await act(async () => {
-      userEvent.click(getByTestId('updateUser'));
-    });
+    await userEvent.click(getByTestId('updateUser'));
 
     await waitFor(() => {
-      act(() => {
-        expect(getByTestId('user').textContent).toBe('Updated User')
-      })
+      expect(getByTestId('user').textContent).toBe('Updated User')
       const savedUser = localStorage.getItem(USER_DATA);
       expect(savedUser).not.toBeNull();
       

client/src/__test__/context/SidebarProvider.test.tsx

@@ -60,7 +60,7 @@ describe('SidebarProvider', () => {
     });
 
     await waitFor(() =>
-      expect(getByTestId('page').textContent).toBe('/another')
+      expect(getByTestId('page').textContent).toBe('/home')
     );
   });
 });

client/src/__test__/setup.ts

@@ -1,6 +1,8 @@
-import { afterEach, beforeEach } from 'vitest';
+// @ts-ignore
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+
+import { afterEach, beforeEach, vi } from 'vitest';
 import { cleanup } from '@testing-library/react';
-import { vi } from 'vitest';
 
 // runs a cleanup after each test case (e.g. clearing jsdom)
 afterEach(() => {

client/src/__test__/views/NoteAdd.test.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { act } from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { MemoryRouter } from 'react-router';
@@ -105,8 +105,12 @@ describe('NoteAdd Component', () => {
     vi.resetAllMocks();
   });
 
-  it('should render the NoteAdd component', () => {
-    const { getByText } = renderNoteAdd();
+  it('should render the NoteAdd component', async () => {
+    let result: any;
+    await act(async () => {
+      result = renderNoteAdd();
+    });
+    const { getByText } = result;
     expect(getByText('note_form_title_label')).toBeDefined();
     expect(getByText('task_form_url_label')).toBeDefined();
     expect(getByText('note_form_content_label')).toBeDefined();
@@ -114,7 +118,11 @@ describe('NoteAdd Component', () => {
   });
 
   it('should show error message when form is invalid', async () => {
-    const { getByText, getByRole } = renderNoteAdd();
+    let result: any;
+    await act(async () => {
+      result = renderNoteAdd();
+    });
+    const { getByText, getByRole } = result;
     const submitButton = getByRole('button', { name: 'note_form_submit' });
     fireEvent.click(submitButton);
     await waitFor(() => {
@@ -127,7 +135,11 @@ describe('NoteAdd Component', () => {
       new URLSearchParams("backTo=home"),
     ]);
 
-    const { getByLabelText, getByTestId, getByRole } = renderNoteAdd();
+    let result: any;
+    await act(async () => {
+      result = renderNoteAdd();
+    });
+    const { getByLabelText, getByTestId, getByRole } = result;
     const descriptionInput = getByLabelText('note_form_title_label') as HTMLInputElement;
     const noteContentInput = getByTestId('note-content-input-area') as HTMLAreaElement;
     const submitButton = getByRole('button', { name: 'note_form_submit' });
@@ -151,8 +163,12 @@ describe('NoteAdd Component', () => {
     });
   });
 
-  it('should render text based on new contentHeader component', () => {
-    const { getByText } = renderNoteAdd();
+  it('should render text based on new contentHeader component', async () => {
+    let result: any;
+    await act(async () => {
+      result = renderNoteAdd();
+    });
+    const { getByText } = result;
 
     expect(getByText('Add')).toBeDefined();
     expect(getByText('Note')).toBeDefined();

client/src/__test__/views/TaskAdd.test.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { act } from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { MemoryRouter } from 'react-router';
@@ -23,7 +23,7 @@ vi.mock('react-i18next', () => ({
   }),
   initReactI18next: {
     type: '3rdParty',
-    init: vi.fn(),
+    init:  vi.fn(),
   },
   I18nextProvider: ({ children }: any) => children,
 }));
@@ -82,8 +82,12 @@ describe('TaskAdd Component', () => {
     (useSearchParams as unknown as ReturnType<typeof vi.fn>).mockReset();
   });
 
-  it('should render the TaskAdd component', () => {
-    const { getByText } = renderTaskAdd();
+  it('should render the TaskAdd component', async () => {
+    let result: any;
+    await act(async () => {
+      result = renderTaskAdd();
+    });
+    const { getByText } = result;
     expect(getByText('task_form_title')).toBeDefined();
     expect(getByText('task_form_desc_label')).toBeDefined();
     expect(getByText('task_form_url_label')).toBeDefined();
@@ -92,7 +96,11 @@ describe('TaskAdd Component', () => {
   });
 
   it('should show error message when form is invalid', async () => {
-    const { getByText, getByRole } = renderTaskAdd();
+    let result: any;
+    await act(async () => {
+      result = renderTaskAdd();
+    });
+    const { getByText, getByRole } = result;
     const submitButton = getByRole('button', { name: 'task_form_submit' });
     fireEvent.click(submitButton);
     await waitFor(() => {
@@ -105,7 +113,11 @@ describe('TaskAdd Component', () => {
       new URLSearchParams("backTo=home"),
     ]);
 
-    const { getByLabelText, getByRole } = renderTaskAdd();
+    let result: any;
+    await act(async () => {
+      result = renderTaskAdd();
+    });
+    const { getByLabelText, getByRole } = result;
     const descriptionInput = getByLabelText('task_form_desc_label') as HTMLInputElement;
     const submitButton = getByRole('button', { name: 'task_form_submit' });
 
@@ -125,12 +137,16 @@ describe('TaskAdd Component', () => {
     });
   });
 
-  it('should render text based on new contentHeader component', () => {
+  it('should render text based on new contentHeader component', async () => {
     (useSearchParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue([
       new URLSearchParams("backTo=home"),
     ]);
 
-    const { getByText } = renderTaskAdd();
+    let result: any;
+    await act(async () => {
+      result = renderTaskAdd();
+    });
+    const { getByText } = result;
 
     expect(getByText('Add')).toBeDefined();
     expect(getByText('Task')).toBeDefined();

client/src/components/AlertError/index.tsx

@@ -3,7 +3,7 @@ import { Alert } from 'react-bootstrap';
 
 type Props = {
   errorMessage?: string;
-  dataTestid?: string;
+  dataTestId?: string;
   onClose?: () => void;
 };
 
@@ -12,7 +12,7 @@ type Props = {
  *
  * @param {Props} props the AlertError props with the message to be displayed.
  * @param {string} [props.errorMessage] Optional error message.
- * @param {string} [props.dataTestid] Optional data-testid property.
+ * @param {string} [props.dataTestId] Optional data-testId property.
  * @param {Function} [props.onClose] OnClose function to be called.
  * @returns {React.ReactNode} the AlertError rendered component.
  */
@@ -25,7 +25,7 @@ const AlertError: React.FC<Props> = (props: Props): React.ReactNode => {
     <Alert
       variant="danger"
       dismissible
-      data-testid={props.dataTestid}
+      data-testid={props.dataTestId}
       onClose={props.onClose}
     >
       { props.errorMessage }

client/src/components/FormInput/index.tsx

@@ -20,7 +20,7 @@ interface Props {
   valueDate?: Date | null;
   onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
   onChangeDate?: (date: Date | null) => void;
-  data_testid?: string;
+  dataTestId?: string;
   pwdHideText?: string;
   pwdShowText?: string;
   pwdHelperTxt?: string;
@@ -107,7 +107,7 @@ function FormInput(props: React.PropsWithChildren<Props>): React.ReactNode {
                     placeholder={props.placeholder ? props.placeholder : ''}
                     value={props?.value}
                     onChange={props.onChange}
-                    data-testid={props.data_testid}
+                    data-testid={props.dataTestId}
                   />
                 )}
           </InputGroup>

client/src/components/LoginForm/index.tsx

@@ -34,6 +34,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
   const [formInvalid, setFormInvalid] = useState<boolean>(false);
   const [errorMessage, setErrorMessage] = useState<string>('');
   const [successMessage, setSuccessMessage] = useState<string>('');
+  const [showResend, setShowResend] = useState<boolean>(false);
   const [email, setEmail] = useState<string>('');
   const [password, setPassword] = useState<string>('');
   const [passwordAgain, setPasswordAgain] = useState<string>('');
@@ -53,16 +54,16 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
   /**
    * Handles the form submit button click event.
    *
-   * When clicked, checks if the form is valid. It it's not, raise an error
-   * message in an Alert. Otherwise, it call the signIn API and navigates to the home page.
+   * When clicked, checks if the form is valid. If it's not, raise an error
+   * message in an Alert. Otherwise, it calls the signIn API and navigates to the home page.
    */
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>): Promise<void> => {
+  const handleSubmit = async (event: React.SubmitEvent<HTMLFormElement>): Promise<void> => {
     event.preventDefault();
     event.stopPropagation();
     setValidated(true);
 
     const form = event.currentTarget;
-    if (form.checkValidity() === false) {
+    if (!form.checkValidity()) {
       setFormInvalid(true);
       if (prefix === 'complete_reset') {
         setErrorMessage(translateServerResponse('Please fill in the new password', i18n.language));
@@ -82,6 +83,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
     }
 
     setFormInvalid(false);
+    setShowResend(false);
     try {
       if (prefix === 'login') {
         await signIn(email, password);
@@ -93,6 +95,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
         setPassword('');
         setPasswordAgain('');
         setSuccessMessage(translateServerResponse('Please confirm your email before proceeding', i18n.language));
+        setShowResend(true);
         setSecondsLeft(30);
         setIsResendEnabled(false);
       }
@@ -107,15 +110,19 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
       }
     }
     catch (e) {
-      console.log(e);
       setFormInvalid(true);
+      let msg = '';
       if (typeof e === 'string') {
         console.log('string');
-        setErrorMessage(translateServerResponse(e, i18n.language));
+        msg = e;
       }
       else if (e instanceof Error) {
-        console.log(e.message);
-        setErrorMessage(translateServerResponse(e.message, i18n.language));
+        msg = e.message;
+      }
+
+      setErrorMessage(translateServerResponse(msg, i18n.language));
+      if (msg === 'Email not confirmed!') {
+        setShowResend(true);
       }
     }
   };
@@ -124,7 +131,9 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
     try {
       await api.postJSON(ApiConfig.resendConfirmUrl, { email });
 
-      setSuccessMessage('Confirmation email re-sent! Please check the spam folder.');
+      setSuccessMessage(translateServerResponse('Confirmation email re-sent! Please check the spam folder.', i18n.language));
+      setFormInvalid(false);
+      setShowResend(true);
       setSecondsLeft(30);
       setIsResendEnabled(false);
     }
@@ -164,36 +173,48 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
 
               {formInvalid
                 ? (
-                    <Alert variant="danger">
-                      { errorMessage }
-                    </Alert>
+                    <>
+                      <Alert variant="danger">{errorMessage}</Alert>
+                      {showResend && (
+                        <div className="text-center mt-2">
+                          <Button
+                            variant="outline-secondary"
+                            size="sm"
+                            onClick={handleResend}
+                            disabled={!isResendEnabled}
+                          >
+                            {isResendEnabled
+                              ? `${t('register_resent_email')}`
+                              : `${t('register_resent_email_secs')} ${secondsLeft}`}
+                          </Button>
+                        </div>
+                      )}
+                    </>
                   )
                 : null}
 
-              {successMessage.length > 1 && prefix === 'register' && (
+              {successMessage.length > 1 && (
                 <>
                   <Alert variant="success">
                     { successMessage }
                   </Alert>
 
-                  <div className="text-center">
-                    <Button
-                      variant="outline-secondary"
-                      onClick={handleResend}
-                      disabled={!isResendEnabled}
-                    >
-                      {isResendEnabled ? `${t('register_resent_email')}` : `${t('register_resent_email_secs')} ${secondsLeft}`}
-                    </Button>
-                  </div>
+                  {showResend && (
+                    <div className="text-center mb-3">
+                      <Button
+                        variant="outline-secondary"
+                        onClick={handleResend}
+                        disabled={!isResendEnabled}
+                      >
+                        {isResendEnabled
+                          ? `${t('register_resent_email')}`
+                          : `${t('register_resent_email_secs')} ${secondsLeft}`}
+                      </Button>
+                    </div>
+                  )}
                 </>
               )}
 
-              {successMessage.length > 1 && prefix !== 'register' && (
-                <Alert variant="success">
-                  { successMessage }
-                </Alert>
-              )}
-
               <Form noValidate validated={validated} onSubmit={handleSubmit}>
                 {prefix !== 'complete_reset' && (
                   <FormInput
@@ -202,7 +223,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
                     required={true}
                     name="email"
                     placeholder={t(`${prefix}_email_placeholder`)}
-                    data_testid={`${prefix}_email_input`}
+                    dataTestId={`${prefix}_email_input`}
                     value={email}
                     onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                       setEmail(e.target.value);
@@ -225,7 +246,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
                     onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                       setPassword(e.target.value);
                     }}
-                    data_testid="account-password-login"
+                    dataTestId="account-password-login"
                   />
                 )}
 
@@ -244,7 +265,7 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
                     onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                       setPasswordAgain(e.target.value);
                     }}
-                    data_testid={`account-repeat-password-${prefix}`}
+                    dataTestId={`account-repeat-password-${prefix}`}
                   />
                 )}
 
@@ -259,7 +280,10 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
 
               <div className="text-center mt-3">
                 {t(`${prefix}_account`)}
-                <Link to={prefix === 'login' ? '/register' : '/login'} className="text-decoration-none ms-2">
+                <Link
+                  to={prefix === 'login' ? '/register' : '/login'}
+                  className="text-decoration-none ms-2"
+                >
                   {t(`${prefix}_go_other`)}
                 </Link>
               </div>
@@ -271,7 +295,10 @@ function LoginForm({ prefix }: { prefix: string }): React.ReactNode {
               </div>
               <div className="text-center mt-3">
                 {prefix === 'login' && (
-                  <Link to="/reset-password" className="text-decoration-none ms-2">
+                  <Link
+                    to="/reset-password"
+                    className="text-decoration-none ms-2"
+                  >
                     {t('login_forgot_password')}
                   </Link>
                 )}

client/src/components/Sidebar/index.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Nav } from 'react-bootstrap';
 import { NavLink } from 'react-router';
 import { useTranslation } from 'react-i18next';
@@ -22,6 +22,7 @@ interface Props {
 function Sidebar(props: React.PropsWithChildren<Props>): React.ReactNode {
   const { signOut, user } = useContext(AuthContext);
   const { currentPage, setNewPage } = useContext(SidebarContext);
+  const [lastSeen, setLastSeen] = useState('');
   const { t } = useTranslation();
   const build = `Build: ${env.VITE_BUILD}`;
 
@@ -46,7 +47,25 @@ function Sidebar(props: React.PropsWithChildren<Props>): React.ReactNode {
     return '';
   };
 
-  useEffect(() => {}, [user, currentPage]);
+  useEffect(() => {
+    if (user && user.lastLogin) {
+      const utcString = user.lastLogin.endsWith('Z') ? user.lastLogin : `${user.lastLogin}Z`;
+      const date = new Date(utcString);
+      if (Number.isNaN(date.getTime())) {
+        setLastSeen('');
+        return;
+      }
+      const fmtted = date.toLocaleString(navigator.language, {
+        timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+      });
+      setLastSeen(fmtted);
+    }
+  }, [user]);
 
   return (
     <>
@@ -95,9 +114,12 @@ function Sidebar(props: React.PropsWithChildren<Props>): React.ReactNode {
 
         {/* Footer at the bottom */}
         <div className="mt-auto text-center text-muted py-3">
-          <small data-testid="footer-text">
-            {build}
-          </small>
+          {lastSeen && (
+            <div>
+              <small>{t('sidebar_last_seen', { time: lastSeen })}</small>
+            </div>
+          )}
+          <small data-testid="footer-text">{build}</small>
         </div>
       </div>
 

client/src/constants/english.ts

@@ -187,6 +187,7 @@ const enTranslations = {
   account_delete_btn: 'Yes, delete everything',
 
   footer_my_account: 'My Account ',
+  sidebar_last_seen: 'Last seen {{time}}',
 
   logout: 'Logout'
 };

client/src/constants/languageConstants.ts

@@ -90,6 +90,8 @@ export const serverResponsesTranslations: Record<string, string> = {
   WRONG_IDENTIFICATION_pt_br: 'Identificação incorreta ou faltando',
   WRONG_OR_MISSING_INFO_pt_br: 'Informação errada ou incompleta!',
   NOTHING_TO_UPDATE_pt_br: 'Nada para atualizar!',
+  EMAIL_NOT_CONFIRMED_pt_br: 'E-mail não confirmado!',
+  CONFIRMATION_RESENT_pt_br: 'E-mail de confirmação reenviado! Por favor, verifique a pasta de spam.',
 
   BAD_PASSWORD_8_es: 'Contraseña inválida: La contraseña debe tener al menos 8 caracteres',
   BAD_PASSWORD_7_es: 'Contraseña inválida: La contraseña debe tener al menos 8 caracteres, 1 carácter especial',
@@ -117,6 +119,8 @@ export const serverResponsesTranslations: Record<string, string> = {
   WRONG_IDENTIFICATION_es: 'Identificación incorrecta o faltante',
   WRONG_OR_MISSING_INFO_es: '¡Información incorrecta o incompleta!',
   NOTHING_TO_UPDATE_es: '¡Nada que actualizar!',
+  EMAIL_NOT_CONFIRMED_es: '¡Correo no confirmado!',
+  CONFIRMATION_RESENT_es: '¡Correo de confirmación reenviado! Por favor, revisa la carpeta de spam.',
 
   BAD_PASSWORD_8_ru: 'Неправильный пароль: Пароль должен содержать не менее 8 символов.',
   BAD_PASSWORD_7_ru: 'Неправильный пароль: Пароль должен содержать не менее 8 символов, 1 специальный символ.',
@@ -143,5 +147,7 @@ export const serverResponsesTranslations: Record<string, string> = {
   UNKNOWN_ru: 'Неизвестная ошибка',
   WRONG_IDENTIFICATION_ru: 'Неправильная или отсутствующая идентификация',
   WRONG_OR_MISSING_INFO_ru: 'Неверная или отсутствующая информация!',
-  NOTHING_TO_UPDATE_ru: 'Нечего обновлять!'
+  NOTHING_TO_UPDATE_ru: 'Нечего обновлять!',
+  EMAIL_NOT_CONFIRMED_ru: 'Электронная почта не подтверждена!',
+  CONFIRMATION_RESENT_ru: 'Письмо с подтверждением отправлено еще раз! Пожалуйста, проверьте папку со спамом.'
 };

client/src/constants/portuguese.ts

@@ -188,6 +188,7 @@ const ptBrTranslations = {
   account_delete_btn: 'Sim, deletar tudo',
 
   footer_my_account: 'Minha Conta ',
+  sidebar_last_seen: 'Último acesso {{time}}',
 
   logout: 'Sair'
 };

client/src/constants/russian.ts

@@ -187,6 +187,7 @@ const ruTranslations = {
   account_delete_btn: 'Да, удалить все',
 
   footer_my_account: 'Мой аккаунт ',
+  sidebar_last_seen: 'Последний вход {{time}}',
 
   logout: 'Выйти'
 };

client/src/constants/serverResponses.ts

@@ -24,5 +24,7 @@ export const serverResponses: Record<string, string> = {
   'Wrong or missing identification': 'WRONG_IDENTIFICATION',
   'Wrong or missing information!': 'WRONG_OR_MISSING_INFO',
   'Invalid credentials': 'INVALID_CREDENTIALS',
-  'Nothing to update!': 'NOTHING_TO_UPDATE'
+  'Nothing to update!': 'NOTHING_TO_UPDATE',
+  'Email not confirmed!': 'EMAIL_NOT_CONFIRMED',
+  'Confirmation email re-sent! Please check the spam folder.': 'CONFIRMATION_RESENT'
 };

client/src/constants/spanish.ts

@@ -187,6 +187,7 @@ const esTranslations = {
   account_delete_btn: 'Sí, borra todo',
 
   footer_my_account: 'Mi Cuenta ',
+  sidebar_last_seen: 'Último acceso {{time}}',
 
   logout: 'Cerrar sesión'
 };

client/src/context/AuthContext.ts

@@ -4,6 +4,7 @@ import { UserRegistration } from '../types/UserRegistration';
 
 export interface AuthContextData {
   signed: boolean;
+  loading: boolean;
   user: UserResponse | undefined;
   checkCurrentAuthUser: (pathname: string) => Promise<void>;
   signIn: (email: string, password: string) => Promise<string>;

client/src/context/AuthProvider.tsx

@@ -1,7 +1,7 @@
-import React, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import AuthContext, { AuthContextData } from './AuthContext';
 import { API_TOKEN, REDIRECT_PATH, USER_DATA } from '../app-constants/app-constants';
-import { SigninResponse } from '../types/SigninResponse';
+import { SignInResponse } from '../types/SigninResponse';
 import api from '../api-service/api';
 import ApiConfig from '../api-service/apiConfig';
 import { UserResponse } from '../types/UserResponse';
@@ -13,17 +13,17 @@ interface Props {
 
 const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Props) => {
   const [signed, setSigned] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(true);
   const [user, setUser] = useState<UserResponse | undefined>();
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
-  const [intervalInstance, setIntervalInstance] = useState<NodeJS.Timeout | null>(null);
 
-  const fetchCurrentSession = async (pathname: string): Promise<SigninResponse | undefined> => {
+  const fetchCurrentSession = async (pathname: string): Promise<SignInResponse | undefined> => {
     const token = localStorage.getItem(API_TOKEN);
     if (!token) {
       return undefined;
     }
     try {
-      const bearerToken: SigninResponse = await api.getJSON(ApiConfig.refreshTokenUrl);
+      const bearerToken: SignInResponse = await api.getJSON(ApiConfig.refreshTokenUrl);
       setSigned(true);
       return bearerToken;
     }
@@ -64,7 +64,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
   };
 
   const checkCurrentAuthUser = async (pathname: string): Promise<void> => {
-    const bearerToken: SigninResponse | undefined = await fetchCurrentSession(pathname);
+    const bearerToken: SignInResponse | undefined = await fetchCurrentSession(pathname);
     if (bearerToken && bearerToken.token) {
       const userLocal = updateUserSession(null, bearerToken.token);
       if (userLocal) {
@@ -89,7 +89,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
   const signIn = async (email: string, password: string): Promise<string> => {
     try {
       const payload = { email, password };
-      const registerResponse: SigninResponse = await api.postJSON(ApiConfig.signInUrl, payload);
+      const registerResponse: SignInResponse = await api.postJSON(ApiConfig.signInUrl, payload);
       const currentUser: UserResponse = {
         userId: registerResponse.userId,
         name: registerResponse.name,
@@ -97,7 +97,8 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
         admin: registerResponse.admin,
         createdAt: new Date(registerResponse.createdAt),
         gravatarImageUrl: registerResponse.gravatarImageUrl,
-        lang: registerResponse.lang
+        lang: registerResponse.lang,
+        lastLogin: registerResponse.lastLogin
       };
 
       setSigned(true);
@@ -114,39 +115,16 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
     setSigned(false);
     setUser(undefined);
     setIsAdmin(false);
-    if (intervalInstance) {
-      clearInterval(intervalInstance);
-      setIntervalInstance(null);
-    }
     localStorage.removeItem(API_TOKEN);
     localStorage.removeItem(REDIRECT_PATH);
     localStorage.removeItem(USER_DATA);
   };
 
-  const refreshTokenPvt = async (): Promise<void> => {
-    const bearerToken: SigninResponse | undefined = await fetchCurrentSession('/');
-    if (bearerToken) {
-      updateUserSession(null, bearerToken.token);
-    }
-    return Promise.resolve();
-  };
-
-  // 2 minutes
-  const second = 1000;
-  const minute = second * 60;
-  const REFRESH_TIMER = minute * 2;
-
-  if (intervalInstance == null && signed) {
-    const instance = setInterval(() => {
-      refreshTokenPvt()
-        .then(() => {
-          console.debug('User session successfully refreshed!');
-        })
-        .catch(e => console.error(e));
-    }, REFRESH_TIMER);
-
-    setIntervalInstance(instance);
-  }
+  useEffect(() => {
+    checkCurrentAuthUser(window.location.pathname)
+      .catch(e => console.error(e))
+      .finally(() => setLoading(false));
+  }, []);
 
   const updateUser = (userUpdated: UserResponse): void => {
     setUser(userUpdated);
@@ -155,6 +133,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
 
   const contextValue: AuthContextData = useMemo(() => ({
     signed,
+    loading,
     user,
     checkCurrentAuthUser,
     signIn,
@@ -162,7 +141,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
     register,
     isAdmin,
     updateUser
-  }), [signed, user, checkCurrentAuthUser, signIn, signOut, register, isAdmin, updateUser]);
+  }), [signed, loading, user, checkCurrentAuthUser, signIn, signOut, register, isAdmin, updateUser]);
 
   return (
     <AuthContext.Provider value={contextValue}>

client/src/routes/ProtectedRoute/index.tsx

@@ -19,6 +19,6 @@ function ProtectedRoute(): React.ReactNode {
     return <Navigate to="/" replace />;
   }
   return <Outlet />;
-};
+}
 
 export default ProtectedRoute;

client/src/types/SigninResponse.ts

@@ -1,4 +1,4 @@
-export type SigninResponse = {
+export type SignInResponse = {
   userId: number;
   name: string;
   email: string;
@@ -7,4 +7,5 @@ export type SigninResponse = {
   token: string;
   gravatarImageUrl: string;
   lang: string;
+  lastLogin: string;
 };

client/src/types/SummaryResponse.ts

@@ -1,5 +0,0 @@
-export type SummaryResponse = {
-  pendingTaskCount: number;
-  doneTaskCount: number;
-  notesCount: number;
-};

client/src/types/UserResponse.ts

@@ -6,4 +6,5 @@ export type UserResponse = {
   createdAt: Date;
   gravatarImageUrl: string;
   lang: string;
+  lastLogin: string;
 };

client/src/views/Account/index.tsx

@@ -105,7 +105,7 @@ function Account(): React.ReactNode {
     await patchUserInfo(patchPayload);
   };
 
-  const handleSubmit = async (event?: React.FormEvent<HTMLFormElement>): Promise<void> => {
+  const handleSubmit = async (event?: React.SubmitEvent<HTMLFormElement>): Promise<void> => {
     event?.preventDefault();
     event?.stopPropagation();
     setValidated(true);
@@ -164,7 +164,7 @@ function Account(): React.ReactNode {
               />
 
               <Form noValidate validated={validated} onSubmit={handleSubmit} className="mt-4">
-                {/* User name */}
+                {/* Username */}
                 <FormInput
                   labelText={t('account_form_first_name_label')}
                   iconName="Person"
@@ -205,7 +205,7 @@ function Account(): React.ReactNode {
                   onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                     setUserPassword(e.target.value);
                   }}
-                  data_testid="account-password-one"
+                  dataTestId="account-password-one"
                 />
 
                 {/* User password again */}

client/src/views/EmailConfirmation/index.tsx

@@ -74,7 +74,7 @@ const EmailConfirmation: React.FC = () => {
             <h1 className="mb-4" data-testid="email-confirm-success-msg">{t('email_confirmation_success')}</h1>
 
             <p className="mb-4">{t('email_confirmation_success_text')}</p>
-            <Link to="/login" className="btn btn-success px-4 py-2"style={{ fontWeight: 'bold', borderRadius: '6px' }}>
+            <Link to="/login" className="btn btn-success px-4 py-2" style={{ fontWeight: 'bold', borderRadius: '6px' }}>
               {t('email_confirmation_btn')}
             </Link>
           </>

client/src/views/Home/index.tsx

@@ -82,7 +82,7 @@ function Home(): React.ReactNode {
   const markAsDone = async (task: TaskResponse): Promise<void> => {
     try {
       await api.deleteNoContent(`${ApiConfig.tasksUrl}/${task.id}`);
-      loadAllTasks();
+      await loadAllTasks();
     }
     catch (e) {
       handleError(e);
@@ -97,7 +97,7 @@ function Home(): React.ReactNode {
   const deleteNote = async (noteIdParam: number) => {
     try {
       await api.deleteNoContent(`${ApiConfig.notesUrl}/${noteIdParam}`);
-      loadAllNotes();
+      await loadAllNotes();
     }
     catch (e) {
       handleError(e);
@@ -113,7 +113,7 @@ function Home(): React.ReactNode {
     try {
       const action = note.shared ? 'unshare' : 'share';
       await api.putJSON(`${ApiConfig.notesUrl}/${note.id}/${action}`, {});
-      loadAllNotes();
+      await loadAllNotes();
     }
     catch (e) {
       handleError(e);
@@ -176,10 +176,9 @@ function Home(): React.ReactNode {
     }
     else {
       let filteredTasks = allTasks.filter((task: TaskResponse) => {
-        const shouldFilter = task.description.toLowerCase().includes(text.toLowerCase())
+        return task.description.toLowerCase().includes(text.toLowerCase())
           || task.tag.toLowerCase().includes(text.toLowerCase())
           || task.urls.filter((url: string) => url.includes(text.toLowerCase())).length > 0;
-        return shouldFilter;
       });
 
       if (tagToFilter === 'untagged') {
@@ -487,7 +486,7 @@ function Home(): React.ReactNode {
                   </Col>
                   <Col xs={2} className="text-end">
                     <Dropdown>
-                      <Dropdown.Toggle variant="success">
+                      <Dropdown.Toggle variant="success" data-testid={`task-dropdown-menu-${task.id}`}>
                         <ThreeDotsVertical />
                       </Dropdown.Toggle>
                       <Dropdown.Menu>
@@ -498,7 +497,11 @@ function Home(): React.ReactNode {
                             </Dropdown.Item>
                           </NavLink>
                         )}
-                        <Dropdown.Item as="button" onClick={() => markAsDone(task)}>
+                        <Dropdown.Item
+                          as="button"
+                          onClick={() => markAsDone(task)}
+                          data-testid={`task-dropdown-done-item-${task.id}`}
+                        >
                           {task.done ? t('task_table_action_undone') : t('task_table_action_done')}
                         </Dropdown.Item>
                       </Dropdown.Menu>

client/src/views/Landing/index.tsx

@@ -12,7 +12,7 @@ import './styles.scss';
  * Landing page component.
  *
  * This component displays the landing page of the application,
- * providing navigation to login or register.
+ * providing navigation to log in or register.
  * It also checks for an existing user session.
  *
  * @returns {React.ReactNode} The Landing page component.

client/src/views/NoteAdd/index.tsx

@@ -122,13 +122,13 @@ function NoteAdd(): React.ReactNode {
    *
    * @param {React.FormEvent<HTMLFormElement>} event - The form submission event.
    */
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>): Promise<void> => {
+  const handleSubmit = async (event: React.SubmitEvent<HTMLFormElement>): Promise<void> => {
     event.preventDefault();
     event.stopPropagation();
     setValidated(true);
 
     const form = event.currentTarget;
-    if (form.checkValidity() === false) {
+    if (!form.checkValidity()) {
       setErrorMessage(translateServerResponse('Please fill in all the fields', i18n.language));
       return;
     }

client/src/views/Register/index.tsx

@@ -5,7 +5,7 @@ import LoginForm from '../../components/LoginForm';
  * Register page component.
  *
  * This component displays the register page of the application,
- * providing navigation to login or back to home.
+ * providing navigation to log in or back to home.
  *
  * @returns {React.ReactNode} The Register page component.
  */

client/src/views/TaskAdd/index.tsx

@@ -125,13 +125,13 @@ function TaskAdd(): React.ReactNode {
    *
    * @param {React.FormEvent<HTMLFormElement>} event - The form submission event.
    */
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>): Promise<void> => {
+  const handleSubmit = async (event: React.SubmitEvent<HTMLFormElement>): Promise<void> => {
     event.preventDefault();
     event.stopPropagation();
     setValidated(true);
 
     const form = event.currentTarget;
-    if (form.checkValidity() === false) {
+    if (!form.checkValidity()) {
       setErrorMessage(translateServerResponse('Please fill in all the fields', i18n.language));
       return;
     }

client/tsconfig.json

@@ -17,7 +17,10 @@
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
-    "moduleResolution": "node",
+    "types": [
+      "node"
+    ],
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

cloud/start-server.sh

@@ -17,5 +17,7 @@ docker run -d  --rm \
   -e POSTGRES_HOST=$POSTGRES_HOST \
   -e CORS_ALLOWED_ORIGINS=$CORS_ALLOWED_ORIGINS \
   -e SERVER_SERVLET_CONTEXT_PATH=$SERVER_SERVLET_CONTEXT_PATH \
+  -e MAILGUN_APIKEY=$MAILGUN_APIKEY \
+  -e SECURITY_KEY=$SECURITY_KEY \
   -e BUILD=ghcr.io/ricardo-campos-org/react-typescript-todolist/server:$PR \
   ghcr.io/ricardo-campos-org/react-typescript-todolist/server:$PR

mailgun-templates/email_changed.html

@@ -157,14 +157,14 @@
 				<p>If you made this change, no further action is needed.</p>
 				<p>
 				  If you did not make this change, secure your account immediately and contact
-				  <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				  <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 				</p>
 			  </td>
 			</tr>
 			<tr>
 			  <td class="footer">
 				This is an automatic message from Tasknote, please do not reply.<br />
-				Need help? Contact <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				Need help? Contact <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 			  </td>
 			</tr>
 		  </table>

mailgun-templates/password_change_confirmation.html

@@ -125,7 +125,7 @@
 				<p class="notice">
 				  If this was you, no action is required. If this was not you, secure your account
 				  right away and contact
-				  <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				  <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 				</p>
 
 				<p>Thank you for helping keep your account safe.</p>
@@ -134,7 +134,7 @@
 			<tr>
 			  <td class="footer">
 				This is an automatic message from Tasknote, please do not reply.<br />
-				Need help? Contact <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				Need help? Contact <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 			  </td>
 			</tr>
 		  </table>

mailgun-templates/password_reset.html

@@ -167,7 +167,7 @@
 			<tr>
 			  <td class="footer">
 				This is an automatic message from Tasknote, please do not reply.<br />
-				Need help? Contact <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				Need help? Contact <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 			  </td>
 			</tr>
 		  </table>

mailgun-templates/sign_up_confirmation.html

@@ -157,7 +157,7 @@
 			<tr>
 			  <td class="footer">
 				This is an automatic message from Tasknote, please do not reply.<br />
-				Need help? Contact <a class="link" href="mailto:ricardompcampos@gmail.com">ricardompcampos@gmail.com</a>.
+				Need help? Contact <a class="link" href="mailto:support@tasknote.cc">support@tasknote.cc</a>.
 			  </td>
 			</tr>
 		  </table>

server/pom.xml

@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>4.0.5</version>
+    <version>4.0.6</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
   
   <groupId>br.com.tasknoteapp</groupId>
   <artifactId>server</artifactId>
-  <version>20</version>
+  <version>26</version>
   <name>tasknote-api</name>
   <description>Java backend REST API to serve TaskNote frontend client</description>
   
@@ -53,7 +53,7 @@
     <surefire.version>3.5.5</surefire.version>
     <jacoco.version>0.8.14</jacoco.version>
     <checkstyle.version>3.6.0</checkstyle.version>
-    <springboot.version>4.0.5</springboot.version>
+    <springboot.version>4.0.6</springboot.version>
     <jjwt.version>0.12.6</jjwt.version>
   </properties>
 
@@ -100,10 +100,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-mail</artifactId>
-    </dependency>
 
     <!-- Database -->
     <dependency>
@@ -165,7 +161,7 @@
   </dependencies>
 
   <build>
-    <plugins>
+    <plugins> 
       <plugin>
         <groupId>org.hibernate.orm</groupId>
         <artifactId>hibernate-maven-plugin</artifactId>
@@ -187,7 +183,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-	<version>${failsafe.version}</version>
+        <version>${failsafe.version}</version>
         <executions>
           <execution>
             <id>integration-tests</id>
@@ -209,7 +205,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-	<version>${surefire.version}</version>
+	      <version>${surefire.version}</version>
         <configuration>
           <argLine>@{argLine} -Xmx1024m</argLine>
           <skipTests>${skip.unit.tests}</skipTests>
@@ -221,7 +217,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-	<version>${jacoco.version}</version>
+        <version>${jacoco.version}</version>
         <configuration>
           <skip>${jacoco.skip}</skip>
           <excludes>
@@ -330,7 +326,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-	<version>${checkstyle.version}</version>
+        <version>${checkstyle.version}</version>
         <dependencies>
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>

server/src/main/java/br/com/tasknoteapp/server/config/CorsConfig.java

@@ -1,6 +1,7 @@
 package br.com.tasknoteapp.server.config;
 
 import java.util.Arrays;
+import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -22,7 +23,7 @@ public class CorsConfig implements WebMvcConfigurer {
    *
    * @param registry CorsRegistry instance.
    */
-  public void addCorsMappings(CorsRegistry registry) {
+  public void addCorsMappings(@NonNull CorsRegistry registry) {
     if (allowedOrigins != null && allowedOrigins.length > 0) {
       logger.info("CORS policy allowed origins: {}", Arrays.asList(allowedOrigins));
 

server/src/main/java/br/com/tasknoteapp/server/config/SecurityConfig.java

@@ -39,10 +39,9 @@ public class SecurityConfig {
    *
    * @param http instance of HttpSecurity containing the request.
    * @return SecurityFilterChain with allowed endpoints and all configuration.
-   * @throws Exception due to bad configuration possibilities.
    */
   @Bean
-  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+  public SecurityFilterChain filterChain(HttpSecurity http) {
     http.cors(Customizer.withDefaults())
         .csrf(AbstractHttpConfigurer::disable)
         .authorizeHttpRequests(
@@ -99,11 +98,9 @@ public class SecurityConfig {
    *
    * @param config AuthenticationConfiguration instance
    * @return AuthenticationManager instance
-   * @throws Exception if issues occur.
    */
   @Bean
-  public AuthenticationManager authenticationManager(AuthenticationConfiguration config)
-      throws Exception {
+  public AuthenticationManager authenticationManager(AuthenticationConfiguration config) {
     return config.getAuthenticationManager();
   }
 }

server/src/main/java/br/com/tasknoteapp/server/controller/HealthController.java

@@ -5,7 +5,6 @@ import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
 import javax.sql.DataSource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,9 +14,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class HealthController {
 
-  @Autowired private DataSource dataSource;
+  private final DataSource dataSource;
 
-  @Autowired private AppVersionService appVersionService;
+  private final AppVersionService appVersionService;
+
+  HealthController(DataSource dataSource, AppVersionService appVersionService) {
+    this.dataSource = dataSource;
+    this.appVersionService = appVersionService;
+  }
 
   /**
    * Endpoint to check the health of the application and its database connection.

server/src/main/java/br/com/tasknoteapp/server/controller/NoteController.java

@@ -33,7 +33,7 @@ public class NoteController {
   /**
    * Get all notes.
    *
-   * @return List of NoteResponse with all found notes and its urls, if any.
+   * @return List of NoteResponse with all found notes and its URLs, if any.
    */
   @GetMapping
   public List<NoteResponse> getAllNotes() {
@@ -44,7 +44,7 @@ public class NoteController {
    * Get a note by its ID.
    *
    * @param id Note identification.
-   * @return NoteResponse with note data and its urls, if any.
+   * @return NoteResponse with note data and its URLs, if any.
    * @throws NoteNotFoundException when note not found.
    */
   @GetMapping("/{id}")
@@ -56,7 +56,7 @@ public class NoteController {
    * Patch a note.
    *
    * @param id The note id to be patched.
-   * @param noteRequest Note data to be patched, including optionally its urls.
+   * @param noteRequest Note data to be patched, including optionally its URLs.
    * @return NoteResponse containing data that was updated.
    * @throws NoteNotFoundException when note not found.
    */
@@ -70,8 +70,8 @@ public class NoteController {
   /**
    * Create a note.
    *
-   * @param noteRequest Note data to be created, including optionally its urls. Following RESTful
-   *     API pattern from https://restfulapi.net/rest-put-vs-post/.
+   * @param noteRequest Note data to be created, including optionally its URLs. Following RESTful
+   *     API pattern from <a href="https://restfulapi.net/rest-put-vs-post/">docs</a>.
    * @return NoteResponse containing data that was created.
    */
   @PostMapping

server/src/main/java/br/com/tasknoteapp/server/controller/RestExceptionController.java

@@ -4,6 +4,7 @@ import br.com.tasknoteapp.server.exception.BaseBadRequestException;
 import br.com.tasknoteapp.server.exception.BaseNotFoundException;
 import br.com.tasknoteapp.server.exception.BaseServiceUnavailableException;
 import br.com.tasknoteapp.server.exception.EmailAlreadyExistsException;
+import br.com.tasknoteapp.server.exception.EmailNotConfirmedException;
 import br.com.tasknoteapp.server.exception.InvalidCredentialsException;
 import br.com.tasknoteapp.server.exception.UserForbiddenException;
 import br.com.tasknoteapp.server.response.ValidationExceptionResponse;
@@ -47,6 +48,13 @@ public class RestExceptionController {
         .body(new ValidationExceptionResponse("access", ex.getReason()));
   }
 
+  @ExceptionHandler(EmailNotConfirmedException.class)
+  ResponseEntity<ValidationExceptionResponse> handleEmailNotConfirmedException(
+      EmailNotConfirmedException ex) {
+    return ResponseEntity.status(HttpStatus.FORBIDDEN)
+        .body(new ValidationExceptionResponse("access", ex.getReason()));
+  }
+
   /* 404 - Not Found */
   @ExceptionHandler(BaseNotFoundException.class)
   ResponseEntity<ValidationExceptionResponse> handleNotFoundException(BaseNotFoundException ex) {

server/src/main/java/br/com/tasknoteapp/server/controller/TaskController.java

@@ -32,7 +32,7 @@ public class TaskController {
   /**
    * Get all tasks.
    *
-   * @return List of TaskResponse with all found tasks and its urls, if any.
+   * @return List of TaskResponse with all found tasks and its URLs, if any.
    */
   @GetMapping
   public List<TaskResponse> getAllTasks() {
@@ -43,7 +43,7 @@ public class TaskController {
    * Get a task by its ID.
    *
    * @param id Task identification.
-   * @return TaskResponse with task data and its urls, if any.
+   * @return TaskResponse with task data and its URLs, if any.
    * @throws TaskNotFoundException when task not found.
    */
   @GetMapping("/{id}")
@@ -55,7 +55,7 @@ public class TaskController {
    * Patch a task.
    *
    * @param id The task id to be patched.
-   * @param taskRequest Task data to be patched, including optionally its urls.
+   * @param taskRequest Task data to be patched, including optionally its URLs.
    * @return TaskResponse containing data that was updated.
    * @throws TaskNotFoundException when task not found.
    */
@@ -68,8 +68,8 @@ public class TaskController {
   /**
    * Create a task.
    *
-   * @param taskRequest Task data to be created, including optionally its urls. Following RESTful
-   *     API pattern from https://restfulapi.net/rest-put-vs-post/.
+   * @param taskRequest Task data to be created, including optionally its URLs. Following RESTful
+   *     API pattern from <a href="https://restfulapi.net/rest-put-vs-post/">docs</a>.
    * @return TaskResponse containing data that was created.
    */
   @PostMapping

server/src/main/java/br/com/tasknoteapp/server/controller/UserSessionController.java

@@ -35,7 +35,7 @@ public class UserSessionController {
   /**
    * Delete all the user data and information from the server.
    *
-   * @returns {@link UserResponse} with the user information.
+   * @return {@link UserResponse} with the user information.
    */
   @DeleteMapping("/delete-account")
   public ResponseEntity<UserResponse> deleteAccount() {

server/src/main/java/br/com/tasknoteapp/server/entity/NoteEntity.java

@@ -29,7 +29,7 @@ public class NoteEntity {
   @ManyToOne(fetch = FetchType.LAZY)
   private UserEntity user;
 
-  @Column(name = "tag", nullable = true, length = 30)
+  @Column(name = "tag", length = 30)
   private String tag;
 
   @Column(name = "last_update")

server/src/main/java/br/com/tasknoteapp/server/entity/TaskEntity.java

@@ -39,7 +39,7 @@ public class TaskEntity {
   @Column(name = "high_priority")
   private Boolean highPriority;
 
-  @Column(name = "tag", nullable = true, length = 30)
+  @Column(name = "tag", length = 30)
   private String tag;
 
   public Long getId() {

server/src/main/java/br/com/tasknoteapp/server/entity/TaskUrlEntityPk.java

@@ -17,14 +17,6 @@ public class TaskUrlEntityPk {
     this.url = url;
   }
 
-  public Long getTaskId() {
-    return taskId;
-  }
-
-  public void setTaskId(Long taskId) {
-    this.taskId = taskId;
-  }
-
   public String getUrl() {
     return url;
   }

server/src/main/java/br/com/tasknoteapp/server/entity/UserEntity.java

@@ -34,30 +34,33 @@ public class UserEntity implements UserDetails {
   @Column(name = "created_at", nullable = false)
   private LocalDateTime createdAt;
 
-  @Column(name = "inactivated_at", nullable = true)
+  @Column(name = "inactivated_at")
   private LocalDateTime inactivatedAt;
 
   @Column(name = "name", length = 20)
   private String name;
 
-  @Column(name = "email_confirmed_at", nullable = true)
+  @Column(name = "email_confirmed_at")
   private LocalDateTime emailConfirmedAt;
 
-  @Column(name = "email_uuid", columnDefinition = "uuid", nullable = true, unique = true)
+  @Column(name = "email_uuid", columnDefinition = "uuid", unique = true)
   private UUID emailUuid;
 
-  @Column(name = "reset_password_expiration", nullable = true)
+  @Column(name = "reset_password_expiration")
   private LocalDateTime resetPasswordExpiration;
 
-  @Column(name = "reset_token", nullable = true, length = 35)
+  @Column(name = "reset_token", length = 35)
   private String resetToken;
 
-  @Column(name = "lang", nullable = true, length = 6)
+  @Column(name = "lang", length = 6)
   private String lang;
 
   @Column(name = "last_password_change", nullable = false)
   private LocalDateTime lastPasswordChange;
 
+  @Column(name = "last_login")
+  private LocalDateTime lastLogin;
+
   @Override
   public Collection<? extends GrantedAuthority> getAuthorities() {
     return List.of();
@@ -69,26 +72,6 @@ public class UserEntity implements UserDetails {
     return email;
   }
 
-  @Override
-  public boolean isAccountNonExpired() {
-    return true;
-  }
-
-  @Override
-  public boolean isAccountNonLocked() {
-    return true;
-  }
-
-  @Override
-  public boolean isCredentialsNonExpired() {
-    return true;
-  }
-
-  @Override
-  public boolean isEnabled() {
-    return true;
-  }
-
   public Long getId() {
     return id;
   }
@@ -193,4 +176,12 @@ public class UserEntity implements UserDetails {
   public void setLastPasswordChange(LocalDateTime lastPasswordChange) {
     this.lastPasswordChange = lastPasswordChange;
   }
+
+  public LocalDateTime getLastLogin() {
+    return lastLogin;
+  }
+
+  public void setLastLogin(LocalDateTime lastLogin) {
+    this.lastLogin = lastLogin;
+  }
 }

server/src/main/java/br/com/tasknoteapp/server/exception/EmailNotConfirmedException.java

@@ -0,0 +1,14 @@
+package br.com.tasknoteapp.server.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.server.ResponseStatusException;
+
+/** This class represents an Email Not Confirmed exception. */
+@ResponseStatus(code = HttpStatus.FORBIDDEN)
+public class EmailNotConfirmedException extends ResponseStatusException {
+  
+  public EmailNotConfirmedException() {
+    super(HttpStatus.FORBIDDEN, "Email not confirmed!");
+  }
+}

server/src/main/java/br/com/tasknoteapp/server/exception/MailServiceException.java

@@ -1,9 +0,0 @@
-package br.com.tasknoteapp.server.exception;
-
-/** This exception represents an error when sending email messages. */
-public class MailServiceException extends BaseServiceUnavailableException {
-
-  public MailServiceException(String error) {
-    super("mail", error);
-  }
-}

server/src/main/java/br/com/tasknoteapp/server/filter/HeaderVersionFilter.java

@@ -6,7 +6,7 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jspecify.annotations.NonNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -14,11 +14,15 @@ import org.springframework.web.filter.OncePerRequestFilter;
 @Component
 public class HeaderVersionFilter extends OncePerRequestFilter {
 
-  @Autowired private AppVersionService appVersionService;
+  private final AppVersionService appVersionService;
+
+  HeaderVersionFilter(AppVersionService appVersionService) {
+    this.appVersionService = appVersionService;
+  }
 
   @Override
   protected void doFilterInternal(
-      HttpServletRequest request,
+      @NonNull HttpServletRequest request,
       HttpServletResponse response,
       FilterChain filterChain)
       throws ServletException, IOException {

server/src/main/java/br/com/tasknoteapp/server/filter/JwtAuthenticationFilter.java

@@ -8,7 +8,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Objects;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jspecify.annotations.NonNull;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -21,15 +21,20 @@ import org.springframework.web.filter.OncePerRequestFilter;
 @Component
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
-  @Autowired private UserService userService;
+  private final UserService userService;
 
-  @Autowired private JwtService jwtService;
+  private final JwtService jwtService;
+
+  JwtAuthenticationFilter(UserService userService,  JwtService jwtService) {
+    this.userService = userService;
+    this.jwtService = jwtService;
+  }
 
   @Override
   protected void doFilterInternal(
       HttpServletRequest request,
-      HttpServletResponse response,
-      FilterChain filterChain)
+      @NonNull HttpServletResponse response,
+      @NonNull FilterChain filterChain)
       throws ServletException, IOException {
     final String authorizationHeader = request.getHeader("Authorization");
 

server/src/main/java/br/com/tasknoteapp/server/hint/HttpServletRequestRuntimeHint.java

@@ -1,6 +1,7 @@
 package br.com.tasknoteapp.server.hint;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.jspecify.annotations.NonNull;
 import org.springframework.aot.hint.ProxyHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -9,7 +10,7 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar;
 public class HttpServletRequestRuntimeHint implements RuntimeHintsRegistrar {
 
   @Override
-  public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+  public void registerHints(@NonNull RuntimeHints hints, ClassLoader classLoader) {
     try {
       ProxyHints proxies = hints.proxies();
       proxies.registerJdkProxy(HttpServletRequest.class);

server/src/main/java/br/com/tasknoteapp/server/repository/UserPwdLimitRepository.java

@@ -2,7 +2,6 @@ package br.com.tasknoteapp.server.repository;
 
 import br.com.tasknoteapp.server.entity.UserPwdLimitEntity;
 import java.util.List;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -10,8 +9,6 @@ import org.springframework.data.jpa.repository.Query;
 /** This interface represents a user password limit repository, for database access. */
 public interface UserPwdLimitRepository extends JpaRepository<UserPwdLimitEntity, Long> {
 
-  List<UserPwdLimitEntity> findAllByUser_id(Long userId, Sort sort);
-
   List<UserPwdLimitEntity> findTop3ByUser_idOrderByWhenHappenedDesc(Long userId);
 
   @Modifying

server/src/main/java/br/com/tasknoteapp/server/request/LoginRequest.java

@@ -10,11 +10,9 @@ public class LoginRequest {
 
   @NotNull private String password;
 
-  private String passwordAgain;
+  private final String passwordAgain;
 
-  private String lang;
-
-  public LoginRequest() {}
+  private final String lang;
 
   /**
    * Constructs a LoginRequest with the specified email and password.
@@ -51,18 +49,10 @@ public class LoginRequest {
     return passwordAgain;
   }
 
-  public void setPasswordAgain(String passwordAgain) {
-    this.passwordAgain = passwordAgain;
-  }
-
   public String lang() {
     return lang;
   }
 
-  public void setLang(String lang) {
-    this.lang = lang;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

server/src/main/java/br/com/tasknoteapp/server/request/NotePatchRequest.java

@@ -8,6 +8,6 @@ public record NotePatchRequest(
     String description,
     @Pattern(
             regexp = "^(https?://.*|#.*)?$",
-            message = "URL must start with http://, https:// or #")
+            message = "URL must start with https:// or #")
         String url,
     String tag) {}

server/src/main/java/br/com/tasknoteapp/server/request/NoteRequest.java

@@ -9,6 +9,6 @@ public record NoteRequest(
     @NotNull String description,
     @Pattern(
             regexp = "^(https?://.*|#.*)?$",
-            message = "URL must start with http://, https:// or #")
+            message = "URL must start with https:// or #")
         String url,
     String tag) {}

server/src/main/java/br/com/tasknoteapp/server/request/NoteUrlPatchRequest.java

@@ -1,4 +0,0 @@
-package br.com.tasknoteapp.server.request;
-
-/** This record represents a Note Url payload to be patched. */
-public record NoteUrlPatchRequest(Long id, String url) {}

server/src/main/java/br/com/tasknoteapp/server/request/ResendConfirmationRequest.java

@@ -8,12 +8,6 @@ import jakarta.validation.constraints.NotNull;
 public class ResendConfirmationRequest {
   @Email @NotNull private String email;
 
-  public ResendConfirmationRequest() {}
-
-  public ResendConfirmationRequest(String email) {
-    this.email = email;
-  }
-
   public String email() {
     return email.trim().toLowerCase();
   }

server/src/main/java/br/com/tasknoteapp/server/request/TaskPatchRequest.java

@@ -10,7 +10,7 @@ public record TaskPatchRequest(
     List<
             @Pattern(
                 regexp = "^(https?://.*|#.*)?$",
-                message = "URL must start with http://, https:// or #")
+                message = "URL must start with https:// or #")
             String>
         urls,
     String dueDate,

server/src/main/java/br/com/tasknoteapp/server/request/TaskRequest.java

@@ -11,7 +11,7 @@ public record TaskRequest(
     List<
             @Pattern(
                 regexp = "^(https?://.*|#.*)?$",
-                message = "URL must start with http://, https:// or #")
+                message = "URL must start with https:// or #")
             String>
         urls,
     String dueDate,

server/src/main/java/br/com/tasknoteapp/server/request/TaskUrlPatchRequest.java

@@ -1,4 +0,0 @@
-package br.com.tasknoteapp.server.request;
-
-/** This record represents a Task Url payload to be patched. */
-public record TaskUrlPatchRequest(Long id, String url) {}

server/src/main/java/br/com/tasknoteapp/server/response/NoteResponse.java

@@ -3,16 +3,16 @@ package br.com.tasknoteapp.server.response;
 import br.com.tasknoteapp.server.entity.NoteEntity;
 import br.com.tasknoteapp.server.util.TimeAgoUtil;
 
-/** This record represents a task and its urls object to be returned. */
+/** This record represents a task and its URLs object to be returned. */
 public record NoteResponse(
     Long id, String title, String description, String url, String lastUpdate, String tag,
     boolean shared, String shareToken) {
 
   /**
-   * Creates a NoteResponse given a NoteEntity and its Urls.
+   * Creates a NoteResponse given a NoteEntity and its Urals.
    *
    * @param entity The NoteEntity source data.
-   * @return NoteResponse instance with all note data and urls, if any.
+   * @return NoteResponse instance with all note data and URLs, if any.
    */
   public static NoteResponse fromEntity(NoteEntity entity, String url) {
     String timeAgoFmt = TimeAgoUtil.format(entity.getLastUpdate());

server/src/main/java/br/com/tasknoteapp/server/response/TaskResponse.java

@@ -18,10 +18,10 @@ public record TaskResponse(
     List<String> urls) {
 
   /**
-   * Creates a TaskResponse given a TaskEntity and its Urls.
+   * Creates a TaskResponse given a TaskEntity and its URLs.
    *
    * @param entity The TaskEntity source data.
-   * @return TaskResponse instance with all task data and urls, if any.
+   * @return TaskResponse instance with all task data and URLs, if any.
    */
   public static TaskResponse fromEntity(TaskEntity entity, List<String> urls) {
     String timeAgoFmt = TimeAgoUtil.format(entity.getLastUpdate());

server/src/main/java/br/com/tasknoteapp/server/response/UserResponse.java

@@ -2,7 +2,6 @@ package br.com.tasknoteapp.server.response;
 
 import br.com.tasknoteapp.server.entity.UserEntity;
 import java.time.LocalDateTime;
-import java.util.Optional;
 
 /** This record represents a User Response object. */
 public record UserResponse(
@@ -12,6 +11,7 @@ public record UserResponse(
     Boolean admin,
     LocalDateTime createdAt,
     LocalDateTime inactivatedAt,
+    LocalDateTime lastLogin,
     String gravatarImageUrl) {
 
   /**
@@ -20,7 +20,7 @@ public record UserResponse(
    * @param user The user entity instance with user info to be used as source.
    * @return UserResponse instance.
    */
-  public static UserResponse fromEntity(UserEntity user, Optional<String> gravatarUrl) {
+  public static UserResponse fromEntity(UserEntity user, String gravatarUrl) {
     return new UserResponse(
         user.getId(),
         user.getName(),
@@ -28,6 +28,7 @@ public record UserResponse(
         user.getAdmin(),
         user.getCreatedAt(),
         user.getInactivatedAt(),
-        gravatarUrl.orElse(null));
+        user.getLastLogin(),
+        gravatarUrl);
   }
 }

server/src/main/java/br/com/tasknoteapp/server/response/UserResponseWithToken.java

@@ -2,7 +2,6 @@ package br.com.tasknoteapp.server.response;
 
 import br.com.tasknoteapp.server.entity.UserEntity;
 import java.time.LocalDateTime;
-import java.util.Optional;
 
 /** This record represents a User Response object. */
 public record UserResponseWithToken(
@@ -12,6 +11,7 @@ public record UserResponseWithToken(
     Boolean admin,
     LocalDateTime createdAt,
     LocalDateTime inactivatedAt,
+    LocalDateTime lastLogin,
     String gravatarImageUrl,
     String token,
     String lang) {
@@ -24,7 +24,7 @@ public record UserResponseWithToken(
    * @return UserResponse instance.
    */
   public static UserResponseWithToken fromEntity(
-      UserEntity user, String token, Optional<String> gravatarUrl) {
+      UserEntity user, String token, String gravatarUrl) {
     return new UserResponseWithToken(
         user.getId(),
         user.getName(),
@@ -32,7 +32,8 @@ public record UserResponseWithToken(
         user.getAdmin(),
         user.getCreatedAt(),
         user.getInactivatedAt(),
-        gravatarUrl.orElse(null),
+        user.getLastLogin(),
+        gravatarUrl,
         token,
         user.getLang());
   }

server/src/main/java/br/com/tasknoteapp/server/response/ValidationExceptionResponse.java

@@ -30,10 +30,21 @@ public class ValidationExceptionResponse {
     this.errorMessage = String.format(MESSAGE_TEMPLATE, fields.size());
   }
 
+  /**
+   * Method used by Spring internals to build the final JSON response.
+   *
+   * @return String describing the error message
+   */
   public String getErrorMessage() {
     return errorMessage;
   }
 
+  /**
+   * Method used by Spring internals to build the final JSON response with failed fields.
+   *
+   * @return List of FieldIssueResponse containing the field name and the error message related to
+   *     it
+   */
   public List<FieldIssueResponse> getFields() {
     return fields;
   }

server/src/main/java/br/com/tasknoteapp/server/service/AuthService.java

@@ -6,6 +6,7 @@ import br.com.tasknoteapp.server.exception.BadLanguageException;
 import br.com.tasknoteapp.server.exception.BadPasswordException;
 import br.com.tasknoteapp.server.exception.BadUuidException;
 import br.com.tasknoteapp.server.exception.EmailAlreadyExistsException;
+import br.com.tasknoteapp.server.exception.EmailNotConfirmedException;
 import br.com.tasknoteapp.server.exception.InvalidCredentialsException;
 import br.com.tasknoteapp.server.exception.MaxLoginLimitAttemptException;
 import br.com.tasknoteapp.server.exception.ResetExpiredException;
@@ -19,6 +20,7 @@ import br.com.tasknoteapp.server.request.UserPatchRequest;
 import br.com.tasknoteapp.server.response.UserResponse;
 import br.com.tasknoteapp.server.response.UserResponseWithToken;
 import br.com.tasknoteapp.server.util.AuthUtil;
+import br.com.tasknoteapp.server.util.SecurityUtil;
 import br.com.tasknoteapp.server.util.TokenUtil;
 import br.com.tasknoteapp.server.util.UuidUtil;
 import jakarta.transaction.Transactional;
@@ -27,6 +29,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,7 +108,7 @@ public class AuthService {
    */
   @Transactional
   public UserResponseWithToken signUpNewUser(LoginRequest newUser) {
-    logger.info("Signing up new user: {}", newUser.email());
+    logger.info("Signing up new user: {}", SecurityUtil.redactEmail(newUser.email()));
 
     if (findByEmail(newUser.email()).isPresent()) {
       throw new EmailAlreadyExistsException();
@@ -142,8 +145,9 @@ public class AuthService {
       mailgunEmailService.sendNewUser(user);
     }
 
-    logger.info("User created! ID " + user.getId());
-    return UserResponseWithToken.fromEntity(user, null, getGravatarImageUrl(newUser.email()));
+    logger.info("User created! ID {}", user.getId());
+    return UserResponseWithToken.fromEntity(
+        user, null, getGravatarImageUrl(newUser.email()).orElse(null));
   }
 
   /**
@@ -179,7 +183,7 @@ public class AuthService {
    */
   @Transactional
   public UserResponseWithToken signInUser(LoginRequest login) {
-    logger.info("Signing in user: " + login.email());
+    logger.info("Signing in user: {}", SecurityUtil.redactEmail(login.email()));
 
     Optional<UserEntity> userOptional = findByEmail(login.email());
     if (userOptional.isEmpty()) {
@@ -189,6 +193,12 @@ public class AuthService {
     checkLoginAttemptLimit(userOptional.get().getId());
 
     UserEntity user = userOptional.get();
+
+    if (Objects.isNull(user.getEmailConfirmedAt())) {
+      logger.warn("User {} tried to login but email is not confirmed", user.getId());
+      throw new EmailNotConfirmedException();
+    }
+
     user.setResetToken(null);
     user.setResetPasswordExpiration(null);
 
@@ -198,11 +208,25 @@ public class AuthService {
 
       String token = jwtService.generateToken(user);
 
-      logger.info("User authenticated! Token " + token);
+      logger.info("User authenticated! Token {}", token.substring(0, 6) + "...");
 
+      final LocalDateTime previousLastLogin = user.getLastLogin();
+
+      user.setLastLogin(LocalDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.SECONDS));
       userPwdLimitRepository.deleteAllForUser(user.getId());
       userRepository.save(user);
-      return UserResponseWithToken.fromEntity(user, token, getGravatarImageUrl(login.email()));
+
+      return new UserResponseWithToken(
+          user.getId(),
+          user.getName(),
+          user.getEmail(),
+          user.getAdmin(),
+          user.getCreatedAt(),
+          user.getInactivatedAt(),
+          previousLastLogin,
+          getGravatarImageUrl(login.email()).orElse(null),
+          token,
+          user.getLang());
     } catch (BadCredentialsException e) {
       logger.error(
           "BadCredentialsException when logging in user {}: {}", user.getId(), e.getMessage());
@@ -246,7 +270,9 @@ public class AuthService {
     List<UserEntity> users = userRepository.findAll();
     List<UserResponse> usersResponse = new ArrayList<>(users.size());
     users.forEach(
-        u -> usersResponse.add(UserResponse.fromEntity(u, getGravatarImageUrl(u.getEmail()))));
+        u ->
+            usersResponse.add(
+                UserResponse.fromEntity(u, getGravatarImageUrl(u.getEmail()).orElse(null))));
     logger.info("{} user(s) found!", usersResponse.size());
 
     return usersResponse;
@@ -286,7 +312,7 @@ public class AuthService {
     userPwdLimitRepository.deleteAllForUser(currentUser.getId());
     userRepository.delete(currentUser);
 
-    return UserResponse.fromEntity(currentUser, getGravatarImageUrl(email));
+    return UserResponse.fromEntity(currentUser, getGravatarImageUrl(email).orElse(null));
   }
 
   /**
@@ -338,17 +364,18 @@ public class AuthService {
       shouldUpdate = true;
     }
 
-    if (shouldUpdate && currentUser != null) {
+    if (shouldUpdate) {
       userRepository.save(currentUser);
     }
 
     if (emailChanged && hasValidMailgunApiKey()) {
       // send email to older and new account
-      logger.info("Email changed from " + email + " to " + patchRequest.email());
+      logger.info(
+          "Email changed from {} to {}", email, SecurityUtil.redactEmail(patchRequest.email()));
       mailgunEmailService.sendEmailChangedNotification(currentUser, email);
     }
 
-    return UserResponse.fromEntity(currentUser, getGravatarImageUrl(email));
+    return UserResponse.fromEntity(currentUser, getGravatarImageUrl(email).orElse(null));
   }
 
   /**
@@ -375,7 +402,7 @@ public class AuthService {
   @Transactional
   public void confirmUserAccount(String identification) {
     logger.info("Confirming user email account");
-    UUID uuid = null;
+    UUID uuid;
 
     try {
       uuid = UUID.fromString(identification);
@@ -392,11 +419,11 @@ public class AuthService {
     user.setEmailConfirmedAt(LocalDateTime.now());
 
     userRepository.save(user);
-    logger.info("User email address confirmed: " + identification);
+    logger.info("User email address confirmed: {}", identification);
   }
 
   /**
-   * Re-send the confirm email to the user.
+   * Re-send the confirmation email to the user.
    *
    * @param email The email to re-send.
    */
@@ -424,11 +451,11 @@ public class AuthService {
    */
   @Transactional
   public void resetPasswordForUser(String email) {
-    logger.info("Requesting password reset for email " + email);
+    logger.info("Requesting password reset for email {}", email);
 
     Optional<UserEntity> userOptional = userRepository.findByEmail(email);
     if (userOptional.isEmpty()) {
-      logger.info("No user found with this email " + email);
+      logger.info("No user found with email {}", email);
       return;
     }
 
@@ -454,7 +481,7 @@ public class AuthService {
    */
   @Transactional
   public void confirmResetPasswordForUser(PasswordResetRequest request) {
-    logger.info("Saving new password for token " + request.token());
+    logger.info("Saving new password for token {}", request.token());
 
     Optional<UserEntity> userOptional = userRepository.findByResetToken(request.token());
     if (userOptional.isEmpty()) {
@@ -488,12 +515,12 @@ public class AuthService {
       mailgunEmailService.sendPasswordResetConfirmation(user);
     }
 
-    logger.info("New password set for token " + request.token());
+    logger.info("New password set for token {}", request.token());
   }
 
   private Optional<String> getGravatarImageUrl(String email) {
     email = email.toLowerCase().trim();
-    logger.info("Current user email: " + email);
+    logger.info("Current user email: {}", SecurityUtil.redactEmail(email));
 
     try {
       MessageDigest digest = MessageDigest.getInstance("SHA-256");
@@ -525,7 +552,7 @@ public class AuthService {
 
     // if it's more than 3 times in the last 10 minutes, raise timer of 3 hours.
     if (userPwdList.size() >= 3) {
-      UserPwdLimitEntity mostRecent = userPwdList.get(0);
+      UserPwdLimitEntity mostRecent = userPwdList.getFirst();
       logger.warn("Oldest: {}", mostRecent.getWhenHappened());
       Duration duration = Duration.between(mostRecent.getWhenHappened(), LocalDateTime.now());
       if (duration.toMinutes() <= 3L) {
@@ -540,4 +567,5 @@ public class AuthService {
     return Optional.ofNullable(apiKey).isPresent()
         && !"invalid-api-key-only-placeholder".equals(apiKey);
   }
+
 }

server/src/main/java/br/com/tasknoteapp/server/service/JwtService.java

@@ -8,15 +8,15 @@ import org.springframework.security.core.userdetails.UserDetails;
 /** This interface contains methods for handling user JWT tokens. */
 public interface JwtService {
 
-  public String getEmailFromToken(String token);
+  String getEmailFromToken(String token);
 
-  public LocalDateTime extractExpiration(String token);
+  LocalDateTime extractExpiration(String token);
 
-  public String generateToken(UserEntity user);
+  String generateToken(UserEntity user);
 
-  public String createToken(Map<String, Object> claims, String email);
+  String createToken(Map<String, Object> claims, String email);
 
-  public boolean isTokenExpired(String token);
+  boolean isTokenExpired(String token);
 
-  public boolean validateTokenAndUser(String token, UserDetails user);
+  boolean validateTokenAndUser(String token, UserDetails user);
 }

server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java

@@ -1,39 +1,32 @@
 package br.com.tasknoteapp.server.service;
 
 import br.com.tasknoteapp.server.entity.UserEntity;
-import br.com.tasknoteapp.server.exception.MailServiceException;
 import br.com.tasknoteapp.server.templates.MailgunTemplate;
 import br.com.tasknoteapp.server.templates.MailgunTemplateEmailChanged;
 import br.com.tasknoteapp.server.templates.MailgunTemplateResetPwd;
 import br.com.tasknoteapp.server.templates.MailgunTemplateResetPwdConfirm;
 import br.com.tasknoteapp.server.templates.MailgunTemplateSignUp;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Base64;
 import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.restclient.RestTemplateBuilder;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.client.RestClient;
 
 /** This service handles email messages for Mailgun. */
 @Service
 public class MailgunEmailService {
 
   private static final Logger logger = LoggerFactory.getLogger(MailgunEmailService.class.getName());
-  private final RestTemplate restTemplate;
+  private final RestClient restClient;
   private final String targetEnv;
   private final String domain;
-  private String senderEmail;
+  private final String senderEmail;
 
   /**
    * Creates an instance of the Mail service class.
@@ -42,22 +35,38 @@ public class MailgunEmailService {
    * @param domain The domain to send email from.
    * @param sender The from option.
    * @param targetEnv The environment.
-   * @param templateBuilder The template builder.
+   * @param restClientBuilder The rest client builder.
    */
   public MailgunEmailService(
       @Value("${mailgun.api-key}") String apiKey,
       @Value("${mailgun.domain}") String domain,
       @Value("${mailgun.sender-email}") String sender,
       @Value("${br.com.tasknote.server.target-env}") String targetEnv,
-      RestTemplateBuilder templateBuilder) {
+      RestClient.Builder restClientBuilder) {
     this.domain = domain;
     this.senderEmail = sender;
     this.targetEnv = targetEnv;
-    this.restTemplate =
-        templateBuilder
-            .connectTimeout(Duration.ofSeconds(5))
-            .readTimeout(Duration.ofSeconds(10))
-            .defaultHeader(HttpHeaders.AUTHORIZATION, basicAuth("api", apiKey))
+
+    if (apiKey != null && apiKey.length() > 6) {
+      logger.info(
+          "Mailgun API Key loaded: {}...{}",
+          apiKey.substring(0, 3),
+          apiKey.substring(apiKey.length() - 3));
+    } else {
+      logger.warn("Mailgun API Key is missing or too short!");
+    }
+
+    this.restClient =
+        restClientBuilder
+            .baseUrl("https://api.mailgun.net/v3/" + domain)
+            .defaultStatusHandler(
+                HttpStatusCode::isError,
+                (request, response) ->
+                    logger.error(
+                        "Mailgun API Error: {} {}",
+                        response.getStatusCode(),
+                        response.getStatusText()))
+            .defaultHeaders(headers -> headers.setBasicAuth("api", apiKey))
             .build();
   }
 
@@ -141,16 +150,11 @@ public class MailgunEmailService {
    *
    * @param to The target email address.
    * @param subject The message subject.
-   * @param textBody The message text body to be displayed.
-   * @param htmlBody The message html body to be rendered.
+   * @param template The Mailgun template.
    */
   private void sendEmail(String to, String subject, MailgunTemplate template) {
-    String url = "https://api.mailgun.net/v3/" + domain + "/messages";
     String from = "TaskNote App <" + senderEmail + ">";
 
-    HttpHeaders headers = new HttpHeaders();
-    headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
     MultiValueMap<String, String> mailData = new LinkedMultiValueMap<>();
     mailData.add("from", from);
     mailData.add("to", to);
@@ -164,26 +168,23 @@ public class MailgunEmailService {
       logger.info("JSON template variables: {}", template.getVariableValuesJson());
     }
 
-    HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(mailData, headers);
-
     try {
-      ResponseEntity<String> response = restTemplate.postForEntity(url, request, String.class);
-
-      if (!response.getStatusCode().is2xxSuccessful()) {
-        throw new MailServiceException("Failed to send email: " + response.getStatusCode());
-      }
+      restClient
+          .post()
+          .uri("/messages")
+          .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+          .body(mailData)
+          .retrieve()
+          .toBodilessEntity();
 
       logger.info("Email message send successfully.");
     } catch (HttpClientErrorException ex) {
-      logger.error("Unable to send email: {} - {}", ex.getMessage(), ex.getCause());
+      logger.error("Unable to send email: {} - {}", ex.getMessage(), ex.getStatusCode());
+    } catch (Exception ex) {
+      logger.error("Unexpected error sending email: {}", ex.getMessage());
     }
   }
 
-  private String basicAuth(String username, String password) {
-    String auth = username + ":" + password;
-    return "Basic " + Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
-  }
-
   private String getBaseUrl() {
     if ("development".equals(targetEnv) || Objects.isNull(targetEnv)) {
       return "http://localhost:5000";

server/src/main/java/br/com/tasknoteapp/server/service/NoteService.java

@@ -63,10 +63,10 @@ public class NoteService {
   public List<NoteResponse> getAllNotes() {
     UserEntity user = getCurrentUser();
 
-    logger.info("Get all notes to user " + user.getId());
+    logger.info("Get all notes to user ID {}", user.getId());
 
     List<NoteEntity> notes = noteRepository.findAllByUser_id(user.getId());
-    logger.info(notes.size() + " notes found!");
+    logger.info("{} notes found!", notes.size());
 
     return getNotesUrl(notes);
   }
@@ -79,7 +79,7 @@ public class NoteService {
    */
   public NoteResponse getNoteById(Long noteId) {
     UserEntity user = getCurrentUser();
-    logger.info("Get note " + noteId + " to user " + user.getId());
+    logger.info("Get note ID {} to user ID {}", noteId, user.getId());
 
     Optional<NoteEntity> note = noteRepository.findById(noteId);
     if (note.isEmpty()) {
@@ -90,7 +90,7 @@ public class NoteService {
       throw new NoteNotFoundException();
     }
 
-    logger.info("Note found! Id " + noteId);
+    logger.info("Note found! ID {}", noteId);
     return NoteResponse.fromEntity(note.get(), getNoteUrl(noteId));
   }
 
@@ -103,7 +103,7 @@ public class NoteService {
   public NoteResponse createNote(NoteRequest noteRequest) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Creating note to user " + user.getId());
+    logger.info("Creating note to user ID {}", user.getId());
 
     NoteEntity note = new NoteEntity();
     note.setTitle(noteRequest.title());
@@ -113,7 +113,7 @@ public class NoteService {
     note.setUser(user);
     NoteEntity created = noteRepository.save(note);
 
-    logger.info("Note created! Id " + created.getId());
+    logger.info("Note created! ID {}", created.getId());
 
     String savedUrl = null;
     if (!Objects.isNull(noteRequest.url()) && !noteRequest.url().isEmpty()) {
@@ -136,7 +136,7 @@ public class NoteService {
   public NoteResponse patchNote(Long noteId, NotePatchRequest patch) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Patching task " + noteId + " to user " + user.getId());
+    logger.info("Patching task ID {} to user ID {}", noteId, user.getId());
 
     Optional<NoteEntity> note = noteRepository.findByIdAndUser_id(noteId, user.getId());
     if (note.isEmpty()) {
@@ -157,18 +157,18 @@ public class NoteService {
 
     noteUrlRepository.deleteByNote_id(noteId);
     noteUrlRepository.flush();
-    logger.info("URL deleted from task " + noteId);
+    logger.info("URL deleted from note ID {} during patch", noteId);
 
     if (!Objects.isNull(patch.url()) && !patch.url().isBlank()) {
       saveUrl(noteEntity, patch.url());
     } else {
-      logger.info("No urls to patch for task " + noteId);
+      logger.info("No URLs to patch for note ID {}", noteId);
     }
 
     NoteEntity patchedNote = noteRepository.save(noteEntity);
     noteRepository.flush();
 
-    logger.info("Note patched! Id " + patchedNote.getId());
+    logger.info("Note patched! ID {}", patchedNote.getId());
 
     return NoteResponse.fromEntity(patchedNote, getNoteUrl(patchedNote.getId()));
   }
@@ -182,7 +182,7 @@ public class NoteService {
   public void deleteNote(Long noteId) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Deleting note " + noteId + " to user " + user.getId());
+    logger.info("Deleting note ID {} to user ID {}", noteId, user.getId());
 
     Optional<NoteEntity> note = noteRepository.findByIdAndUser_id(noteId, user.getId());
     if (note.isEmpty()) {
@@ -192,11 +192,11 @@ public class NoteService {
     NoteEntity noteEntity = note.get();
 
     noteUrlRepository.deleteByNote_id(noteId);
-    logger.info("URL deleted from task " + noteId);
+    logger.info("URL deleted from note ID {}", noteId);
 
     noteRepository.delete(noteEntity);
 
-    logger.info("Note deleted! Id " + noteId);
+    logger.info("Note deleted! ID {}", noteId);
   }
 
   /**
@@ -208,11 +208,11 @@ public class NoteService {
   public List<NoteResponse> searchNotes(String searchTerm) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Searching notes to user " + user.getId());
+    logger.info("Searching notes for user ID {}", user.getId());
 
     List<NoteEntity> notes =
         noteRepository.findAllBySearchTerm(searchTerm.toUpperCase(), user.getId());
-    logger.info(notes.size() + " tasks found!");
+    logger.info("{} tasks found!", notes.size());
     return getNotesUrl(notes);
   }
 
@@ -225,7 +225,7 @@ public class NoteService {
   @Transactional
   public NoteResponse shareNote(Long noteId) {
     UserEntity user = getCurrentUser();
-    logger.info("Sharing note " + noteId + " for user " + user.getId());
+    logger.info("Sharing note ID {} for user ID {}", noteId, user.getId());
 
     Optional<NoteEntity> noteOpt = noteRepository.findByIdAndUser_id(noteId, user.getId());
     if (noteOpt.isEmpty()) {
@@ -238,7 +238,7 @@ public class NoteService {
       noteEntity.setShared(true);
       noteEntity.setShareToken(UUID.randomUUID().toString());
       noteRepository.save(noteEntity);
-      logger.info("Note " + noteId + " shared with token " + noteEntity.getShareToken());
+      logger.info("Note ID {} shared with token {}", noteId, noteEntity.getShareToken());
     }
 
     return NoteResponse.fromEntity(noteEntity, getNoteUrl(noteEntity.getId()));
@@ -252,7 +252,7 @@ public class NoteService {
    */
   public NoteResponse unshareNote(Long noteId) {
     UserEntity user = getCurrentUser();
-    logger.info("Unsharing note " + noteId + " for user " + user.getId());
+    logger.info("Unsharing note ID {} for user ID {}", noteId, user.getId());
 
     Optional<NoteEntity> noteOpt = noteRepository.findByIdAndUser_id(noteId, user.getId());
     if (noteOpt.isEmpty()) {
@@ -263,7 +263,7 @@ public class NoteService {
     noteEntity.setShared(false);
     noteEntity.setShareToken(null);
     noteRepository.save(noteEntity);
-    logger.info("Note " + noteId + " unshared.");
+    logger.info("Note ID {} unshared", noteId);
 
     return NoteResponse.fromEntity(noteEntity, getNoteUrl(noteEntity.getId()));
   }
@@ -275,7 +275,7 @@ public class NoteService {
    * @return {@link NoteResponse} containing the shared note.
    */
   public NoteResponse getSharedNote(String shareToken) {
-    logger.info("Fetching shared note with token " + shareToken);
+    logger.info("Fetching shared note with token {}", shareToken);
 
     Optional<NoteEntity> noteOpt = noteRepository.findByShareToken(shareToken);
     if (noteOpt.isEmpty() || !noteOpt.get().isShared()) {
@@ -313,7 +313,7 @@ public class NoteService {
     noteUrl.setNote(noteEntity);
 
     NoteUrlEntity savedUrl = noteUrlRepository.save(noteUrl);
-    logger.info("URL saved to note " + noteEntity.getId());
+    logger.info("URL saved to note ID {}", noteEntity.getId());
 
     return savedUrl;
   }

server/src/main/java/br/com/tasknoteapp/server/service/TaskService.java

@@ -63,10 +63,10 @@ public class TaskService {
    */
   public List<TaskResponse> getAllTasks() {
     UserEntity user = getCurrentUser();
-    logger.info("Get all tasks to user " + user.getId());
+    logger.info("Get all tasks to user ID {}", user.getId());
 
     List<TaskEntity> tasks = taskRepository.findAllByUser_id(user.getId());
-    logger.info(tasks.size() + " tasks found!");
+    logger.info("{} tasks found in getAllTasks!", tasks.size());
 
     return tasks.stream()
         .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
@@ -81,14 +81,14 @@ public class TaskService {
    */
   public TaskResponse getTaskById(Long taskId) {
     UserEntity user = getCurrentUser();
-    logger.info("Get task " + taskId + " to user " + user.getId());
+    logger.info("Get task ID {} to user ID {}", taskId, user.getId());
 
     Optional<TaskEntity> task = taskRepository.findById(taskId);
     if (task.isEmpty()) {
       throw new TaskNotFoundException();
     }
 
-    logger.info("Task found! Id " + taskId);
+    logger.info("Task found! ID {}", taskId);
     return TaskResponse.fromEntity(task.get(), getAllTasksUrls(taskId));
   }
 
@@ -100,7 +100,7 @@ public class TaskService {
   public TaskResponse createTask(TaskRequest taskRequest) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Creating task to user " + user.getId());
+    logger.info("Creating task to user ID {}", user.getId());
 
     TaskEntity task = new TaskEntity();
     task.setDescription(taskRequest.description());
@@ -118,7 +118,7 @@ public class TaskService {
       saveUrls(task, taskRequest.urls());
     }
 
-    logger.info("Task created! Id " + created.getId());
+    logger.info("Task created! ID {}", created.getId());
     return TaskResponse.fromEntity(created, getAllTasksUrls(created.getId()));
   }
 
@@ -133,7 +133,7 @@ public class TaskService {
   public TaskResponse patchTask(Long taskId, TaskPatchRequest patch) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Patching task " + taskId + " to user " + user.getId());
+    logger.info("Patching task ID {} to user ID {}", taskId, user.getId());
 
     Optional<TaskEntity> task = taskRepository.findById(taskId);
     if (task.isEmpty()) {
@@ -165,7 +165,7 @@ public class TaskService {
 
     TaskEntity patchedTask = taskRepository.save(taskEntity);
 
-    logger.info("Task patched! Id " + patchedTask.getId());
+    logger.info("Task patched! ID {}", patchedTask.getId());
 
     return TaskResponse.fromEntity(patchedTask, getAllTasksUrls(taskId));
   }
@@ -179,7 +179,7 @@ public class TaskService {
   public void deleteTask(Long taskId) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Deleting task " + taskId + " to user " + user.getId());
+    logger.info("Deleting task ID {} to user ID {}", taskId, user.getId());
 
     Optional<TaskEntity> task = taskRepository.findById(taskId);
     if (task.isEmpty()) {
@@ -191,14 +191,14 @@ public class TaskService {
     List<TaskUrlEntity> urlsToDelete = taskUrlRepository.findAllById_taskId(taskEntity.getId());
     if (!urlsToDelete.isEmpty()) {
       taskUrlRepository.deleteAllById_taskId(taskId);
-      logger.info("Deleted " + urlsToDelete.size() + " urls from task " + taskId);
+      logger.info("Deleted {} URLs from task ID {} in deleteTask", urlsToDelete.size(), taskId);
     } else {
-      logger.info("No urls to delete for task " + taskId);
+      logger.info("No URLs to delete for task ID {} in deleteTask", taskId);
     }
 
     taskRepository.delete(taskEntity);
 
-    logger.info("Task deleted! Id " + taskId);
+    logger.info("Task deleted! ID {}", taskId);
   }
 
   /**
@@ -210,7 +210,7 @@ public class TaskService {
   public List<TaskResponse> searchTasks(String searchTerm) {
     UserEntity user = getCurrentUser();
 
-    logger.info("Searching tasks to user " + user.getId());
+    logger.info("Searching tasks to user ID {}", user.getId());
 
     if (Objects.isNull(searchTerm) || searchTerm.isBlank()) {
       return List.of();
@@ -218,7 +218,7 @@ public class TaskService {
 
     List<TaskEntity> tasks =
         taskRepository.findAllBySearchTerm(searchTerm.toUpperCase(), user.getId());
-    logger.info(tasks.size() + " tasks found!");
+    logger.info("{} tasks found!", tasks.size());
 
     return tasks.stream()
         .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
@@ -242,30 +242,27 @@ public class TaskService {
       return List.of();
     }
 
-    if (filter.equals("all")) {
-      return allTasks.stream()
-          .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
-          .toList();
-    }
-
-    if (filter.equals("high")) {
-      return allTasks.stream()
-          .filter(TaskEntity::getHighPriority)
-          .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
-          .toList();
-    }
-
-    if (filter.equals("untagged")) {
-      return allTasks.stream()
-          .filter(t -> t.getTag() == null || t.getTag().isBlank())
-          .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
-          .toList();
-    }
-
-    return allTasks.stream()
-        .filter(t -> t.getTag().equals(filter))
-        .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
-        .toList();
+    return switch (filter) {
+      case "all" ->
+          allTasks.stream()
+              .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
+              .toList();
+      case "high" ->
+          allTasks.stream()
+              .filter(TaskEntity::getHighPriority)
+              .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
+              .toList();
+      case "untagged" ->
+          allTasks.stream()
+              .filter(t -> t.getTag() == null || t.getTag().isBlank())
+              .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
+              .toList();
+      default ->
+          allTasks.stream()
+              .filter(t -> t.getTag().equals(filter))
+              .map((TaskEntity tr) -> TaskResponse.fromEntity(tr, getAllTasksUrls(tr.getId())))
+              .toList();
+    };
   }
 
   private UserEntity getCurrentUser() {
@@ -289,7 +286,7 @@ public class TaskService {
     }
 
     taskUrlRepository.saveAll(tasksUrl);
-    logger.info("Added " + tasksUrl.size() + " urls from task " + taskEntity.getId());
+    logger.info("Added {} URLs from task ID {}", tasksUrl.size(), taskEntity.getId());
   }
 
   private void patchDueDate(TaskEntity taskEntity, TaskPatchRequest patch) {
@@ -298,8 +295,7 @@ public class TaskService {
       try {
         taskEntity.setDueDate(LocalDate.parse(patch.dueDate()));
       } catch (DateTimeParseException e) {
-        logger.error(
-            "Unable to parse the provided date: " + patch.dueDate() + ": " + e.getMessage());
+        logger.error("Unable to parse the provided date: {}: {}", patch.dueDate(), e.getMessage());
       }
     }
   }
@@ -309,9 +305,9 @@ public class TaskService {
     List<TaskUrlEntity> urlsToDelete = taskUrlRepository.findAllById_taskId(taskId);
     if (!urlsToDelete.isEmpty()) {
       taskUrlRepository.deleteAllById_taskId(taskId);
-      logger.info("Deleted " + urlsToDelete.size() + " urls from task " + taskId);
+      logger.info("Deleted {} URLs from task ID {}", urlsToDelete.size(), taskId);
     } else {
-      logger.info("No urls to delete for task " + taskId);
+      logger.info("No URLs to delete for task ID {}", taskId);
     }
 
     if (!Objects.isNull(patch.urls())) {
@@ -319,7 +315,7 @@ public class TaskService {
           patch.urls().stream().filter(u -> !u.isBlank()).map(String::trim).toList();
       saveUrls(taskEntity, urlListToAdd);
     } else {
-      logger.info("No urls to add for task " + taskId);
+      logger.info("No URLs to add for task ID {}", taskId);
     }
   }
 }

server/src/main/java/br/com/tasknoteapp/server/service/UserSessionService.java

@@ -6,15 +6,20 @@ import br.com.tasknoteapp.server.response.JwtAuthenticationResponse;
 import br.com.tasknoteapp.server.response.NoteResponse;
 import br.com.tasknoteapp.server.response.TaskResponse;
 import br.com.tasknoteapp.server.response.UserResponse;
+import br.com.tasknoteapp.server.util.SecurityUtil;
 import jakarta.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /** This class contains methods to handle user session and account deletion. */
 @Service
 public class UserSessionService {
 
+  private static final Logger logger = LoggerFactory.getLogger(UserSessionService.class.getName());
+
   private final AuthService authService;
 
   private final TaskService taskService;
@@ -57,6 +62,11 @@ public class UserSessionService {
       throw new UserNotFoundException();
     }
 
+    logger.info(
+        "Delete current user account for user ID {} email {}",
+        userOptional.get().getId(),
+        SecurityUtil.redactEmail(userOptional.get().getEmail()));
+
     List<TaskResponse> tasks = taskService.getAllTasks();
     for (TaskResponse task : tasks) {
       Long taskId = task != null ? task.id() : null;
@@ -73,6 +83,8 @@ public class UserSessionService {
       }
     }
 
-    return authService.deleteUserAccount();
+    UserResponse response = authService.deleteUserAccount();
+    logger.info("User account deleted for user ID {}", userOptional.get().getId());
+    return response;
   }
 }

server/src/main/java/br/com/tasknoteapp/server/service/impl/JwtServiceImpl.java

@@ -115,10 +115,7 @@ class JwtServiceImpl implements JwtService {
 
   private <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
     final Optional<Claims> claims = extractAllClaims(token);
-    if (claims.isPresent()) {
-      return claimsResolver.apply(claims.get());
-    }
-    return null;
+    return claims.map(claimsResolver).orElse(null);
   }
 
   private Optional<Claims> extractAllClaims(String token) {

server/src/main/java/br/com/tasknoteapp/server/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package br.com.tasknoteapp.server.service.impl;
 import br.com.tasknoteapp.server.entity.UserEntity;
 import br.com.tasknoteapp.server.repository.UserRepository;
 import br.com.tasknoteapp.server.service.UserService;
+import br.com.tasknoteapp.server.util.SecurityUtil;
 import java.util.Optional;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
@@ -18,7 +19,7 @@ class UserServiceImpl implements UserService {
         email -> {
           Optional<UserEntity> user = userRepository.findByEmail(email);
           if (user.isEmpty()) {
-            throw new RuntimeException("User not found: " + email);
+            throw new RuntimeException("User not found: " + SecurityUtil.redactEmail(email));
           }
           return user.get();
         };

server/src/main/java/br/com/tasknoteapp/server/templates/MailgunTemplate.java

@@ -3,12 +3,12 @@ package br.com.tasknoteapp.server.templates;
 import java.util.Map;
 import java.util.Optional;
 
-/** This interface represents a mailgun template structure. */
+/** This interface represents a Mailgun template structure. */
 public interface MailgunTemplate {
 
-  static final String STRING_SCAPE = "\"";
-  static final String COLON = ":";
-  static final String COMMA = ",";
+  String STRING_SCAPE = "\"";
+  String COLON = ":";
+  String COMMA = ",";
 
   String getName();
 

server/src/main/java/br/com/tasknoteapp/server/templates/MailgunTemplateEmailChanged.java

@@ -7,9 +7,8 @@ import java.util.Optional;
 /** This class represents a template for the email change workflow. */
 public class MailgunTemplateEmailChanged implements MailgunTemplate {
 
-  private String templateName = "email_changed";
-  private String carbonCopy;
   private final Map<String, Object> props;
+  private String carbonCopy;
 
   public MailgunTemplateEmailChanged() {
     this.props = new HashMap<>();
@@ -25,7 +24,7 @@ public class MailgunTemplateEmailChanged implements MailgunTemplate {
 
   @Override
   public String getName() {
-    return templateName;
+    return "email_changed";
   }
 
   @Override
@@ -33,12 +32,12 @@ public class MailgunTemplateEmailChanged implements MailgunTemplate {
     return props;
   }
 
-  public void setCarbonCopy(String carbonCopy) {
-    this.carbonCopy = carbonCopy;
-  }
-
   @Override
   public Optional<String> getCarbonCopy() {
     return Optional.ofNullable(carbonCopy);
   }
+
+  public void setCarbonCopy(String carbonCopy) {
+    this.carbonCopy = carbonCopy;
+  }
 }

server/src/main/java/br/com/tasknoteapp/server/templates/MailgunTemplateResetPwd.java

@@ -6,7 +6,6 @@ import java.util.Map;
 /** This class represents a template for the password reset workflow. */
 public class MailgunTemplateResetPwd implements MailgunTemplate {
 
-  private String templateName = "password_reset";
   private final Map<String, Object> props;
 
   public MailgunTemplateResetPwd() {
@@ -19,7 +18,7 @@ public class MailgunTemplateResetPwd implements MailgunTemplate {
 
   @Override
   public String getName() {
-    return templateName;
+    return "password_reset";
   }
 
   @Override