Compare commits
35 Commits
3d456f2f81
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ad72119a8 | |||
| f7f2bf5768 | |||
| 28df2a66ca | |||
| 29f26a8a18 | |||
| a3fa59f347 | |||
| 2880934644 | |||
| b42980200d | |||
| 8381cdbffa | |||
| 5cab2fed3b | |||
| 417eef7042 | |||
| ed5543ce61 | |||
| 40b8f45de8 | |||
| b221d07b48 | |||
| 0e63b6e4e6 | |||
| 4a04c85fe8 | |||
| b8e2c9114d | |||
| 0876eecf50 | |||
| 5549691d50 | |||
| 46c8df45d6 | |||
| 50d274f36a | |||
| ba4f365f06 | |||
| a5e5824a44 | |||
| 7189e4fb08 | |||
| 2782823c3d | |||
| ddf64305a5 | |||
| 2b84ed0de8 | |||
| 18e740bb73 | |||
| 9b93cd97a6 | |||
| 8fb1820bc7 | |||
| 9c35bb8435 | |||
| 19c7e1915f | |||
| 229a6a8a43 | |||
| 76e878ff5c | |||
| 726be3f613 | |||
| 936140e76f |
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"permissions": {
|
||||||
|
"allow": [
|
||||||
|
"Bash(git add *)",
|
||||||
|
"Bash(git commit *)"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
-34
@@ -7,48 +7,51 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-java17
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# 1. Checkout the code
|
# 1. Checkout the code
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
# 2. Set up Java and Maven
|
# 2. Build the Spring Boot application using the Maven wrapper (Java 17 pre-installed in runner image)
|
||||||
- name: Set up JDK (Eclipse Temurin)
|
|
||||||
uses: actions/setup-java@v3
|
|
||||||
with:
|
|
||||||
distribution: "temurin"
|
|
||||||
java-version: "17"
|
|
||||||
cache: maven
|
|
||||||
|
|
||||||
# 3. Verify Maven installation
|
|
||||||
- name: Install Maven
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y maven
|
|
||||||
mvn -version
|
|
||||||
|
|
||||||
# 4. Build the Spring Boot application
|
|
||||||
- name: Build Spring Boot Application
|
- name: Build Spring Boot Application
|
||||||
run: |
|
run: ./mvnw clean package -DskipTests
|
||||||
mvn clean package -DskipTests
|
|
||||||
|
|
||||||
# 5. Set up Docker
|
# 4. Set up Docker Buildx (enables layer caching)
|
||||||
- name: Set up Docker
|
- name: Set up Docker Buildx
|
||||||
run: |
|
uses: docker/setup-buildx-action@v3
|
||||||
docker --version
|
|
||||||
|
|
||||||
# 6. Build the Docker image
|
# 5. Login to Docker Hub to avoid pull rate limits
|
||||||
- name: Build and Package Docker Image
|
- name: Login to Docker Hub
|
||||||
run: |
|
uses: docker/login-action@v3
|
||||||
docker build -t tea.zendric.de/cedric/xpensely-server:latest .
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USER }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
# 7. Docker login
|
# 6. Docker login to Gitea registry
|
||||||
- name: Login to Docker Registry
|
- name: Login to Docker Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: tea.zendric.de
|
||||||
|
username: ${{ secrets.TEAUSER }}
|
||||||
|
password: ${{ secrets.TEAPASSWORD }}
|
||||||
|
|
||||||
|
# 7. Build and push Docker image with layer caching
|
||||||
|
- name: Build and Push Docker Image
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
tags: tea.zendric.de/cedric/xpensely-server:latest
|
||||||
|
cache-from: type=registry,ref=tea.zendric.de/cedric/xpensely-server:buildcache
|
||||||
|
cache-to: type=registry,ref=tea.zendric.de/cedric/xpensely-server:buildcache,mode=max
|
||||||
|
|
||||||
|
# 8. Trigger Dokploy to redeploy the dev server automatically via API
|
||||||
|
- name: Trigger Dokploy Redeploy
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.TEAPASSWORD }}" | docker login tea.zendric.de -u ${{ secrets.TEAUSER }} --password-stdin
|
curl -X POST "https://dokploy.zendric.de/api/compose.deploy" \
|
||||||
# 8. Push Docker image
|
-H "Content-Type: application/json" \
|
||||||
- name: Push the Docker Image to registry
|
-H "x-api-key: ${{ secrets.DOKPLOY_API_TOKEN }}" \
|
||||||
run: |
|
-d "{\"composeId\": \"${{ secrets.DOKPLOY_COMPOSE_ID }}\"}" \
|
||||||
docker push tea.zendric.de/cedric/xpensely-server:latest
|
--fail
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
Run it locally:
|
||||||
|
|
||||||
|
1. build the current state:
|
||||||
|
mvn clean install or mvn clean install -DskipTests
|
||||||
|
|
||||||
|
2. docker it up and run it
|
||||||
|
docker-compose -f dev-docker-compose.yml up --build
|
||||||
+85
-1
@@ -1,6 +1,6 @@
|
|||||||
<mxfile host="65bd71144e">
|
<mxfile host="65bd71144e">
|
||||||
<diagram id="TZX9Tq6sZIlTxQ58HocZ" name="Page-1">
|
<diagram id="TZX9Tq6sZIlTxQ58HocZ" name="Page-1">
|
||||||
<mxGraphModel dx="826" dy="472" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
|
<mxGraphModel dx="989" dy="570" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
|
||||||
<root>
|
<root>
|
||||||
<mxCell id="0"/>
|
<mxCell id="0"/>
|
||||||
<mxCell id="1" parent="0"/>
|
<mxCell id="1" parent="0"/>
|
||||||
@@ -193,6 +193,90 @@
|
|||||||
<mxCell id="73" value="<span style="font-size: 8px;">24.12.24 ; Expense ; 24,12 €</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
|
<mxCell id="73" value="<span style="font-size: 8px;">24.12.24 ; Expense ; 24,12 €</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;" parent="1" vertex="1">
|
||||||
<mxGeometry x="1399" y="226" width="120" height="20" as="geometry"/>
|
<mxGeometry x="1399" y="226" width="120" height="20" as="geometry"/>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
|
<mxCell id="86" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="74" target="79">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="74" value="List" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#60a917;fontColor=#ffffff;strokeColor=#2D7600;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1880" y="160" width="120" height="60" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="75" value="DB-Structure for Categories" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1930" y="35" width="100" height="30" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="78" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="76" target="77">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="76" value="List Entry" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1920" y="220" width="120" height="60" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="79" value="Available Categories" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2160" y="150" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="83" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="81" target="79">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="81" value="Standard Categories" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2060" y="35" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="84" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="82" target="79">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="82" value="Custom Categories" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2270" y="35" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="91" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="87" target="90">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="87" value="List Entry" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1920" y="280" width="120" height="60" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="92" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="88" target="89">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="88" value="List Entry" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1920" y="340" width="120" height="60" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="89" value="Category" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2150" y="370" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="90" value="Category" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2150" y="315" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="94" value="<h1 style="font-size: 18px;">- list id</h1><div>- List &lt;String&gt;</div>" style="text;html=1;strokeColor=none;fillColor=none;spacing=5;spacingTop=-20;whiteSpace=wrap;overflow=hidden;rounded=0;fontSize=18;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2410" y="50" width="130" height="70" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="77" value="Category" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="2150" y="260" width="120" height="80" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="97" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1730" y="510" width="200" height="320" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="98" value="ExpenseList" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1770" y="520" width="120" height="20" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="100" value="+" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1880" y="790" width="30" height="30" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="101" value="Categorie" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1770" y="480" width="120" height="30" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="102" value="<span style="font-size: 8px;">Amount : 24,12 €<br>Title: Expense<br>Date: 24.12.24<br>From: Jessi<br>Deviation: 0 €</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#76608a;fontColor=#ffffff;strokeColor=#432D57;align=left;spacingLeft=12;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1745" y="550" width="170" height="170" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="105" value="<span style="font-size: 8px;">Essen</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#1ba1e2;fontColor=#ffffff;strokeColor=#006EAF;align=left;spacingLeft=12;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1760" y="680" width="40" height="10" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="106" value="<span style="font-size: 8px;">Trinken</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#a20025;fontColor=#ffffff;strokeColor=#6F0000;align=left;spacingLeft=12;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1800" y="680" width="40" height="10" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="107" value="<span style="font-size: 8px;">Auto</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d80073;fontColor=#ffffff;strokeColor=#A50040;align=left;spacingLeft=12;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1840" y="680" width="40" height="10" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="111" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=18;" edge="1" parent="1" source="108" target="74">
|
||||||
|
<mxGeometry relative="1" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="108" value="Actor" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=18;" vertex="1" parent="1">
|
||||||
|
<mxGeometry x="1715" y="150" width="30" height="60" as="geometry"/>
|
||||||
|
</mxCell>
|
||||||
</root>
|
</root>
|
||||||
</mxGraphModel>
|
</mxGraphModel>
|
||||||
</diagram>
|
</diagram>
|
||||||
|
|||||||
+1
-3
@@ -1,11 +1,9 @@
|
|||||||
services:
|
services:
|
||||||
xpensely-server:
|
xpensely-server:
|
||||||
image: tea.zendric.de/cedric/xpensely-server:latest
|
image: tea.zendric.de/cedric/xpensely-server:latest
|
||||||
|
pull_policy: always
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
|
|
||||||
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
|
|
||||||
|
|
||||||
DB_PORT: 5432
|
DB_PORT: 5432
|
||||||
DB_P_NAME: ${POSTGRES_DB}
|
DB_P_NAME: ${POSTGRES_DB}
|
||||||
DB_USERNAME: ${POSTGRES_USER}
|
DB_USERNAME: ${POSTGRES_USER}
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM eclipse-temurin:17-jdk
|
FROM eclipse-temurin:21-jdk
|
||||||
|
|
||||||
COPY ./target/*.jar app.jar
|
COPY ./target/*.jar app.jar
|
||||||
|
|
||||||
|
|||||||
+732
@@ -0,0 +1,732 @@
|
|||||||
|
# Xpensely Server — API Reference
|
||||||
|
|
||||||
|
> Last updated: 2026-05-14 · Branch: `dev`
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
1. [Overview](#1-overview)
|
||||||
|
2. [Authentication](#2-authentication)
|
||||||
|
3. [Rate Limiting](#3-rate-limiting)
|
||||||
|
4. [Endpoints](#4-endpoints)
|
||||||
|
- 4.1 [Home](#41-home)
|
||||||
|
- 4.2 [Users](#42-users)
|
||||||
|
- 4.3 [Expense Lists](#43-expense-lists)
|
||||||
|
5. [Data Models](#5-data-models)
|
||||||
|
6. [Error Handling](#6-error-handling)
|
||||||
|
7. [Recent Changes — `feature/security-hardening`](#7-recent-changes)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Overview
|
||||||
|
|
||||||
|
Xpensely Server is a Spring Boot REST API that manages shared expense lists for pairs of users. It uses Google OAuth2 JWT tokens for authentication. All protected endpoints require a valid Bearer token in the `Authorization` header.
|
||||||
|
|
||||||
|
**Base URL (local dev):** `http://localhost:8080`
|
||||||
|
|
||||||
|
**Content-Type:** `application/json` for all request and response bodies.
|
||||||
|
|
||||||
|
**Public endpoints (no auth required):**
|
||||||
|
| Method | Path | Description |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| GET | `/` | Health check — returns `"Welcome"` |
|
||||||
|
| GET | `/api/version` | Returns build version and timestamp |
|
||||||
|
| POST | `/api/users/createUser` | Register a new user |
|
||||||
|
| GET | `/api/users/byName` | Look up a user by username |
|
||||||
|
|
||||||
|
All other endpoints require authentication (see [Section 2](#2-authentication)).
|
||||||
|
|
||||||
|
## 2. Authentication
|
||||||
|
|
||||||
|
The server uses **OAuth2 Resource Server** authentication with **Google ID JWT tokens**.
|
||||||
|
|
||||||
|
### How it works
|
||||||
|
|
||||||
|
1. The client authenticates with Google and receives a Google ID JWT.
|
||||||
|
2. Every protected API request must include this token in the header:
|
||||||
|
|
||||||
|
```
|
||||||
|
Authorization: Bearer <google-id-jwt>
|
||||||
|
```
|
||||||
|
|
||||||
|
3. The server validates the JWT signature and extracts the `sub` claim (Google User ID).
|
||||||
|
4. The `sub` value is used to look up the registered `AppUser` in the database via `AuthenticatedUserResolver`.
|
||||||
|
5. If no `AppUser` exists for that Google ID, the request is rejected with **403 Forbidden**.
|
||||||
|
|
||||||
|
### Test profile
|
||||||
|
|
||||||
|
When the application runs under the `test` Spring profile (`-Dspring.profiles.active=test`), **all security is disabled** — every endpoint is accessible without a token. This is used for automated tests only.
|
||||||
|
|
||||||
|
### User registration flow
|
||||||
|
|
||||||
|
Before a user can call any protected endpoint they must first be registered:
|
||||||
|
|
||||||
|
1. Authenticate with Google to obtain a Google ID JWT.
|
||||||
|
2. Call `POST /api/users/createUser` with the JWT's `sub` value as `googleId` and a chosen `username`.
|
||||||
|
3. All subsequent protected calls use the same JWT — the server resolves the caller automatically.
|
||||||
|
|
||||||
|
## 3. Rate Limiting
|
||||||
|
|
||||||
|
All requests pass through a `RateLimitFilter` (implemented with **Bucket4j**).
|
||||||
|
|
||||||
|
| Setting | Value |
|
||||||
|
|---------|-------|
|
||||||
|
| Limit | 60 requests per minute |
|
||||||
|
| Window | Rolling 1-minute bucket |
|
||||||
|
| Key (authenticated) | JWT `sub` claim (Google User ID) |
|
||||||
|
| Key (unauthenticated) | `X-Forwarded-For` header, falling back to remote IP |
|
||||||
|
|
||||||
|
When the limit is exceeded the server responds with:
|
||||||
|
|
||||||
|
```
|
||||||
|
HTTP 429 Too Many Requests
|
||||||
|
```
|
||||||
|
|
||||||
|
No `Retry-After` header is currently returned. Clients should back off and retry after 60 seconds.
|
||||||
|
|
||||||
|
> **Note:** Rate limiting applies in the `!test` profile only. Tests run without rate limiting.
|
||||||
|
|
||||||
|
## 4. Endpoints
|
||||||
|
|
||||||
|
### 4.1 Home
|
||||||
|
|
||||||
|
#### `GET /`
|
||||||
|
|
||||||
|
Health check. No authentication required.
|
||||||
|
|
||||||
|
**Response:** `200 OK`
|
||||||
|
```
|
||||||
|
Welcome
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/version`
|
||||||
|
|
||||||
|
Returns the application version and build timestamp. No authentication required.
|
||||||
|
|
||||||
|
**Response:** `200 OK`
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"version": "0.0.1-SNAPSHOT",
|
||||||
|
"builtAt": "2026-05-09T10:00:00Z"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
|-------|------|-------|
|
||||||
|
| `version` | String | Maven project version |
|
||||||
|
| `builtAt` | String (ISO-8601) | UTC timestamp of the build |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 4.2 Users
|
||||||
|
|
||||||
|
Base path: `/api/users`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `POST /api/users/createUser` — Register a user
|
||||||
|
|
||||||
|
**Auth required:** No
|
||||||
|
|
||||||
|
**Request body:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"username": "alice",
|
||||||
|
"googleId": "118400012345678901234"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Constraints |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `username` | String | Required. 3–30 chars. Pattern: `^[a-zA-Z0-9_.\-]+$` |
|
||||||
|
| `googleId` | String | Required. Non-blank. Must match the JWT `sub` from Google. |
|
||||||
|
|
||||||
|
**Success response:** `201 Created` — returns the created [AppUser](#appuser) object.
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 400 | Validation failure (field errors returned as `{"fieldName": "message"}`) |
|
||||||
|
| 409 | `username` already taken |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/users` — Get user by ID
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `id` | Long | Yes | Database ID of the user |
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns [AppUser](#appuser).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Authenticated user's ID does not match the requested `id` |
|
||||||
|
| 404 | No user found for `id` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/users/byName` — Get user by username
|
||||||
|
|
||||||
|
**Auth required:** No
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `username` | String | Yes | Exact username (case-sensitive) |
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns [AppUser](#appuser).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 404 | No user found for `username` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/users/byGoogleId` — Get user by Google ID
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `id` | String | Yes | Google `sub` claim |
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns [AppUser](#appuser).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Requested Google ID does not match the authenticated user's Google ID |
|
||||||
|
| 404 | No user found for that Google ID |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `DELETE /api/users` — Delete a user
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `id` | Long | Yes | Database ID of the user to delete |
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns a plain string: `"User deleted: <username>"`.
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Authenticated user's ID does not match the requested `id` |
|
||||||
|
| 404 | No user found for `id` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 4.3 Expense Lists
|
||||||
|
|
||||||
|
Base path: `/api/expenselist`
|
||||||
|
|
||||||
|
All endpoints in this group require authentication. The authenticated caller is resolved from the JWT and used for ownership checks.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/expenselist/mine` — Get caller's expense lists
|
||||||
|
|
||||||
|
Returns all expense lists where the caller is the owner **or** has been shared the list.
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Request body:** None
|
||||||
|
|
||||||
|
**Success responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 200 OK | Returns array of [ExpenseList](#expenselist) |
|
||||||
|
| 204 No Content | Caller has no expense lists |
|
||||||
|
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"name": "Holiday Trip",
|
||||||
|
"inviteCode": null,
|
||||||
|
"owner": { "id": 1, "username": "alice" },
|
||||||
|
"sharedWith": null,
|
||||||
|
"expenses": [],
|
||||||
|
"customCategories": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `GET /api/expenselist/byId` — Get expense list by ID
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `id` | Long | Yes | Expense list database ID |
|
||||||
|
|
||||||
|
The caller must be the owner or the shared user of the list.
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns [ExpenseList](#expenselist).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Caller is neither owner nor shared user |
|
||||||
|
| 404 | No list found for `id` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `POST /api/expenselist/create` — Create an expense list
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Request body:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"name": "Road Trip 2026"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Constraints |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `name` | String | Required. Max 100 chars. |
|
||||||
|
|
||||||
|
The authenticated caller becomes the `owner` of the new list. The list is initialised with the default Xpensely standard categories.
|
||||||
|
|
||||||
|
**Success response:** `201 Created` — returns the created [ExpenseList](#expenselist).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 400 | Validation failure |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `DELETE /api/expenselist/{id}` — Delete an expense list
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Path params:**
|
||||||
|
| Param | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `id` | Long | Expense list database ID |
|
||||||
|
|
||||||
|
Only the **owner** may delete a list. Deleting a list cascades to all its expenses and custom categories.
|
||||||
|
|
||||||
|
**Success response:** `204 No Content`
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Caller is not the owner |
|
||||||
|
| 404 | No list found for `id` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `POST /api/expenselist/{id}/add` — Add an expense to a list
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Path params:**
|
||||||
|
| Param | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `id` | Long | Expense list database ID |
|
||||||
|
|
||||||
|
**Request body:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"title": "Dinner",
|
||||||
|
"owner": "alice",
|
||||||
|
"amount": 42.50,
|
||||||
|
"personalUseAmount": 21.25,
|
||||||
|
"otherPersonAmount": 21.25,
|
||||||
|
"date": "2026-05-09",
|
||||||
|
"category": "Food"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Constraints |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `title` | String | Required. Max 100 chars. |
|
||||||
|
| `owner` | String | Required. Username of the person who paid. |
|
||||||
|
| `amount` | Double | Required. Min 0.01. |
|
||||||
|
| `personalUseAmount` | Double | Optional. Caller's share. |
|
||||||
|
| `otherPersonAmount` | Double | Optional. Other person's share. |
|
||||||
|
| `date` | String (ISO-8601) | Required. Format: `YYYY-MM-DD`. |
|
||||||
|
| `category` | String | Required. Non-blank category name. |
|
||||||
|
|
||||||
|
**Success response:** `201 Created` — returns the created [Expense](#expense).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 400 | Validation failure |
|
||||||
|
| 403 | Caller is not a member (owner or sharedWith) of the list |
|
||||||
|
| 404 | List not found |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `PUT /api/expenselist/{id}/update` — Update an expense
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Path params:**
|
||||||
|
| Param | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `id` | Long | Expense list database ID |
|
||||||
|
|
||||||
|
**Request body:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 7,
|
||||||
|
"title": "Dinner (updated)",
|
||||||
|
"ownerName": "alice",
|
||||||
|
"amount": 50.00,
|
||||||
|
"personalUseAmount": 25.00,
|
||||||
|
"otherPersonAmount": 25.00,
|
||||||
|
"date": "2026-05-09",
|
||||||
|
"category": "Food"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Constraints |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `id` | Long | Required. ID of the expense to update. |
|
||||||
|
| `title` | String | Required. Max 100 chars. |
|
||||||
|
| `ownerName` | String | Required. Username of the payer. |
|
||||||
|
| `amount` | Double | Required. Min 0.01. |
|
||||||
|
| `personalUseAmount` | Double | Optional. |
|
||||||
|
| `otherPersonAmount` | Double | Optional. |
|
||||||
|
| `date` | String (ISO-8601) | Required. `YYYY-MM-DD`. |
|
||||||
|
| `category` | String | Required. |
|
||||||
|
|
||||||
|
Caller must be a member of the list. Expense must belong to the specified list.
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns the updated [Expense](#expense).
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 400 | Validation failure or expense does not belong to this list |
|
||||||
|
| 403 | Caller is not a member of the list |
|
||||||
|
| 404 | List or expense not found |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `DELETE /api/expenselist/{id}/delete` — Remove an expense from a list
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Path params:**
|
||||||
|
| Param | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `id` | Long | Expense list database ID |
|
||||||
|
|
||||||
|
**Query params:**
|
||||||
|
| Param | Type | Required | Description |
|
||||||
|
|-------|------|----------|-------------|
|
||||||
|
| `expenseId` | Long | Yes | ID of the expense to remove |
|
||||||
|
|
||||||
|
Caller must be a member of the list.
|
||||||
|
|
||||||
|
**Success response:** `204 No Content`
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Caller is not a member of the list |
|
||||||
|
| 404 | List or expense not found |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `POST /api/expenselist/{listId}/invite` — Generate an invite code
|
||||||
|
|
||||||
|
Generates (or refreshes) a 6-character uppercase invite code for the list, valid for **1 week**.
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Path params:**
|
||||||
|
| Param | Type | Description |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `listId` | Long | Expense list database ID |
|
||||||
|
|
||||||
|
Caller must be the **owner** of the list.
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns the invite code as a plain string.
|
||||||
|
|
||||||
|
```
|
||||||
|
AB3X7Q
|
||||||
|
```
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 403 | Caller is not the owner |
|
||||||
|
| 404 | List not found |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `POST /api/expenselist/accept-invite` — Accept an invite
|
||||||
|
|
||||||
|
Joins the caller to a shared expense list using an invite code.
|
||||||
|
|
||||||
|
**Auth required:** Yes
|
||||||
|
|
||||||
|
**Request body:**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"inviteCode": "AB3X7Q"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Constraints |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `inviteCode` | String | Required. Exactly 6 characters. |
|
||||||
|
|
||||||
|
**Success response:** `200 OK` — returns a plain string: `"User added to the list"`.
|
||||||
|
|
||||||
|
**Error responses:**
|
||||||
|
| Status | Condition |
|
||||||
|
|--------|-----------|
|
||||||
|
| 400 | Validation failure or caller is already the owner of the list |
|
||||||
|
| 404 | Invite code not found or expired |
|
||||||
|
| 226 IM Used | List already has a second member (`sharedWith` is not null) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Data Models
|
||||||
|
|
||||||
|
### AppUser
|
||||||
|
|
||||||
|
Returned by all `/api/users` endpoints. Sensitive fields (`googleId`, `createdAt`) are hidden from API responses via `@JsonIgnore`.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"username": "alice"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
|-------|------|-------|
|
||||||
|
| `id` | Long | Auto-generated primary key |
|
||||||
|
| `username` | String | Unique. 3–30 chars. |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### ExpenseList
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"name": "Road Trip",
|
||||||
|
"inviteCode": "AB3X7Q",
|
||||||
|
"owner": { "id": 1, "username": "alice" },
|
||||||
|
"sharedWith": { "id": 2, "username": "bob" },
|
||||||
|
"xpenselyStandardCategories": {
|
||||||
|
"id": 1,
|
||||||
|
"categories": [
|
||||||
|
{ "id": 1, "name": "Food", "colorCode": "#FF5733" }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"customCategories": [],
|
||||||
|
"expenses": []
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
|-------|------|-------|
|
||||||
|
| `id` | Long | Auto-generated primary key |
|
||||||
|
| `name` | String | Display name of the list |
|
||||||
|
| `inviteCode` | String \| null | 6-char code; `null` if not yet generated or expired |
|
||||||
|
| `owner` | AppUser | User who created the list |
|
||||||
|
| `sharedWith` | AppUser \| null | Second member of the list; `null` until an invite is accepted |
|
||||||
|
| `xpenselyStandardCategories` | XpenselyStandardCategories | Default category set assigned at creation |
|
||||||
|
| `customCategories` | XpenselyCustomCategory[] | User-defined categories, ordered A→Z |
|
||||||
|
| `expenses` | Expense[] | All expenses, ordered by date ASC then id ASC |
|
||||||
|
|
||||||
|
> `inviteCodeExpiration` is hidden from API responses (`@JsonIgnore`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Expense
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 7,
|
||||||
|
"title": "Dinner",
|
||||||
|
"owner": { "id": 1, "username": "alice" },
|
||||||
|
"amount": 42.50,
|
||||||
|
"personalUseAmount": 21.25,
|
||||||
|
"otherPersonAmount": 21.25,
|
||||||
|
"category": "Food",
|
||||||
|
"date": "2026-05-09"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
|-------|------|-------|
|
||||||
|
| `id` | Long | Auto-generated |
|
||||||
|
| `title` | String | Description of the expense |
|
||||||
|
| `owner` | AppUser | Who paid |
|
||||||
|
| `amount` | Double | Total amount. Min 0.01. |
|
||||||
|
| `personalUseAmount` | Double \| null | Caller's share |
|
||||||
|
| `otherPersonAmount` | Double \| null | Other member's share |
|
||||||
|
| `category` | String | Category name (free text — must match a category on the list) |
|
||||||
|
| `date` | String (ISO-8601) | `YYYY-MM-DD` |
|
||||||
|
|
||||||
|
> The `expenseList` back-reference is excluded via `@JsonBackReference` to prevent circular serialisation.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### XpenselyStandardCategories
|
||||||
|
|
||||||
|
A named group of standard categories assigned to every new expense list.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 1,
|
||||||
|
"categories": [
|
||||||
|
{ "id": 1, "name": "Food", "colorCode": "#FF5733" },
|
||||||
|
{ "id": 2, "name": "Transport", "colorCode": "#3498DB" }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### XpenselyCustomCategory
|
||||||
|
|
||||||
|
A user-defined category attached to a specific expense list.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": 5,
|
||||||
|
"name": "Souvenirs",
|
||||||
|
"colorCode": "#9B59B6"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
|-------|------|-------|
|
||||||
|
| `id` | Long | Auto-generated |
|
||||||
|
| `name` | String | Category label |
|
||||||
|
| `colorCode` | String | 7-char hex string e.g. `#RRGGBB` |
|
||||||
|
|
||||||
|
> The `expenseList` back-reference is excluded via `@JsonBackReference`.
|
||||||
|
|
||||||
|
## 6. Error Handling
|
||||||
|
|
||||||
|
All errors are returned as JSON. The `GlobalExceptionHandler` (`@RestControllerAdvice`) maps exceptions to HTTP status codes consistently across every endpoint.
|
||||||
|
|
||||||
|
### Error response format
|
||||||
|
|
||||||
|
Most errors:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"error": "Human-readable message"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Validation errors (`400`):
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"username": "size must be between 3 and 30",
|
||||||
|
"googleId": "must not be blank"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Status code reference
|
||||||
|
|
||||||
|
| HTTP Status | Condition | Source |
|
||||||
|
|-------------|-----------|--------|
|
||||||
|
| 400 Bad Request | Input validation failed (missing/invalid fields) | `MethodArgumentNotValidException` via `@Valid` |
|
||||||
|
| 400 Bad Request | Business rule violation (e.g. expense not in this list) | `IllegalArgumentException` |
|
||||||
|
| 403 Forbidden | User not registered in the system | `AuthenticatedUserResolver` → `ResponseStatusException(FORBIDDEN)` |
|
||||||
|
| 403 Forbidden | Ownership check failed (e.g. deleting someone else's list) | `ResponseStatusException(FORBIDDEN)` in controller |
|
||||||
|
| 404 Not Found | Entity does not exist (user, list, expense) | `ResourceNotFoundException` |
|
||||||
|
| 409 Conflict | Username already taken | `UsernameAlreadyExistsException` |
|
||||||
|
| 429 Too Many Requests | Rate limit exceeded | `RateLimitFilter` (returned directly, not via exception handler) |
|
||||||
|
| 500 Internal Server Error | Unexpected runtime or generic exception | `RuntimeException` / `Exception` — message is hidden from client |
|
||||||
|
|
||||||
|
## 7. Recent Changes — `feature/security-hardening`
|
||||||
|
|
||||||
|
This section summarises API-visible changes introduced on the `feature/security-hardening` branch (commits `3d456f2` → `b1324e3` → `8b96433` → `f0de751`). A developer or agent reading this document should be aware of these differences compared to the `main` branch.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### New: Centralised error handling (`GlobalExceptionHandler`)
|
||||||
|
|
||||||
|
**File:** `src/main/java/.../controller/GlobalExceptionHandler.java`
|
||||||
|
|
||||||
|
All error responses now follow the consistent JSON shape described in [Section 6](#6-error-handling). Previously, individual controllers returned ad-hoc responses, including HTTP 417 and raw stack trace output. Both have been removed. SLF4J logging has been added for server-side error visibility.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### New: `AuthenticatedUserResolver`
|
||||||
|
|
||||||
|
**File:** `src/main/java/.../security/AuthenticatedUserResolver.java`
|
||||||
|
|
||||||
|
A new component that extracts the Google ID from the JWT `sub` claim and resolves the corresponding `AppUser`. Injected into all protected controller methods. Returns `403 Forbidden` if the token is valid but the user has never called `POST /api/users/createUser`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### New: `RateLimitFilter` — 60 req/min
|
||||||
|
|
||||||
|
**File:** `src/main/java/.../security/RateLimitFilter.java`
|
||||||
|
|
||||||
|
Rate limiting was not present on `main`. See [Section 3](#3-rate-limiting) for full details.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### New: `CreateExpenseListRequest` DTO with validation
|
||||||
|
|
||||||
|
**File:** `src/main/java/.../model/CreateExpenseListRequest.java`
|
||||||
|
|
||||||
|
`POST /api/expenselist/create` previously accepted a raw `ExpenseList` body. It now requires a `CreateExpenseListRequest` with a single validated `name` field (`@NotBlank`, `@Size(max=100)`). Clients must update their request body shape.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Updated: Validation constraints tightened on existing DTOs
|
||||||
|
|
||||||
|
| DTO | Field | Change |
|
||||||
|
|-----|-------|--------|
|
||||||
|
| `AppUserCreateRequest` | `username` | Added `@Pattern(regexp="^[a-zA-Z0-9_.\-]+$")` — special characters (other than `_`, `.`, `-`) now rejected |
|
||||||
|
| `InviteRequest` | `inviteCode` | Added `@Size(min=6, max=6)` — non-6-char codes now rejected at binding |
|
||||||
|
| `ExpenseInput` | `amount` | Added `@DecimalMin("0.01")` — zero and negative amounts now rejected |
|
||||||
|
| `ExpenseChangeRequest` | `amount` | Added `@DecimalMin("0.01")` — zero and negative amounts now rejected |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Updated: `SecurityConfig` — test-profile isolation
|
||||||
|
|
||||||
|
**File:** `src/main/java/.../security/SecurityConfig.java`
|
||||||
|
|
||||||
|
Two separate `SecurityFilterChain` beans now exist:
|
||||||
|
- `@Profile("test")` — all endpoints permitted, CSRF disabled (for automated tests only).
|
||||||
|
- `@Profile("!test")` — full JWT/OAuth2 enforcement (production behaviour).
|
||||||
|
|
||||||
|
Previously a single config was used for both, which made tests fragile.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Fixed: `ExpenseListService` — JPQL and exception consistency
|
||||||
|
|
||||||
|
- Single `@Param` used in all JPQL queries (multi-param variant was broken).
|
||||||
|
- `ResourceNotFoundException` is now thrown consistently instead of returning `null` or a generic `RuntimeException`.
|
||||||
|
- `addExpenseToList` delegates directly to `ExpenseList.addExpense()` rather than looping.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Fixed: `UserService` — null returns replaced with exceptions
|
||||||
|
|
||||||
|
All not-found paths in `UserService` now throw `ResourceNotFoundException` instead of returning `null`. Callers that previously needed to null-check responses will now receive a `404` response.
|
||||||
@@ -128,6 +128,13 @@
|
|||||||
</exclude>
|
</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>build-info</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|||||||
@@ -1,13 +1,30 @@
|
|||||||
package de.zendric.app.xpensely_server.controller;
|
package de.zendric.app.xpensely_server.controller;
|
||||||
|
|
||||||
|
import org.springframework.boot.info.BuildProperties;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
class HomeController {
|
class HomeController {
|
||||||
|
|
||||||
|
private final BuildProperties buildProperties;
|
||||||
|
|
||||||
|
HomeController(BuildProperties buildProperties) {
|
||||||
|
this.buildProperties = buildProperties;
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/")
|
@GetMapping("/")
|
||||||
public String getAll() {
|
public String getAll() {
|
||||||
return "Welcome";
|
return "Welcome";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/api/version")
|
||||||
|
public Map<String, String> version() {
|
||||||
|
return Map.of(
|
||||||
|
"version", buildProperties.getVersion(),
|
||||||
|
"builtAt", buildProperties.getTime().toString()
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -28,10 +28,10 @@ public class SecurityConfig {
|
|||||||
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
||||||
http
|
http
|
||||||
.authorizeHttpRequests(auth -> auth
|
.authorizeHttpRequests(auth -> auth
|
||||||
|
.requestMatchers("/api/version").permitAll()
|
||||||
.anyRequest().authenticated())
|
.anyRequest().authenticated())
|
||||||
.oauth2ResourceServer(oauth2 -> oauth2
|
.oauth2ResourceServer(oauth2 -> oauth2
|
||||||
.jwt(Customizer.withDefaults()))
|
.jwt(Customizer.withDefaults()))
|
||||||
.oauth2Login(Customizer.withDefaults())
|
|
||||||
.addFilterAfter(new RateLimitFilter(), BearerTokenAuthenticationFilter.class)
|
.addFilterAfter(new RateLimitFilter(), BearerTokenAuthenticationFilter.class)
|
||||||
.csrf(csrf -> csrf.disable());
|
.csrf(csrf -> csrf.disable());
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ spring.application.name=XpenselyServer
|
|||||||
|
|
||||||
#Security
|
#Security
|
||||||
spring.security.enabled=false
|
spring.security.enabled=false
|
||||||
spring.security.oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID}
|
|
||||||
spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET}
|
|
||||||
spring.security.oauth2.resourceserver.jwt.issuer-uri=https://accounts.google.com
|
spring.security.oauth2.resourceserver.jwt.issuer-uri=https://accounts.google.com
|
||||||
|
|
||||||
# PostgreSQL Configuration
|
# PostgreSQL Configuration
|
||||||
|
|||||||
Reference in New Issue
Block a user