From 97b045a777d82b6d131730bb7c69fd4be9a953fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Thu, 6 Mar 2025 16:28:02 +0100 Subject: [PATCH 01/28] Move angular app to frontend folder --- .editorconfig => frontend/.editorconfig | 0 .gitignore => frontend/.gitignore | 0 angular.json => frontend/angular.json | 0 package-lock.json => frontend/package-lock.json | 0 package.json => frontend/package.json | 0 {public => frontend/public}/favicon.ico | Bin {src => frontend/src}/app/app.component.css | 0 {src => frontend/src}/app/app.component.html | 0 {src => frontend/src}/app/app.component.spec.ts | 0 {src => frontend/src}/app/app.component.ts | 0 {src => frontend/src}/app/app.config.ts | 0 {src => frontend/src}/app/app.routes.ts | 0 .../app/error-display/error-display.component.css | 0 .../app/error-display/error-display.component.html | 0 .../app/error-display/error-display.component.ts | 0 .../src}/app/graphhopper/geojson.model.ts | 0 .../app/graphhopper/graphhopper-response.model.ts | 0 .../src}/app/graphhopper/graphhopper.service.ts | 0 .../src}/app/graphhopper/path-details.model.ts | 0 .../src}/app/graphhopper/route-instruction.model.ts | 0 .../src}/app/graphhopper/route-path.model.ts | 0 {src => frontend/src}/app/map-view/edge.model.ts | 0 .../src}/app/map-view/map-view.component.css | 0 .../src}/app/map-view/map-view.component.html | 0 .../src}/app/map-view/map-view.component.spec.ts | 0 .../src}/app/map-view/map-view.component.ts | 0 {src => frontend/src}/app/map-view/map.service.ts | 0 .../src}/app/map-view/overpass.service.ts | 0 {src => frontend/src}/app/map-view/point.model.ts | 0 {src => frontend/src}/app/map-view/route.model.ts | 0 {src => frontend/src}/app/map-view/utils.ts | 0 {src => frontend/src}/app/map-view/way.model.ts | 0 .../src}/app/route-panel/distance.pipe.ts | 0 .../src}/app/route-panel/route-panel.component.css | 0 .../src}/app/route-panel/route-panel.component.html | 0 .../app/route-panel/route-panel.component.spec.ts | 0 .../src}/app/route-panel/route-panel.component.ts | 0 .../src}/app/route-panel/surface-color.pip.ts | 0 .../src}/app/route-panel/surface.pipe.ts | 0 {src => frontend/src}/app/route-panel/time.pipe.ts | 0 .../src}/environments/environment.development.ts | 0 {src => frontend/src}/environments/environment.ts | 0 {src => frontend/src}/index.html | 0 {src => frontend/src}/main.ts | 0 {src => frontend/src}/styles.css | 0 tailwind.config.js => frontend/tailwind.config.js | 0 tsconfig.app.json => frontend/tsconfig.app.json | 0 tsconfig.json => frontend/tsconfig.json | 0 tsconfig.spec.json => frontend/tsconfig.spec.json | 0 49 files changed, 0 insertions(+), 0 deletions(-) rename .editorconfig => frontend/.editorconfig (100%) rename .gitignore => frontend/.gitignore (100%) rename angular.json => frontend/angular.json (100%) rename package-lock.json => frontend/package-lock.json (100%) rename package.json => frontend/package.json (100%) rename {public => frontend/public}/favicon.ico (100%) rename {src => frontend/src}/app/app.component.css (100%) rename {src => frontend/src}/app/app.component.html (100%) rename {src => frontend/src}/app/app.component.spec.ts (100%) rename {src => frontend/src}/app/app.component.ts (100%) rename {src => frontend/src}/app/app.config.ts (100%) rename {src => frontend/src}/app/app.routes.ts (100%) rename {src => frontend/src}/app/error-display/error-display.component.css (100%) rename {src => frontend/src}/app/error-display/error-display.component.html (100%) rename {src => frontend/src}/app/error-display/error-display.component.ts (100%) rename {src => frontend/src}/app/graphhopper/geojson.model.ts (100%) rename {src => frontend/src}/app/graphhopper/graphhopper-response.model.ts (100%) rename {src => frontend/src}/app/graphhopper/graphhopper.service.ts (100%) rename {src => frontend/src}/app/graphhopper/path-details.model.ts (100%) rename {src => frontend/src}/app/graphhopper/route-instruction.model.ts (100%) rename {src => frontend/src}/app/graphhopper/route-path.model.ts (100%) rename {src => frontend/src}/app/map-view/edge.model.ts (100%) rename {src => frontend/src}/app/map-view/map-view.component.css (100%) rename {src => frontend/src}/app/map-view/map-view.component.html (100%) rename {src => frontend/src}/app/map-view/map-view.component.spec.ts (100%) rename {src => frontend/src}/app/map-view/map-view.component.ts (100%) rename {src => frontend/src}/app/map-view/map.service.ts (100%) rename {src => frontend/src}/app/map-view/overpass.service.ts (100%) rename {src => frontend/src}/app/map-view/point.model.ts (100%) rename {src => frontend/src}/app/map-view/route.model.ts (100%) rename {src => frontend/src}/app/map-view/utils.ts (100%) rename {src => frontend/src}/app/map-view/way.model.ts (100%) rename {src => frontend/src}/app/route-panel/distance.pipe.ts (100%) rename {src => frontend/src}/app/route-panel/route-panel.component.css (100%) rename {src => frontend/src}/app/route-panel/route-panel.component.html (100%) rename {src => frontend/src}/app/route-panel/route-panel.component.spec.ts (100%) rename {src => frontend/src}/app/route-panel/route-panel.component.ts (100%) rename {src => frontend/src}/app/route-panel/surface-color.pip.ts (100%) rename {src => frontend/src}/app/route-panel/surface.pipe.ts (100%) rename {src => frontend/src}/app/route-panel/time.pipe.ts (100%) rename {src => frontend/src}/environments/environment.development.ts (100%) rename {src => frontend/src}/environments/environment.ts (100%) rename {src => frontend/src}/index.html (100%) rename {src => frontend/src}/main.ts (100%) rename {src => frontend/src}/styles.css (100%) rename tailwind.config.js => frontend/tailwind.config.js (100%) rename tsconfig.app.json => frontend/tsconfig.app.json (100%) rename tsconfig.json => frontend/tsconfig.json (100%) rename tsconfig.spec.json => frontend/tsconfig.spec.json (100%) diff --git a/.editorconfig b/frontend/.editorconfig similarity index 100% rename from .editorconfig rename to frontend/.editorconfig diff --git a/.gitignore b/frontend/.gitignore similarity index 100% rename from .gitignore rename to frontend/.gitignore diff --git a/angular.json b/frontend/angular.json similarity index 100% rename from angular.json rename to frontend/angular.json diff --git a/package-lock.json b/frontend/package-lock.json similarity index 100% rename from package-lock.json rename to frontend/package-lock.json diff --git a/package.json b/frontend/package.json similarity index 100% rename from package.json rename to frontend/package.json diff --git a/public/favicon.ico b/frontend/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to frontend/public/favicon.ico diff --git a/src/app/app.component.css b/frontend/src/app/app.component.css similarity index 100% rename from src/app/app.component.css rename to frontend/src/app/app.component.css diff --git a/src/app/app.component.html b/frontend/src/app/app.component.html similarity index 100% rename from src/app/app.component.html rename to frontend/src/app/app.component.html diff --git a/src/app/app.component.spec.ts b/frontend/src/app/app.component.spec.ts similarity index 100% rename from src/app/app.component.spec.ts rename to frontend/src/app/app.component.spec.ts diff --git a/src/app/app.component.ts b/frontend/src/app/app.component.ts similarity index 100% rename from src/app/app.component.ts rename to frontend/src/app/app.component.ts diff --git a/src/app/app.config.ts b/frontend/src/app/app.config.ts similarity index 100% rename from src/app/app.config.ts rename to frontend/src/app/app.config.ts diff --git a/src/app/app.routes.ts b/frontend/src/app/app.routes.ts similarity index 100% rename from src/app/app.routes.ts rename to frontend/src/app/app.routes.ts diff --git a/src/app/error-display/error-display.component.css b/frontend/src/app/error-display/error-display.component.css similarity index 100% rename from src/app/error-display/error-display.component.css rename to frontend/src/app/error-display/error-display.component.css diff --git a/src/app/error-display/error-display.component.html b/frontend/src/app/error-display/error-display.component.html similarity index 100% rename from src/app/error-display/error-display.component.html rename to frontend/src/app/error-display/error-display.component.html diff --git a/src/app/error-display/error-display.component.ts b/frontend/src/app/error-display/error-display.component.ts similarity index 100% rename from src/app/error-display/error-display.component.ts rename to frontend/src/app/error-display/error-display.component.ts diff --git a/src/app/graphhopper/geojson.model.ts b/frontend/src/app/graphhopper/geojson.model.ts similarity index 100% rename from src/app/graphhopper/geojson.model.ts rename to frontend/src/app/graphhopper/geojson.model.ts diff --git a/src/app/graphhopper/graphhopper-response.model.ts b/frontend/src/app/graphhopper/graphhopper-response.model.ts similarity index 100% rename from src/app/graphhopper/graphhopper-response.model.ts rename to frontend/src/app/graphhopper/graphhopper-response.model.ts diff --git a/src/app/graphhopper/graphhopper.service.ts b/frontend/src/app/graphhopper/graphhopper.service.ts similarity index 100% rename from src/app/graphhopper/graphhopper.service.ts rename to frontend/src/app/graphhopper/graphhopper.service.ts diff --git a/src/app/graphhopper/path-details.model.ts b/frontend/src/app/graphhopper/path-details.model.ts similarity index 100% rename from src/app/graphhopper/path-details.model.ts rename to frontend/src/app/graphhopper/path-details.model.ts diff --git a/src/app/graphhopper/route-instruction.model.ts b/frontend/src/app/graphhopper/route-instruction.model.ts similarity index 100% rename from src/app/graphhopper/route-instruction.model.ts rename to frontend/src/app/graphhopper/route-instruction.model.ts diff --git a/src/app/graphhopper/route-path.model.ts b/frontend/src/app/graphhopper/route-path.model.ts similarity index 100% rename from src/app/graphhopper/route-path.model.ts rename to frontend/src/app/graphhopper/route-path.model.ts diff --git a/src/app/map-view/edge.model.ts b/frontend/src/app/map-view/edge.model.ts similarity index 100% rename from src/app/map-view/edge.model.ts rename to frontend/src/app/map-view/edge.model.ts diff --git a/src/app/map-view/map-view.component.css b/frontend/src/app/map-view/map-view.component.css similarity index 100% rename from src/app/map-view/map-view.component.css rename to frontend/src/app/map-view/map-view.component.css diff --git a/src/app/map-view/map-view.component.html b/frontend/src/app/map-view/map-view.component.html similarity index 100% rename from src/app/map-view/map-view.component.html rename to frontend/src/app/map-view/map-view.component.html diff --git a/src/app/map-view/map-view.component.spec.ts b/frontend/src/app/map-view/map-view.component.spec.ts similarity index 100% rename from src/app/map-view/map-view.component.spec.ts rename to frontend/src/app/map-view/map-view.component.spec.ts diff --git a/src/app/map-view/map-view.component.ts b/frontend/src/app/map-view/map-view.component.ts similarity index 100% rename from src/app/map-view/map-view.component.ts rename to frontend/src/app/map-view/map-view.component.ts diff --git a/src/app/map-view/map.service.ts b/frontend/src/app/map-view/map.service.ts similarity index 100% rename from src/app/map-view/map.service.ts rename to frontend/src/app/map-view/map.service.ts diff --git a/src/app/map-view/overpass.service.ts b/frontend/src/app/map-view/overpass.service.ts similarity index 100% rename from src/app/map-view/overpass.service.ts rename to frontend/src/app/map-view/overpass.service.ts diff --git a/src/app/map-view/point.model.ts b/frontend/src/app/map-view/point.model.ts similarity index 100% rename from src/app/map-view/point.model.ts rename to frontend/src/app/map-view/point.model.ts diff --git a/src/app/map-view/route.model.ts b/frontend/src/app/map-view/route.model.ts similarity index 100% rename from src/app/map-view/route.model.ts rename to frontend/src/app/map-view/route.model.ts diff --git a/src/app/map-view/utils.ts b/frontend/src/app/map-view/utils.ts similarity index 100% rename from src/app/map-view/utils.ts rename to frontend/src/app/map-view/utils.ts diff --git a/src/app/map-view/way.model.ts b/frontend/src/app/map-view/way.model.ts similarity index 100% rename from src/app/map-view/way.model.ts rename to frontend/src/app/map-view/way.model.ts diff --git a/src/app/route-panel/distance.pipe.ts b/frontend/src/app/route-panel/distance.pipe.ts similarity index 100% rename from src/app/route-panel/distance.pipe.ts rename to frontend/src/app/route-panel/distance.pipe.ts diff --git a/src/app/route-panel/route-panel.component.css b/frontend/src/app/route-panel/route-panel.component.css similarity index 100% rename from src/app/route-panel/route-panel.component.css rename to frontend/src/app/route-panel/route-panel.component.css diff --git a/src/app/route-panel/route-panel.component.html b/frontend/src/app/route-panel/route-panel.component.html similarity index 100% rename from src/app/route-panel/route-panel.component.html rename to frontend/src/app/route-panel/route-panel.component.html diff --git a/src/app/route-panel/route-panel.component.spec.ts b/frontend/src/app/route-panel/route-panel.component.spec.ts similarity index 100% rename from src/app/route-panel/route-panel.component.spec.ts rename to frontend/src/app/route-panel/route-panel.component.spec.ts diff --git a/src/app/route-panel/route-panel.component.ts b/frontend/src/app/route-panel/route-panel.component.ts similarity index 100% rename from src/app/route-panel/route-panel.component.ts rename to frontend/src/app/route-panel/route-panel.component.ts diff --git a/src/app/route-panel/surface-color.pip.ts b/frontend/src/app/route-panel/surface-color.pip.ts similarity index 100% rename from src/app/route-panel/surface-color.pip.ts rename to frontend/src/app/route-panel/surface-color.pip.ts diff --git a/src/app/route-panel/surface.pipe.ts b/frontend/src/app/route-panel/surface.pipe.ts similarity index 100% rename from src/app/route-panel/surface.pipe.ts rename to frontend/src/app/route-panel/surface.pipe.ts diff --git a/src/app/route-panel/time.pipe.ts b/frontend/src/app/route-panel/time.pipe.ts similarity index 100% rename from src/app/route-panel/time.pipe.ts rename to frontend/src/app/route-panel/time.pipe.ts diff --git a/src/environments/environment.development.ts b/frontend/src/environments/environment.development.ts similarity index 100% rename from src/environments/environment.development.ts rename to frontend/src/environments/environment.development.ts diff --git a/src/environments/environment.ts b/frontend/src/environments/environment.ts similarity index 100% rename from src/environments/environment.ts rename to frontend/src/environments/environment.ts diff --git a/src/index.html b/frontend/src/index.html similarity index 100% rename from src/index.html rename to frontend/src/index.html diff --git a/src/main.ts b/frontend/src/main.ts similarity index 100% rename from src/main.ts rename to frontend/src/main.ts diff --git a/src/styles.css b/frontend/src/styles.css similarity index 100% rename from src/styles.css rename to frontend/src/styles.css diff --git a/tailwind.config.js b/frontend/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to frontend/tailwind.config.js diff --git a/tsconfig.app.json b/frontend/tsconfig.app.json similarity index 100% rename from tsconfig.app.json rename to frontend/tsconfig.app.json diff --git a/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from tsconfig.json rename to frontend/tsconfig.json diff --git a/tsconfig.spec.json b/frontend/tsconfig.spec.json similarity index 100% rename from tsconfig.spec.json rename to frontend/tsconfig.spec.json From 0f336ed7ef7d213517e1205aa7147fc52ae215aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Thu, 6 Mar 2025 16:41:53 +0100 Subject: [PATCH 02/28] Add backend stuff --- .gitignore | 1 + backend/.gitattributes | 2 + backend/.gitignore | 33 +++ backend/.mvn/wrapper/maven-wrapper.properties | 19 ++ backend/Dockerfile | 9 + backend/docker-compose.yml | 26 ++ backend/mvnw | 259 ++++++++++++++++++ backend/mvnw.cmd | 149 ++++++++++ backend/pom.xml | 83 ++++++ .../outdoorloop/OutdoorLoopApplication.java | 13 + .../controller/RouteController.java | 27 ++ .../java/com/outdoorloop/model/Route.java | 22 ++ .../repository/RouteRepository.java | 9 + .../src/main/resources/application.properties | 14 + .../OutdoorLoopApplicationTests.java | 13 + 15 files changed, 679 insertions(+) create mode 100644 .gitignore create mode 100644 backend/.gitattributes create mode 100644 backend/.gitignore create mode 100644 backend/.mvn/wrapper/maven-wrapper.properties create mode 100644 backend/Dockerfile create mode 100644 backend/docker-compose.yml create mode 100755 backend/mvnw create mode 100644 backend/mvnw.cmd create mode 100644 backend/pom.xml create mode 100644 backend/src/main/java/com/outdoorloop/OutdoorLoopApplication.java create mode 100644 backend/src/main/java/com/outdoorloop/controller/RouteController.java create mode 100644 backend/src/main/java/com/outdoorloop/model/Route.java create mode 100644 backend/src/main/java/com/outdoorloop/repository/RouteRepository.java create mode 100644 backend/src/main/resources/application.properties create mode 100644 backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845959d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +**/.env \ No newline at end of file diff --git a/backend/.gitattributes b/backend/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/backend/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/backend/.mvn/wrapper/maven-wrapper.properties b/backend/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/backend/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..95dee55 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,9 @@ +FROM eclipse-temurin:17-jdk + +WORKDIR /app + +COPY target/*.jar app.jar + +EXPOSE 8080 + +CMD ["java", "-jar", "app.jar"] diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml new file mode 100644 index 0000000..6995622 --- /dev/null +++ b/backend/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3.8' +services: + postgres: + image: postgres:15 + container_name: outdoorloop-db + restart: always + env_file: .env + ports: + - "5432:5432" + volumes: + - pgdata:/var/lib/postgresql/data + environment: + - POSTGRES_DB=outdoorloop # Creates the database automatically + + backend: + build: . + container_name: outdoorloop-backend + restart: always + depends_on: + - postgres + ports: + - "8080:8080" + env_file: .env + +volumes: + pgdata: diff --git a/backend/mvnw b/backend/mvnw new file mode 100755 index 0000000..19529dd --- /dev/null +++ b/backend/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/backend/mvnw.cmd b/backend/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/backend/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/backend/pom.xml b/backend/pom.xml new file mode 100644 index 0000000..9812b15 --- /dev/null +++ b/backend/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.3 + + + com.outdoorloop + outdoorloop + 0.0.1-SNAPSHOT + OutdoorLoop + Backend for OutdoorLoop, a route-planning app + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.projectlombok + lombok + provided + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/backend/src/main/java/com/outdoorloop/OutdoorLoopApplication.java b/backend/src/main/java/com/outdoorloop/OutdoorLoopApplication.java new file mode 100644 index 0000000..373a0ee --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/OutdoorLoopApplication.java @@ -0,0 +1,13 @@ +package com.outdoorloop; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OutdoorLoopApplication { + + public static void main(String[] args) { + SpringApplication.run(OutdoorLoopApplication.class, args); + } + +} diff --git a/backend/src/main/java/com/outdoorloop/controller/RouteController.java b/backend/src/main/java/com/outdoorloop/controller/RouteController.java new file mode 100644 index 0000000..45abd77 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/controller/RouteController.java @@ -0,0 +1,27 @@ +package com.outdoorloop.controller; + +import com.outdoorloop.model.Route; +import com.outdoorloop.repository.RouteRepository; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/routes") +public class RouteController { + private final RouteRepository routeRepository; + + public RouteController(RouteRepository routeRepository) { + this.routeRepository = routeRepository; + } + + @PostMapping + public Route saveRoute(@RequestBody Route route) { + return routeRepository.save(route); + } + + @GetMapping + public List getAllRoutes() { + return routeRepository.findAll(); + } +} diff --git a/backend/src/main/java/com/outdoorloop/model/Route.java b/backend/src/main/java/com/outdoorloop/model/Route.java new file mode 100644 index 0000000..5719cfd --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/model/Route.java @@ -0,0 +1,22 @@ +package com.outdoorloop.model; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class Route { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // TODO why no @column for these? + private String name; + private String description; + + @Column(columnDefinition = "TEXT") + private String path; +} diff --git a/backend/src/main/java/com/outdoorloop/repository/RouteRepository.java b/backend/src/main/java/com/outdoorloop/repository/RouteRepository.java new file mode 100644 index 0000000..e803cb2 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/repository/RouteRepository.java @@ -0,0 +1,9 @@ +package com.outdoorloop.repository; + +import com.outdoorloop.model.Route; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface RouteRepository extends JpaRepository { +} diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties new file mode 100644 index 0000000..fc8c92d --- /dev/null +++ b/backend/src/main/resources/application.properties @@ -0,0 +1,14 @@ +spring.application.name=OutdoorLoop + +spring.datasource.url=jdbc:postgresql://postgres:5432/outdoorloop +spring.datasource.username=${POSTGRES_USER} +spring.datasource.password=${POSTGRES_PASSWORD} +spring.datasource.driver-class-name=org.postgresql.Driver + +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true + +# temporary +spring.security.user.name=admin +spring.security.user.password=admin \ No newline at end of file diff --git a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java new file mode 100644 index 0000000..745f8cf --- /dev/null +++ b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java @@ -0,0 +1,13 @@ +package com.outdoorloop; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OutdoorLoopApplicationTests { + + @Test + void contextLoads() { + } + +} From 6760c31de3e56013a638c5396d3c1f3d4faa5f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Sat, 8 Mar 2025 21:44:31 +0100 Subject: [PATCH 03/28] Add basis for JWT authentication --- backend/pom.xml | 18 +++++- .../controller/AuthController.java | 46 +++++++++++++++ .../main/java/com/outdoorloop/model/User.java | 33 +++++++++++ .../repository/UserRepository.java | 12 ++++ .../com/outdoorloop/security/JwtFilter.java | 47 +++++++++++++++ .../com/outdoorloop/security/JwtUtil.java | 37 ++++++++++++ .../outdoorloop/security/SecurityConfig.java | 58 +++++++++++++++++++ 7 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 backend/src/main/java/com/outdoorloop/controller/AuthController.java create mode 100644 backend/src/main/java/com/outdoorloop/model/User.java create mode 100644 backend/src/main/java/com/outdoorloop/repository/UserRepository.java create mode 100644 backend/src/main/java/com/outdoorloop/security/JwtFilter.java create mode 100644 backend/src/main/java/com/outdoorloop/security/JwtUtil.java create mode 100644 backend/src/main/java/com/outdoorloop/security/SecurityConfig.java diff --git a/backend/pom.xml b/backend/pom.xml index 9812b15..ae99a6c 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -42,7 +42,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-devtools @@ -69,6 +68,23 @@ lombok provided + + io.jsonwebtoken + jjwt-api + 0.12.6 + + + io.jsonwebtoken + jjwt-impl + 0.12.6 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.12.6 + runtime + diff --git a/backend/src/main/java/com/outdoorloop/controller/AuthController.java b/backend/src/main/java/com/outdoorloop/controller/AuthController.java new file mode 100644 index 0000000..ab2955f --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/controller/AuthController.java @@ -0,0 +1,46 @@ +package com.outdoorloop.controller; + +import com.outdoorloop.model.User; +import com.outdoorloop.repository.UserRepository; +import com.outdoorloop.security.JwtUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Optional; + +@RestController +@RequestMapping("/api/auth") +public class AuthController { + @Autowired + private UserRepository userRepository; + + @Autowired + private JwtUtil jwtUtil; + + @Autowired + private PasswordEncoder passwordEncoder; + + @PostMapping("/register") + public ResponseEntity register(@RequestBody User user) { + user.setPassword(passwordEncoder.encode(user.getPassword())); + userRepository.save(user); + return ResponseEntity.ok("User registered successfully"); + } + + @PostMapping("/login") + public ResponseEntity login(@RequestBody User user) { + Optional foundUser = userRepository.findByUsername(user.getUsername()); + if (foundUser.isPresent() && passwordEncoder.matches(user.getPassword(), foundUser.get().getPassword())) { + String token = jwtUtil.generateToken(user.getUsername()); + return ResponseEntity.ok().body("{\"token\": \"" + token + "\"}"); + } + return ResponseEntity.status(401).body("Invalid credentials"); + } + +} diff --git a/backend/src/main/java/com/outdoorloop/model/User.java b/backend/src/main/java/com/outdoorloop/model/User.java new file mode 100644 index 0000000..01db310 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/model/User.java @@ -0,0 +1,33 @@ +package com.outdoorloop.model; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@Entity +@Table(name="users") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class User implements UserDetails { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true) + private String username; + + private String password; + + // TODO what exactly is this? + @Override + public Collection getAuthorities() { + return List.of(); + } +} diff --git a/backend/src/main/java/com/outdoorloop/repository/UserRepository.java b/backend/src/main/java/com/outdoorloop/repository/UserRepository.java new file mode 100644 index 0000000..d05342b --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/repository/UserRepository.java @@ -0,0 +1,12 @@ +package com.outdoorloop.repository; + +import com.outdoorloop.model.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + Optional findByUsername(String username); +} diff --git a/backend/src/main/java/com/outdoorloop/security/JwtFilter.java b/backend/src/main/java/com/outdoorloop/security/JwtFilter.java new file mode 100644 index 0000000..60f37f3 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/security/JwtFilter.java @@ -0,0 +1,47 @@ +package com.outdoorloop.security; + +import com.outdoorloop.repository.UserRepository; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +public class JwtFilter extends OncePerRequestFilter { + @Autowired + private JwtUtil jwtUtil; + + @Autowired + private UserRepository userRepository; + + @Autowired + private UserDetailsService userDetailsService; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException { + String authHeader = request.getHeader("Authorization"); + + if (authHeader != null && authHeader.startsWith("Bearer ")) { + String token = authHeader.substring(7); + String username = jwtUtil.extractUsername(token); + + if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(authToken); + } + } + chain.doFilter(request, response); + } +} diff --git a/backend/src/main/java/com/outdoorloop/security/JwtUtil.java b/backend/src/main/java/com/outdoorloop/security/JwtUtil.java new file mode 100644 index 0000000..27e22c3 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/security/JwtUtil.java @@ -0,0 +1,37 @@ +package com.outdoorloop.security; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.util.Date; + +@Component +public class JwtUtil { + SecretKey key = Jwts.SIG.HS256.key().build(); + // SecretKey key = Keys.hmacShaKeyFor(Decoders.BASE64.decode("mysecretkey")); + + public String generateToken(String username) { + return Jwts.builder() + .subject(username) + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 10)) // 10 hours + .signWith(key) + .compact(); + } + + public String extractUsername(String token) { + return getClaims(token).getSubject(); + } + + private Claims getClaims(String token) { + return Jwts.parser() + .verifyWith(key) + .build() + .parseSignedClaims(token) + .getPayload(); + } +} diff --git a/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java b/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java new file mode 100644 index 0000000..0905fe7 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java @@ -0,0 +1,58 @@ +package com.outdoorloop.security; + +import com.outdoorloop.repository.UserRepository; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +public class SecurityConfig { + private final UserRepository userRepository; + + public SecurityConfig(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + UserDetailsService userDetailsService() { + return username -> userRepository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found")); + } + + /*@Bean + public AuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); + provider.setUserDetailsService(userDetailsService()); + provider.setPasswordEncoder(passwordEncoder()); + return provider; + }*/ + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http, JwtFilter jwtFilter) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/api/auth/**").permitAll() + .anyRequest().authenticated() + ) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); + + return http.build(); + } +} From 3f77976a71fef6d49ef9b5adf320dc73531081cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 15:14:49 +0100 Subject: [PATCH 04/28] Add dockerfile for frontend and update docker-compose accordingly --- backend/docker-compose.yml => docker-compose.yml | 14 ++++++++++++-- frontend/Dockerfile | 11 +++++++++++ frontend/angular.json | 4 ++-- 3 files changed, 25 insertions(+), 4 deletions(-) rename backend/docker-compose.yml => docker-compose.yml (68%) create mode 100644 frontend/Dockerfile diff --git a/backend/docker-compose.yml b/docker-compose.yml similarity index 68% rename from backend/docker-compose.yml rename to docker-compose.yml index 6995622..10aec96 100644 --- a/backend/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: postgres: - image: postgres:15 + image: postgres:17.4 container_name: outdoorloop-db restart: always env_file: .env @@ -13,7 +13,8 @@ services: - POSTGRES_DB=outdoorloop # Creates the database automatically backend: - build: . + build: + context: ./backend container_name: outdoorloop-backend restart: always depends_on: @@ -22,5 +23,14 @@ services: - "8080:8080" env_file: .env + frontend: + build: + context: ./frontend + container_name: outdoorloop-frontend + ports: + - "3000:80" + depends_on: + - backend + volumes: pgdata: diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000..6fe2e45 --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,11 @@ +FROM node:18 as build +WORKDIR /app +COPY package.json package-lock.json ./ +RUN npm install +COPY . . +RUN npm run build --prod + +FROM nginx:alpine +COPY --from=build /app/dist/outdoorloop/browser /usr/share/nginx/html +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/frontend/angular.json b/frontend/angular.json index 23a5034..b9a3aaa 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -37,8 +37,8 @@ "budgets": [ { "type": "initial", - "maximumWarning": "500kB", - "maximumError": "1MB" + "maximumWarning": "2mb", + "maximumError": "3mb" }, { "type": "anyComponentStyle", From 477486077d8e6697299cd077ee4b45982d010528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 15:18:36 +0100 Subject: [PATCH 05/28] Add DB migration with flyway --- backend/pom.xml | 9 +++++++++ backend/src/main/resources/application.properties | 7 +------ .../src/main/resources/db/migration/V1__init.sql | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V1__init.sql diff --git a/backend/pom.xml b/backend/pom.xml index ae99a6c..547e5d1 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -85,6 +85,15 @@ 0.12.6 runtime + + org.flywaydb + flyway-core + 11.3.4 + + + org.flywaydb + flyway-database-postgresql + diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index fc8c92d..11ad93e 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,9 +6,4 @@ spring.datasource.password=${POSTGRES_PASSWORD} spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true - -# temporary -spring.security.user.name=admin -spring.security.user.password=admin \ No newline at end of file +spring.jpa.show-sql=true \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V1__init.sql b/backend/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..e3e2d5f --- /dev/null +++ b/backend/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,14 @@ +create table route ( + id bigint generated by default as identity, + description varchar(255), + name varchar(255), + path TEXT, + primary key (id) +); + +create table users ( + id bigint generated by default as identity, + password varchar(255), + username varchar(255) unique, + primary key (id) +); \ No newline at end of file From 2e4b59d62dbb451b0169ee6d486fec39af9121b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 16:10:46 +0100 Subject: [PATCH 06/28] Add H2 for testing --- backend/pom.xml | 6 ++++++ .../java/com/outdoorloop/OutdoorLoopApplicationTests.java | 3 +++ backend/src/test/resources/application-test.properties | 5 +++++ backend/src/test/resources/data.sql | 1 + 4 files changed, 15 insertions(+) create mode 100644 backend/src/test/resources/application-test.properties create mode 100644 backend/src/test/resources/data.sql diff --git a/backend/pom.xml b/backend/pom.xml index 547e5d1..df0a63e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -94,6 +94,12 @@ org.flywaydb flyway-database-postgresql + + com.h2database + h2 + 2.1.214 + test + diff --git a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java index 745f8cf..c651c98 100644 --- a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java +++ b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java @@ -2,8 +2,11 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.TestPropertySource; @SpringBootTest +@ActiveProfiles("test") class OutdoorLoopApplicationTests { @Test diff --git a/backend/src/test/resources/application-test.properties b/backend/src/test/resources/application-test.properties new file mode 100644 index 0000000..730dded --- /dev/null +++ b/backend/src/test/resources/application-test.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect \ No newline at end of file diff --git a/backend/src/test/resources/data.sql b/backend/src/test/resources/data.sql new file mode 100644 index 0000000..a54b808 --- /dev/null +++ b/backend/src/test/resources/data.sql @@ -0,0 +1 @@ +INSERT INTO users(id, password, username) VALUES (0, 'test', 'test'); From ae77088e3168b4793903c8ef8fb3c45a90dfff83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 16:21:17 +0100 Subject: [PATCH 07/28] Add basic test based on test data --- .../OutdoorLoopApplicationTests.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java index c651c98..fb8e9b4 100644 --- a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java +++ b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java @@ -1,16 +1,34 @@ package com.outdoorloop; +import com.outdoorloop.model.User; +import com.outdoorloop.repository.UserRepository; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + @SpringBootTest @ActiveProfiles("test") +@Transactional class OutdoorLoopApplicationTests { @Test void contextLoads() { } + @Autowired + private UserRepository userRepository; + + @Test + public void testUserExistsInDatabase() { + Optional foundUser = userRepository.findByUsername("test"); + assertTrue(foundUser.isPresent(), "User should be present in the database"); + } } From 69114d4b2190a6b337c8ecc2c35934473101d7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 16:28:56 +0100 Subject: [PATCH 08/28] Add basic CI configuration --- .github/ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/ci.yml diff --git a/.github/ci.yml b/.github/ci.yml new file mode 100644 index 0000000..ce9e996 --- /dev/null +++ b/.github/ci.yml @@ -0,0 +1,74 @@ +name: CI Pipeline + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + frontend: + runs-on: ubuntu-latest + + steps: + # Checkout the code + - name: Checkout code + uses: actions/checkout@v3 + + # Set up Node.js environment + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + + # Install dependencies and run tests + - name: Install dependencies and run frontend tests + run: | + cd frontend + npm install + npm run test -- --watch=false --browsers=ChromeHeadless + + backend: + runs-on: ubuntu-latest + + steps: + # Checkout the code + - name: Checkout code + uses: actions/checkout@v3 + + # Set up Java environment + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adoptopenjdk' + + # Install dependencies and run tests + - name: Install dependencies and run backend tests + run: | + cd backend + ./mvnw clean install + ./mvnw test # Run tests using Maven (or use Gradle if you prefer) + + # Optional: You can add a build job that builds both the frontend and backend if you want + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + # Build frontend + - name: Build frontend + run: | + cd frontend + npm install + npm run build --prod + + # Build backend + - name: Build backend + run: | + cd backend + ./mvnw clean install From f86d188b49573711f8b2107e5c7b77edfd9cdf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 16:31:17 +0100 Subject: [PATCH 09/28] Fix branch name --- .github/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ci.yml b/.github/ci.yml index ce9e996..c8df082 100644 --- a/.github/ci.yml +++ b/.github/ci.yml @@ -3,10 +3,10 @@ name: CI Pipeline on: push: branches: - - main + - master pull_request: branches: - - main + - master jobs: frontend: From 8fdc4cb8cf8e48ac16915592104227d21e875774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 10 Mar 2025 16:33:51 +0100 Subject: [PATCH 10/28] Fix CI config --- .github/{ => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/ci.yml (100%) diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/ci.yml rename to .github/workflows/ci.yml From 29d11a9d28f79ba655a856d4c16a77ebcd7619a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Tue, 11 Mar 2025 15:06:56 +0100 Subject: [PATCH 11/28] Fix angular tests --- frontend/src/app/app.component.spec.ts | 13 ++++++------- .../src/app/map-view/map-view.component.spec.ts | 8 +++++++- .../app/route-panel/route-panel.component.spec.ts | 8 +++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/app.component.spec.ts b/frontend/src/app/app.component.spec.ts index 67b8d69..49ca957 100644 --- a/frontend/src/app/app.component.spec.ts +++ b/frontend/src/app/app.component.spec.ts @@ -1,10 +1,16 @@ import { TestBed } from '@angular/core/testing'; import { AppComponent } from './app.component'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; describe('AppComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [AppComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + ] }).compileComponents(); }); @@ -19,11 +25,4 @@ describe('AppComponent', () => { const app = fixture.componentInstance; expect(app.title).toEqual('outdoorloop'); }); - - it('should render title', () => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('h1')?.textContent).toContain('Hello, outdoorloop'); - }); }); diff --git a/frontend/src/app/map-view/map-view.component.spec.ts b/frontend/src/app/map-view/map-view.component.spec.ts index 9d46ac6..b267220 100644 --- a/frontend/src/app/map-view/map-view.component.spec.ts +++ b/frontend/src/app/map-view/map-view.component.spec.ts @@ -1,6 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MapViewComponent } from './map-view.component'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; describe('MapViewComponent', () => { let component: MapViewComponent; @@ -8,7 +10,11 @@ describe('MapViewComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [MapViewComponent] + imports: [MapViewComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + ] }) .compileComponents(); diff --git a/frontend/src/app/route-panel/route-panel.component.spec.ts b/frontend/src/app/route-panel/route-panel.component.spec.ts index 0e9cf6d..c1fa329 100644 --- a/frontend/src/app/route-panel/route-panel.component.spec.ts +++ b/frontend/src/app/route-panel/route-panel.component.spec.ts @@ -1,6 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RoutePanelComponent } from './route-panel.component'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; describe('RoutePanelComponent', () => { let component: RoutePanelComponent; @@ -8,7 +10,11 @@ describe('RoutePanelComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RoutePanelComponent] + imports: [RoutePanelComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + ] }) .compileComponents(); From 230956a40a07e518262cfc5ef7432ae37aea3d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Tue, 11 Mar 2025 15:11:35 +0100 Subject: [PATCH 12/28] Fix java version in CI config --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8df082..8293273 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,8 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: + distribution: 'adopt' java-version: '17' - distribution: 'adoptopenjdk' # Install dependencies and run tests - name: Install dependencies and run backend tests From 035b58355a1126b6a8210a8440864e2858412cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Tue, 11 Mar 2025 16:20:45 +0100 Subject: [PATCH 13/28] Basic routing setup --- frontend/src/app/app.component.html | 61 +------------------ frontend/src/app/app.component.ts | 5 +- frontend/src/app/app.routes.ts | 10 ++- frontend/src/app/auth/login.component.css | 0 frontend/src/app/auth/login.component.html | 1 + frontend/src/app/auth/login.component.spec.ts | 23 +++++++ frontend/src/app/auth/login.component.ts | 11 ++++ frontend/src/app/auth/signup.component.css | 0 frontend/src/app/auth/signup.component.html | 1 + .../src/app/auth/signup.component.spec.ts | 23 +++++++ frontend/src/app/auth/signup.component.ts | 11 ++++ .../route-planner/route-planner.component.css | 0 .../route-planner.component.html | 60 ++++++++++++++++++ .../route-planner.component.spec.ts | 23 +++++++ .../route-planner/route-planner.component.ts | 16 +++++ 15 files changed, 180 insertions(+), 65 deletions(-) create mode 100644 frontend/src/app/auth/login.component.css create mode 100644 frontend/src/app/auth/login.component.html create mode 100644 frontend/src/app/auth/login.component.spec.ts create mode 100644 frontend/src/app/auth/login.component.ts create mode 100644 frontend/src/app/auth/signup.component.css create mode 100644 frontend/src/app/auth/signup.component.html create mode 100644 frontend/src/app/auth/signup.component.spec.ts create mode 100644 frontend/src/app/auth/signup.component.ts create mode 100644 frontend/src/app/route-planner/route-planner.component.css create mode 100644 frontend/src/app/route-planner/route-planner.component.html create mode 100644 frontend/src/app/route-planner/route-planner.component.spec.ts create mode 100644 frontend/src/app/route-planner/route-planner.component.ts diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 24628ce..90c6b64 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -1,60 +1 @@ -
- - - -
-
- -
- -
- - -
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 0daeaff..dbf198c 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,13 +1,10 @@ import { Component } from '@angular/core'; import { RouterOutlet } from '@angular/router'; -import { MapViewComponent } from "./map-view/map-view.component"; -import { RoutePanelComponent } from "./route-panel/route-panel.component"; -import { ErrorDisplayComponent } from "./error-display/error-display.component"; import { MapService } from './map-view/map.service'; @Component({ selector: 'app-root', - imports: [RouterOutlet, MapViewComponent, RoutePanelComponent, ErrorDisplayComponent], + imports: [RouterOutlet], templateUrl: './app.component.html', styleUrl: './app.component.css' }) diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index dc39edb..93cd029 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -1,3 +1,11 @@ import { Routes } from '@angular/router'; +import { RoutePlannerComponent } from './route-planner/route-planner.component'; +import { LoginComponent } from './auth/login.component'; +import { SignupComponent } from './auth/signup.component'; -export const routes: Routes = []; +export const routes: Routes = [ + { path: 'route-planner', component: RoutePlannerComponent }, + { path: 'login', component: LoginComponent }, + { path: 'signup', component: SignupComponent }, + { path: '', redirectTo: '/route-planner', pathMatch: 'full' } +]; diff --git a/frontend/src/app/auth/login.component.css b/frontend/src/app/auth/login.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/auth/login.component.html b/frontend/src/app/auth/login.component.html new file mode 100644 index 0000000..147cfc4 --- /dev/null +++ b/frontend/src/app/auth/login.component.html @@ -0,0 +1 @@ +

login works!

diff --git a/frontend/src/app/auth/login.component.spec.ts b/frontend/src/app/auth/login.component.spec.ts new file mode 100644 index 0000000..18f3685 --- /dev/null +++ b/frontend/src/app/auth/login.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginComponent } from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [LoginComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/auth/login.component.ts b/frontend/src/app/auth/login.component.ts new file mode 100644 index 0000000..b3f2e24 --- /dev/null +++ b/frontend/src/app/auth/login.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-login', + imports: [], + templateUrl: './login.component.html', + styleUrl: './login.component.css' +}) +export class LoginComponent { + +} diff --git a/frontend/src/app/auth/signup.component.css b/frontend/src/app/auth/signup.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/auth/signup.component.html b/frontend/src/app/auth/signup.component.html new file mode 100644 index 0000000..c9ce9ad --- /dev/null +++ b/frontend/src/app/auth/signup.component.html @@ -0,0 +1 @@ +

signup works!

diff --git a/frontend/src/app/auth/signup.component.spec.ts b/frontend/src/app/auth/signup.component.spec.ts new file mode 100644 index 0000000..77fbd6e --- /dev/null +++ b/frontend/src/app/auth/signup.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SignupComponent } from './signup.component'; + +describe('SignupComponent', () => { + let component: SignupComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SignupComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(SignupComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/auth/signup.component.ts b/frontend/src/app/auth/signup.component.ts new file mode 100644 index 0000000..1613e6c --- /dev/null +++ b/frontend/src/app/auth/signup.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-signup', + imports: [], + templateUrl: './signup.component.html', + styleUrl: './signup.component.css' +}) +export class SignupComponent { + +} diff --git a/frontend/src/app/route-planner/route-planner.component.css b/frontend/src/app/route-planner/route-planner.component.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/route-planner/route-planner.component.html b/frontend/src/app/route-planner/route-planner.component.html new file mode 100644 index 0000000..22111a0 --- /dev/null +++ b/frontend/src/app/route-planner/route-planner.component.html @@ -0,0 +1,60 @@ +
+ + + +
+
+ +
+ +
+ + +
+
+
\ No newline at end of file diff --git a/frontend/src/app/route-planner/route-planner.component.spec.ts b/frontend/src/app/route-planner/route-planner.component.spec.ts new file mode 100644 index 0000000..7b82435 --- /dev/null +++ b/frontend/src/app/route-planner/route-planner.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RoutePlannerComponent } from './route-planner.component'; + +describe('RoutePlannerComponent', () => { + let component: RoutePlannerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [RoutePlannerComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(RoutePlannerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/route-planner/route-planner.component.ts b/frontend/src/app/route-planner/route-planner.component.ts new file mode 100644 index 0000000..15b75bf --- /dev/null +++ b/frontend/src/app/route-planner/route-planner.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { MapViewComponent } from '../map-view/map-view.component'; +import { RoutePanelComponent } from '../route-panel/route-panel.component'; +import { ErrorDisplayComponent } from '../error-display/error-display.component'; +import { MapService } from '../map-view/map.service'; +import { RouterLink } from '@angular/router'; + +@Component({ + selector: 'app-route-planner', + imports: [MapViewComponent, RoutePanelComponent, ErrorDisplayComponent, RouterLink], + templateUrl: './route-planner.component.html', + styleUrl: './route-planner.component.css' +}) +export class RoutePlannerComponent { + constructor(public mapService: MapService) {} +} From cca86cc93b2cbf2270a3f6ff1ec75574a349ad94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Tue, 11 Mar 2025 17:05:40 +0100 Subject: [PATCH 14/28] Add layout for login and signup --- frontend/src/app/auth/login.component.html | 38 +++++++++++++++++- frontend/src/app/auth/signup.component.html | 44 ++++++++++++++++++++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/auth/login.component.html b/frontend/src/app/auth/login.component.html index 147cfc4..f425537 100644 --- a/frontend/src/app/auth/login.component.html +++ b/frontend/src/app/auth/login.component.html @@ -1 +1,37 @@ -

login works!

+ + +
+
+
+

Login

+ +
+ + + + +
+ +
+ +
+

+ No account yet? Sign up +

+
+
+
\ No newline at end of file diff --git a/frontend/src/app/auth/signup.component.html b/frontend/src/app/auth/signup.component.html index c9ce9ad..be98849 100644 --- a/frontend/src/app/auth/signup.component.html +++ b/frontend/src/app/auth/signup.component.html @@ -1 +1,43 @@ -

signup works!

+ + +
+
+
+

Register a new account

+ +
+ + + + + + +
+ +
+
+

+ Already have an account? Sign in +

+
+
+
\ No newline at end of file From 404280a40ff123ed2ba5d25dc1eda228a57bc664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Tue, 11 Mar 2025 23:15:29 +0100 Subject: [PATCH 15/28] Add form validation for signup --- frontend/src/app/auth/signup.component.html | 46 ++++++++++++++++++--- frontend/src/app/auth/signup.component.ts | 22 +++++++++- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/auth/signup.component.html b/frontend/src/app/auth/signup.component.html index be98849..a917f84 100644 --- a/frontend/src/app/auth/signup.component.html +++ b/frontend/src/app/auth/signup.component.html @@ -9,29 +9,65 @@

Register a new account

-
+
+
diff --git a/frontend/src/app/auth/signup.component.ts b/frontend/src/app/auth/signup.component.ts index 1613e6c..f4c1ad1 100644 --- a/frontend/src/app/auth/signup.component.ts +++ b/frontend/src/app/auth/signup.component.ts @@ -1,11 +1,31 @@ import { Component } from '@angular/core'; +import { FormControl, FormGroup, ReactiveFormsModule, ValidatorFn, Validators } from '@angular/forms'; @Component({ selector: 'app-signup', - imports: [], + imports: [ReactiveFormsModule], templateUrl: './signup.component.html', styleUrl: './signup.component.css' }) export class SignupComponent { + signupForm = new FormGroup({ + email: new FormControl('', [ + Validators.required, + Validators.email + // TODO check that is is not used + ]), + password: new FormControl('', [ + Validators.required, + Validators.minLength(8), + ]), + passwordConfirmation: new FormControl('') + }, { validators: (control) => control.get('password').value === control.get('passwordConfirmation').value ? null : { passwordDoNotMatch: true } }) + onSubmit() { + this.signupForm.markAllAsTouched(); // Marks all controls as touched to trigger validation + if (this.signupForm.invalid) { + return; + } + + } } From f18374b375c12f9c9f7f8edfa1f8ecd404f33d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Wed, 12 Mar 2025 15:37:48 +0100 Subject: [PATCH 16/28] Add form validation for login --- frontend/src/app/auth/login.component.html | 28 ++++++++++++++++++---- frontend/src/app/auth/login.component.ts | 17 ++++++++++++- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/auth/login.component.html b/frontend/src/app/auth/login.component.html index f425537..8e857d4 100644 --- a/frontend/src/app/auth/login.component.html +++ b/frontend/src/app/auth/login.component.html @@ -9,19 +9,39 @@

Login

-
+
diff --git a/frontend/src/app/auth/login.component.ts b/frontend/src/app/auth/login.component.ts index b3f2e24..0615bfd 100644 --- a/frontend/src/app/auth/login.component.ts +++ b/frontend/src/app/auth/login.component.ts @@ -1,11 +1,26 @@ import { Component } from '@angular/core'; +import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; @Component({ selector: 'app-login', - imports: [], + imports: [ReactiveFormsModule], templateUrl: './login.component.html', styleUrl: './login.component.css' }) export class LoginComponent { + loginForm = new FormGroup ({ + email: new FormControl('', [ + Validators.required + ]), + password: new FormControl('', [ + Validators.required + ]) + }) + onSubmit() { + this.loginForm.markAllAsTouched(); // Marks all controls as touched to trigger validation + if (this.loginForm.invalid) { + return; + } + } } From 3d4b277afd7a176db8f273066207321fa4a01532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Wed, 12 Mar 2025 17:44:20 +0100 Subject: [PATCH 17/28] Add validation constraints for authentication --- backend/pom.xml | 4 ++ .../controller/AuthController.java | 42 +++++++++++++------ .../main/java/com/outdoorloop/model/User.java | 7 ++++ .../com/outdoorloop/model/UserLoginDTO.java | 22 ++++++++++ .../model/UserRegistrationDTO.java | 22 ++++++++++ .../outdoorloop/validation/UniqueEmail.java | 19 +++++++++ .../validation/UniqueEmailValidator.java | 16 +++++++ 7 files changed, 120 insertions(+), 12 deletions(-) create mode 100644 backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java create mode 100644 backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java create mode 100644 backend/src/main/java/com/outdoorloop/validation/UniqueEmail.java create mode 100644 backend/src/main/java/com/outdoorloop/validation/UniqueEmailValidator.java diff --git a/backend/pom.xml b/backend/pom.xml index df0a63e..70caf5d 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -63,6 +63,10 @@ spring-security-test test + + org.springframework.boot + spring-boot-starter-validation + org.projectlombok lombok diff --git a/backend/src/main/java/com/outdoorloop/controller/AuthController.java b/backend/src/main/java/com/outdoorloop/controller/AuthController.java index ab2955f..468df7e 100644 --- a/backend/src/main/java/com/outdoorloop/controller/AuthController.java +++ b/backend/src/main/java/com/outdoorloop/controller/AuthController.java @@ -1,17 +1,22 @@ package com.outdoorloop.controller; import com.outdoorloop.model.User; +import com.outdoorloop.model.UserLoginDTO; +import com.outdoorloop.model.UserRegistrationDTO; import com.outdoorloop.repository.UserRepository; import com.outdoorloop.security.JwtUtil; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; @RestController @@ -27,20 +32,33 @@ public class AuthController { private PasswordEncoder passwordEncoder; @PostMapping("/register") - public ResponseEntity register(@RequestBody User user) { - user.setPassword(passwordEncoder.encode(user.getPassword())); + public ResponseEntity register(@Valid @RequestBody UserRegistrationDTO userRegistrationDTO) { + User user = new User(); + user.setUsername(userRegistrationDTO.getUsername()); + user.setPassword(passwordEncoder.encode(userRegistrationDTO.getPassword())); userRepository.save(user); return ResponseEntity.ok("User registered successfully"); } @PostMapping("/login") - public ResponseEntity login(@RequestBody User user) { - Optional foundUser = userRepository.findByUsername(user.getUsername()); - if (foundUser.isPresent() && passwordEncoder.matches(user.getPassword(), foundUser.get().getPassword())) { - String token = jwtUtil.generateToken(user.getUsername()); - return ResponseEntity.ok().body("{\"token\": \"" + token + "\"}"); + public ResponseEntity login(@Valid @RequestBody UserLoginDTO userLoginDTO) { + Optional foundUser = userRepository.findByUsername(userLoginDTO.getUsername()); + if (foundUser.isPresent() && passwordEncoder.matches(userLoginDTO.getPassword(), foundUser.get().getPassword())) { + String token = jwtUtil.generateToken(foundUser.get().getUsername()); + return ResponseEntity.ok().body(Map.of("token", token)); } - return ResponseEntity.status(401).body("Invalid credentials"); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid credentials"); } + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MethodArgumentNotValidException.class) + public Map handleValidationExceptions(MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + ex.getBindingResult().getAllErrors().forEach((error) -> { + String fieldName = ((FieldError) error).getField(); + String errorMessage = error.getDefaultMessage(); + errors.put(fieldName, errorMessage); + }); + return errors; + } } diff --git a/backend/src/main/java/com/outdoorloop/model/User.java b/backend/src/main/java/com/outdoorloop/model/User.java index 01db310..a97dcb9 100644 --- a/backend/src/main/java/com/outdoorloop/model/User.java +++ b/backend/src/main/java/com/outdoorloop/model/User.java @@ -1,6 +1,10 @@ package com.outdoorloop.model; import jakarta.persistence.*; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.*; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -21,8 +25,11 @@ public class User implements UserDetails { private Long id; @Column(unique = true) + @NotNull + @Email private String username; + @NotNull private String password; // TODO what exactly is this? diff --git a/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java new file mode 100644 index 0000000..52733ff --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java @@ -0,0 +1,22 @@ +package com.outdoorloop.model; + +import com.outdoorloop.validation.UniqueEmail; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class UserLoginDTO { + @Email + @NotNull + private String username; + + @NotBlank + private String password; +} \ No newline at end of file diff --git a/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java new file mode 100644 index 0000000..4745c7b --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java @@ -0,0 +1,22 @@ +package com.outdoorloop.model; + +import com.outdoorloop.validation.UniqueEmail; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ToString +public class UserRegistrationDTO { + @Email + @NotNull + @UniqueEmail + private String username; + + @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$") + private String password; +} diff --git a/backend/src/main/java/com/outdoorloop/validation/UniqueEmail.java b/backend/src/main/java/com/outdoorloop/validation/UniqueEmail.java new file mode 100644 index 0000000..d7260cc --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/validation/UniqueEmail.java @@ -0,0 +1,19 @@ +package com.outdoorloop.validation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.constraints.Email; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = UniqueEmailValidator.class) +public @interface UniqueEmail { + String message() default "User already exists"; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/backend/src/main/java/com/outdoorloop/validation/UniqueEmailValidator.java b/backend/src/main/java/com/outdoorloop/validation/UniqueEmailValidator.java new file mode 100644 index 0000000..5b8fe45 --- /dev/null +++ b/backend/src/main/java/com/outdoorloop/validation/UniqueEmailValidator.java @@ -0,0 +1,16 @@ +package com.outdoorloop.validation; + +import com.outdoorloop.repository.UserRepository; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.beans.factory.annotation.Autowired; + +public class UniqueEmailValidator implements ConstraintValidator { + @Autowired + private UserRepository userRepository; + + @Override + public boolean isValid(String email, ConstraintValidatorContext constraintValidatorContext) { + return email != null && userRepository.findByUsername(email).isEmpty(); + } +} From 51dddb20d744e9f2467156f479f89bb526478b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Wed, 12 Mar 2025 18:35:30 +0100 Subject: [PATCH 18/28] Fix bug allowing empty email for registering and logging --- backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java | 2 +- .../main/java/com/outdoorloop/model/UserRegistrationDTO.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java index 52733ff..2f7e874 100644 --- a/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java +++ b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java @@ -14,7 +14,7 @@ @ToString public class UserLoginDTO { @Email - @NotNull + @NotBlank private String username; @NotBlank diff --git a/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java index 4745c7b..ce27a24 100644 --- a/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java +++ b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java @@ -2,6 +2,7 @@ import com.outdoorloop.validation.UniqueEmail; import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.*; @@ -13,7 +14,7 @@ @ToString public class UserRegistrationDTO { @Email - @NotNull + @NotBlank @UniqueEmail private String username; From d933918c248f35a1431a48256075a775681e039f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Wed, 12 Mar 2025 18:35:59 +0100 Subject: [PATCH 19/28] Add tests for authentication controllers --- .../com/outdoorloop/AuthControllerTests.java | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 backend/src/test/java/com/outdoorloop/AuthControllerTests.java diff --git a/backend/src/test/java/com/outdoorloop/AuthControllerTests.java b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java new file mode 100644 index 0000000..f8c01bd --- /dev/null +++ b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java @@ -0,0 +1,96 @@ +package com.outdoorloop; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; + +import java.util.Map; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest +@ActiveProfiles("test") +@AutoConfigureMockMvc +@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) +public class AuthControllerTests { + @Autowired + private MockMvc mockMvc; + + @Autowired + private ObjectMapper objectMapper; + + ResultActions registerWith(String email, String password) throws Exception { + Map requestBody = Map.of("username", email, "password", password); + return mockMvc.perform( + post("/api/auth/register") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(requestBody)) + ); + } + + ResultActions loginWith(String email, String password) throws Exception { + Map requestBody = Map.of("username", email, "password", password); + return mockMvc.perform( + post("/api/auth/login") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(requestBody)) + ); + } + + @Test + void registerWithEmptyEmail() throws Exception { + registerWith("", "aaaaaaaA1").andExpect(status().isBadRequest()); + } + + @Test + void registerWithInvalidEmail() throws Exception { + registerWith("testgmail.com", "aaaaaaaA1").andExpect(status().isBadRequest()); + } + + @Test + void registerWithInvalidPassword() throws Exception { + registerWith("test@gmail.com", "aaaaaaaa").andExpect(status().isBadRequest()); + } + + @Test + void registerWithValidCredentials() throws Exception { + registerWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isOk()); + } + + @Test + void registerWithExistingEmail() throws Exception { + registerWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isOk()); + registerWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isBadRequest()); + } + + @Test + void registerWithDifferentEmails() throws Exception { + registerWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isOk()); + registerWith("test2@gmail.com", "aaaaaaaA1").andExpect(status().isOk()); + } + + @Test + void loginWithEmptyEmail() throws Exception { + loginWith("", "aaaaaaaA1").andExpect(status().isBadRequest()); + } + + @Test + void loginWithUnregisteredCredentials() throws Exception { + loginWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isUnauthorized()); + } + + @Test + void loginWithRegisteredCredentials() throws Exception { + registerWith("test@gmail.com", "aaaaaaaA1"); + loginWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isOk()).andExpect(jsonPath("$.token").exists()); + } +} From 890f7784c7036db59e0bf3ae7aad7ff4a731d845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Wed, 12 Mar 2025 19:16:19 +0100 Subject: [PATCH 20/28] Remove bad test setup --- .../OutdoorLoopApplicationTests.java | 34 ------------------- backend/src/test/resources/data.sql | 1 - 2 files changed, 35 deletions(-) delete mode 100644 backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java delete mode 100644 backend/src/test/resources/data.sql diff --git a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java b/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java deleted file mode 100644 index fb8e9b4..0000000 --- a/backend/src/test/java/com/outdoorloop/OutdoorLoopApplicationTests.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.outdoorloop; - -import com.outdoorloop.model.User; -import com.outdoorloop.repository.UserRepository; -import jakarta.transaction.Transactional; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.TestPropertySource; - -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -@SpringBootTest -@ActiveProfiles("test") -@Transactional -class OutdoorLoopApplicationTests { - - @Test - void contextLoads() { - } - - @Autowired - private UserRepository userRepository; - - @Test - public void testUserExistsInDatabase() { - Optional foundUser = userRepository.findByUsername("test"); - assertTrue(foundUser.isPresent(), "User should be present in the database"); - } -} diff --git a/backend/src/test/resources/data.sql b/backend/src/test/resources/data.sql deleted file mode 100644 index a54b808..0000000 --- a/backend/src/test/resources/data.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO users(id, password, username) VALUES (0, 'test', 'test'); From ff4e809ba17a926863d09fbc8167ffc3402623b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Fri, 4 Apr 2025 11:51:05 +0200 Subject: [PATCH 21/28] Add missing provideRouter in component testbed --- .../app/route-planner/route-planner.component.spec.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/route-planner/route-planner.component.spec.ts b/frontend/src/app/route-planner/route-planner.component.spec.ts index 7b82435..805d049 100644 --- a/frontend/src/app/route-planner/route-planner.component.spec.ts +++ b/frontend/src/app/route-planner/route-planner.component.spec.ts @@ -1,6 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RoutePlannerComponent } from './route-planner.component'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; +import { routes } from '../app.routes'; describe('RoutePlannerComponent', () => { let component: RoutePlannerComponent; @@ -8,7 +12,12 @@ describe('RoutePlannerComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RoutePlannerComponent] + imports: [RoutePlannerComponent], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + provideRouter(routes), + ] }) .compileComponents(); From 0fea9ef99b6e510468ee46e5c0eb0f9eebfbc760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Fri, 4 Apr 2025 11:51:27 +0200 Subject: [PATCH 22/28] Add missing spec for error display --- .../error-display.component.spec.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 frontend/src/app/error-display/error-display.component.spec.ts diff --git a/frontend/src/app/error-display/error-display.component.spec.ts b/frontend/src/app/error-display/error-display.component.spec.ts new file mode 100644 index 0000000..75958f3 --- /dev/null +++ b/frontend/src/app/error-display/error-display.component.spec.ts @@ -0,0 +1,26 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ErrorDisplayComponent } from './error-display.component'; +import { Subject } from 'rxjs'; + +describe('ErrorDisplayComponent', () => { + let component: ErrorDisplayComponent; + let fixture: ComponentFixture; + let error = new Subject(); + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ErrorDisplayComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ErrorDisplayComponent); + component = fixture.componentInstance; + component.errorStream = error.asObservable(); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); From 3ca0a4fb62aab438083e5cded90d940db81a7812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Fri, 4 Apr 2025 11:52:08 +0200 Subject: [PATCH 23/28] Update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 845959d..11c5cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -**/.env \ No newline at end of file +**/.env +.vscode/ \ No newline at end of file From b3992b6d75db45d37570392abbf528eb8ddadd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 13 Jul 2026 18:02:37 +0200 Subject: [PATCH 24/28] Fix java version in .java-version to avoid Lombok issues --- .java-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..98d9bcb --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 From 73a32e66128aac744df623ed4d9732ef660f5264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 13 Jul 2026 18:19:24 +0200 Subject: [PATCH 25/28] Put JWT in a cookie instead of returning it as a token in the body --- .../com/outdoorloop/controller/AuthController.java | 12 +++++++++++- .../java/com/outdoorloop/AuthControllerTests.java | 10 ++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/outdoorloop/controller/AuthController.java b/backend/src/main/java/com/outdoorloop/controller/AuthController.java index 468df7e..762ece7 100644 --- a/backend/src/main/java/com/outdoorloop/controller/AuthController.java +++ b/backend/src/main/java/com/outdoorloop/controller/AuthController.java @@ -8,6 +8,7 @@ import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -45,7 +46,16 @@ public ResponseEntity login(@Valid @RequestBody UserLoginDTO userLoginDTO) { Optional foundUser = userRepository.findByUsername(userLoginDTO.getUsername()); if (foundUser.isPresent() && passwordEncoder.matches(userLoginDTO.getPassword(), foundUser.get().getPassword())) { String token = jwtUtil.generateToken(foundUser.get().getUsername()); - return ResponseEntity.ok().body(Map.of("token", token)); + + ResponseCookie tokenCookie = ResponseCookie.from("token", token) + .httpOnly(true) + .path("/") + .maxAge(60 * 60 * 10) + .build(); + + return ResponseEntity.ok() + .header("Set-Cookie", tokenCookie.toString()) + .build(); } return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid credentials"); } diff --git a/backend/src/test/java/com/outdoorloop/AuthControllerTests.java b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java index f8c01bd..0a58006 100644 --- a/backend/src/test/java/com/outdoorloop/AuthControllerTests.java +++ b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java @@ -14,7 +14,8 @@ import java.util.Map; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @SpringBootTest @@ -91,6 +92,11 @@ void loginWithUnregisteredCredentials() throws Exception { @Test void loginWithRegisteredCredentials() throws Exception { registerWith("test@gmail.com", "aaaaaaaA1"); - loginWith("test@gmail.com", "aaaaaaaA1").andExpect(status().isOk()).andExpect(jsonPath("$.token").exists()); + loginWith("test@gmail.com", "aaaaaaaA1") + .andExpect(status().isOk()) + .andExpect(content().string("")) + .andExpect(cookie().exists("token")) + .andExpect(cookie().httpOnly("token", true)) + .andExpect(cookie().path("token", "/")); } } From 7b7e32203e2f73415f191789b41f2fbb647743b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 13 Jul 2026 18:41:16 +0200 Subject: [PATCH 26/28] Change JWT filter to now use cookie --- .../com/outdoorloop/security/JwtFilter.java | 45 ++++++++++++------- .../com/outdoorloop/AuthControllerTests.java | 23 ++++++++++ 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/com/outdoorloop/security/JwtFilter.java b/backend/src/main/java/com/outdoorloop/security/JwtFilter.java index 60f37f3..65ffaaa 100644 --- a/backend/src/main/java/com/outdoorloop/security/JwtFilter.java +++ b/backend/src/main/java/com/outdoorloop/security/JwtFilter.java @@ -1,8 +1,9 @@ package com.outdoorloop.security; -import com.outdoorloop.repository.UserRepository; +import io.jsonwebtoken.JwtException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +11,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; @@ -20,28 +22,41 @@ public class JwtFilter extends OncePerRequestFilter { @Autowired private JwtUtil jwtUtil; - @Autowired - private UserRepository userRepository; - @Autowired private UserDetailsService userDetailsService; @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { - String authHeader = request.getHeader("Authorization"); - - if (authHeader != null && authHeader.startsWith("Bearer ")) { - String token = authHeader.substring(7); - String username = jwtUtil.extractUsername(token); - - if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { - UserDetails userDetails = userDetailsService.loadUserByUsername(username); - UsernamePasswordAuthenticationToken authToken = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(authToken); + String token = extractTokenFromCookie(request); + + if (token != null && SecurityContextHolder.getContext().getAuthentication() == null) { + try { + String username = jwtUtil.extractUsername(token); + + if (username != null) { + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(authToken); + } + } catch (JwtException | IllegalArgumentException | UsernameNotFoundException exception) { + // Leave the request unauthenticated. Spring Security will reject protected routes. } } chain.doFilter(request, response); } + + private String extractTokenFromCookie(HttpServletRequest request) { + Cookie[] cookies = request.getCookies(); + if (cookies != null) { + for (Cookie cookie : cookies) { + if ("token".equals(cookie.getName())) { + return cookie.getValue(); + } + } + } + + return null; + } } diff --git a/backend/src/test/java/com/outdoorloop/AuthControllerTests.java b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java index 0a58006..553769a 100644 --- a/backend/src/test/java/com/outdoorloop/AuthControllerTests.java +++ b/backend/src/test/java/com/outdoorloop/AuthControllerTests.java @@ -10,10 +10,14 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.MvcResult; + +import jakarta.servlet.http.Cookie; import java.util.Map; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -99,4 +103,23 @@ void loginWithRegisteredCredentials() throws Exception { .andExpect(cookie().httpOnly("token", true)) .andExpect(cookie().path("token", "/")); } + + @Test + void tokenCookieAuthenticatesProtectedRoute() throws Exception { + registerWith("test@gmail.com", "aaaaaaaA1"); + MvcResult loginResult = loginWith("test@gmail.com", "aaaaaaaA1") + .andExpect(status().isOk()) + .andReturn(); + + Cookie tokenCookie = loginResult.getResponse().getCookie("token"); + + mockMvc.perform(get("/api/routes").cookie(tokenCookie)) + .andExpect(status().isOk()); + } + + @Test + void protectedRouteWithoutTokenIsForbidden() throws Exception { + mockMvc.perform(get("/api/routes")) + .andExpect(status().isForbidden()); + } } From e98b9deb6acf5b59c5a135514616b5e8e3d2b6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 13 Jul 2026 18:44:48 +0200 Subject: [PATCH 27/28] Ignore TODO file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 11c5cfc..5609935 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/.env -.vscode/ \ No newline at end of file +.vscode/ +TODO.md From 3c7b2a383db638bc7eaf116ca702d5acbdb35799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt?= Date: Mon, 13 Jul 2026 18:48:10 +0200 Subject: [PATCH 28/28] Cleanup --- .../com/outdoorloop/controller/AuthController.java | 1 - backend/src/main/java/com/outdoorloop/model/User.java | 4 ---- .../main/java/com/outdoorloop/model/UserLoginDTO.java | 6 +----- .../com/outdoorloop/model/UserRegistrationDTO.java | 2 -- .../main/java/com/outdoorloop/security/JwtUtil.java | 3 --- .../java/com/outdoorloop/security/SecurityConfig.java | 10 ---------- 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/backend/src/main/java/com/outdoorloop/controller/AuthController.java b/backend/src/main/java/com/outdoorloop/controller/AuthController.java index 762ece7..84ad98e 100644 --- a/backend/src/main/java/com/outdoorloop/controller/AuthController.java +++ b/backend/src/main/java/com/outdoorloop/controller/AuthController.java @@ -10,7 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/backend/src/main/java/com/outdoorloop/model/User.java b/backend/src/main/java/com/outdoorloop/model/User.java index a97dcb9..a315ffd 100644 --- a/backend/src/main/java/com/outdoorloop/model/User.java +++ b/backend/src/main/java/com/outdoorloop/model/User.java @@ -2,9 +2,7 @@ import jakarta.persistence.*; import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import lombok.*; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -18,7 +16,6 @@ @Setter @NoArgsConstructor @AllArgsConstructor -@ToString public class User implements UserDetails { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -32,7 +29,6 @@ public class User implements UserDetails { @NotNull private String password; - // TODO what exactly is this? @Override public Collection getAuthorities() { return List.of(); diff --git a/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java index 2f7e874..8b47a5f 100644 --- a/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java +++ b/backend/src/main/java/com/outdoorloop/model/UserLoginDTO.java @@ -1,17 +1,13 @@ package com.outdoorloop.model; -import com.outdoorloop.validation.UniqueEmail; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import lombok.*; @Getter @Setter @NoArgsConstructor @AllArgsConstructor -@ToString public class UserLoginDTO { @Email @NotBlank @@ -19,4 +15,4 @@ public class UserLoginDTO { @NotBlank private String password; -} \ No newline at end of file +} diff --git a/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java index ce27a24..ee96f68 100644 --- a/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java +++ b/backend/src/main/java/com/outdoorloop/model/UserRegistrationDTO.java @@ -3,7 +3,6 @@ import com.outdoorloop.validation.UniqueEmail; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.*; @@ -11,7 +10,6 @@ @Setter @NoArgsConstructor @AllArgsConstructor -@ToString public class UserRegistrationDTO { @Email @NotBlank diff --git a/backend/src/main/java/com/outdoorloop/security/JwtUtil.java b/backend/src/main/java/com/outdoorloop/security/JwtUtil.java index 27e22c3..b6f7f8c 100644 --- a/backend/src/main/java/com/outdoorloop/security/JwtUtil.java +++ b/backend/src/main/java/com/outdoorloop/security/JwtUtil.java @@ -2,8 +2,6 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.io.Decoders; -import io.jsonwebtoken.security.Keys; import org.springframework.stereotype.Component; import javax.crypto.SecretKey; @@ -12,7 +10,6 @@ @Component public class JwtUtil { SecretKey key = Jwts.SIG.HS256.key().build(); - // SecretKey key = Keys.hmacShaKeyFor(Decoders.BASE64.decode("mysecretkey")); public String generateToken(String username) { return Jwts.builder() diff --git a/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java b/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java index 0905fe7..98165c7 100644 --- a/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java +++ b/backend/src/main/java/com/outdoorloop/security/SecurityConfig.java @@ -3,8 +3,6 @@ import com.outdoorloop.repository.UserRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; @@ -34,14 +32,6 @@ UserDetailsService userDetailsService() { .orElseThrow(() -> new UsernameNotFoundException("User not found")); } - /*@Bean - public AuthenticationProvider authenticationProvider() { - DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); - provider.setUserDetailsService(userDetailsService()); - provider.setPasswordEncoder(passwordEncoder()); - return provider; - }*/ - @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http, JwtFilter jwtFilter) throws Exception { http