From 7ea3ab74bfba692c44dec38fe69ac0f8afc598d8 Mon Sep 17 00:00:00 2001 From: uo294186 Date: Mon, 24 Feb 2025 18:19:02 +0100 Subject: [PATCH 1/9] Added the User entity to both my project and the main one --- userservice/.gitattributes | 2 + userservice/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ userservice/mvnw | 259 ++++++++++++++++++ userservice/mvnw.cmd | 149 ++++++++++ userservice/pom.xml | 54 ++++ .../userservice/UserserviceApplication.java | 13 + .../com/uniovi/userservice/entities/User.java | 40 +++ .../src/main/resources/application.properties | 1 + .../UserserviceApplicationTests.java | 13 + .../uniovi/wichatwebapp/entities/User.java | 40 +++ 11 files changed, 623 insertions(+) create mode 100644 userservice/.gitattributes create mode 100644 userservice/.gitignore create mode 100644 userservice/.mvn/wrapper/maven-wrapper.properties create mode 100644 userservice/mvnw create mode 100644 userservice/mvnw.cmd create mode 100644 userservice/pom.xml create mode 100644 userservice/src/main/java/com/uniovi/userservice/UserserviceApplication.java create mode 100644 userservice/src/main/java/com/uniovi/userservice/entities/User.java create mode 100644 userservice/src/main/resources/application.properties create mode 100644 userservice/src/test/java/com/uniovi/userservice/UserserviceApplicationTests.java create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java diff --git a/userservice/.gitattributes b/userservice/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/userservice/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/userservice/.gitignore b/userservice/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/userservice/.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/userservice/.mvn/wrapper/maven-wrapper.properties b/userservice/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..d58dfb70 --- /dev/null +++ b/userservice/.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/userservice/mvnw b/userservice/mvnw new file mode 100644 index 00000000..19529ddf --- /dev/null +++ b/userservice/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/userservice/mvnw.cmd b/userservice/mvnw.cmd new file mode 100644 index 00000000..249bdf38 --- /dev/null +++ b/userservice/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/userservice/pom.xml b/userservice/pom.xml new file mode 100644 index 00000000..79e07819 --- /dev/null +++ b/userservice/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.3 + + + com.uniovi + userservice + 0.0.1-SNAPSHOT + userservice + userservice + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/userservice/src/main/java/com/uniovi/userservice/UserserviceApplication.java b/userservice/src/main/java/com/uniovi/userservice/UserserviceApplication.java new file mode 100644 index 00000000..b7c95680 --- /dev/null +++ b/userservice/src/main/java/com/uniovi/userservice/UserserviceApplication.java @@ -0,0 +1,13 @@ +package com.uniovi.userservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UserserviceApplication { + + public static void main(String[] args) { + SpringApplication.run(UserserviceApplication.class, args); + } + +} diff --git a/userservice/src/main/java/com/uniovi/userservice/entities/User.java b/userservice/src/main/java/com/uniovi/userservice/entities/User.java new file mode 100644 index 00000000..e8335d7d --- /dev/null +++ b/userservice/src/main/java/com/uniovi/userservice/entities/User.java @@ -0,0 +1,40 @@ +package com.uniovi.userservice.entities; + +public class User { + + private String name; + private String email; + private String password; + + public User() {} + + public User(String name, String email, String password) { + this.name = name; + this.email = email; + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/userservice/src/main/resources/application.properties b/userservice/src/main/resources/application.properties new file mode 100644 index 00000000..1ea8e955 --- /dev/null +++ b/userservice/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=userservice diff --git a/userservice/src/test/java/com/uniovi/userservice/UserserviceApplicationTests.java b/userservice/src/test/java/com/uniovi/userservice/UserserviceApplicationTests.java new file mode 100644 index 00000000..a9ce869b --- /dev/null +++ b/userservice/src/test/java/com/uniovi/userservice/UserserviceApplicationTests.java @@ -0,0 +1,13 @@ +package com.uniovi.userservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class UserserviceApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java new file mode 100644 index 00000000..e0053749 --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java @@ -0,0 +1,40 @@ +package com.uniovi.wichatwebapp.entities; + +public class User { + + private String name; + private String email; + private String password; + + public User() {} + + public User(String name, String email, String password) { + this.name = name; + this.email = email; + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} From 18d071a41f478f382e1e2f199c8429ad3cf63faf Mon Sep 17 00:00:00 2001 From: uo294186 Date: Mon, 24 Feb 2025 18:21:10 +0100 Subject: [PATCH 2/9] Added the User entity to both my project and the main one --- .../java/com/uniovi/userservice/entities/User.java | 12 +++++++++++- .../java/com/uniovi/wichatwebapp/entities/User.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/userservice/src/main/java/com/uniovi/userservice/entities/User.java b/userservice/src/main/java/com/uniovi/userservice/entities/User.java index e8335d7d..34f50762 100644 --- a/userservice/src/main/java/com/uniovi/userservice/entities/User.java +++ b/userservice/src/main/java/com/uniovi/userservice/entities/User.java @@ -5,13 +5,15 @@ public class User { private String name; private String email; private String password; + private boolean correct; public User() {} - public User(String name, String email, String password) { + public User(String name, String email, String password, boolean correct) { this.name = name; this.email = email; this.password = password; + this.correct = correct; } public String getName() { @@ -37,4 +39,12 @@ public String getPassword() { public void setPassword(String password) { this.password = password; } + + public boolean isCorrect() { + return correct; + } + + public void setCorrect(boolean correct) { + this.correct = correct; + } } diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java index e0053749..0e40f3d7 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java @@ -5,13 +5,15 @@ public class User { private String name; private String email; private String password; + private boolean correct; public User() {} - public User(String name, String email, String password) { + public User(String name, String email, String password, boolean correct) { this.name = name; this.email = email; this.password = password; + this.correct = correct; } public String getName() { @@ -37,4 +39,12 @@ public String getPassword() { public void setPassword(String password) { this.password = password; } + + public boolean isCorrect() { + return correct; + } + + public void setCorrect(boolean correct) { + this.correct = correct; + } } From 15705aecb21896831aa644b0f49d965e6f7c9f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Mon, 24 Feb 2025 20:07:12 +0100 Subject: [PATCH 3/9] Implemented initial webapp part of user handling --- webapp/pom.xml | 10 ++++ .../com/uniovi/wichatwebapp/WebConfig.java | 13 ++++++ .../controllers/UserController.java | 46 +++++++++++++++++++ .../services/UserDetailsServiceImpl.java | 31 +++++++++++++ .../wichatwebapp/services/UserService.java | 46 +++++++++++++++++++ .../validators/SignUpValidator.java | 28 +++++++++++ .../src/main/resources/templates/login.html | 18 ++++++++ .../src/main/resources/templates/signup.html | 20 ++++++++ 8 files changed, 212 insertions(+) create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/WebConfig.java create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java create mode 100644 webapp/src/main/resources/templates/login.html create mode 100644 webapp/src/main/resources/templates/signup.html diff --git a/webapp/pom.xml b/webapp/pom.xml index 4834c5cf..7a1273dc 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -30,6 +30,16 @@ 23 + + + commons-validator + commons-validator + 1.9.0 + + + org.springframework.boot + spring-boot-starter-webflux + org.springframework.boot spring-boot-starter-security diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/WebConfig.java b/webapp/src/main/java/com/uniovi/wichatwebapp/WebConfig.java new file mode 100644 index 00000000..b6604164 --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/WebConfig.java @@ -0,0 +1,13 @@ +package com.uniovi.wichatwebapp; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebConfig { + @Bean + public WebClient.Builder webClientBuilder() { + return WebClient.builder(); + } +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java new file mode 100644 index 00000000..6a22a4ec --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java @@ -0,0 +1,46 @@ +package com.uniovi.wichatwebapp.controllers; + +import com.uniovi.wichatwebapp.entities.User; +import com.uniovi.wichatwebapp.services.UserService; +import com.uniovi.wichatwebapp.validators.SignUpValidator; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@Controller +public class UserController { + private final UserService userService; + private final SignUpValidator signUpValidator; + + public UserController(UserService userService, SignUpValidator signUpValidator) { + this.userService = userService; + this.signUpValidator = signUpValidator; + } + + @RequestMapping(value = "/login", method = RequestMethod.GET) + public String login(){ + return "login"; + } + + @RequestMapping(value="/signup", method = RequestMethod.GET) + public String signup(Model model){ + model.addAttribute("user", new User()); + return "signup"; + } + + @RequestMapping(value = "/signup", method = RequestMethod.POST) + public String signup(@Validated User user, Model model, BindingResult result){ + signUpValidator.validate(user, result); + if(result.hasErrors()){ + return "signup"; + } + boolean addResult = userService.addUser(user); + if(!addResult){ + model.addAttribute("adderror"); + } + return "redirect:login"; + } +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java new file mode 100644 index 00000000..4d8704bf --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java @@ -0,0 +1,31 @@ +package com.uniovi.wichatwebapp.services; + +import com.uniovi.wichatwebapp.entities.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +import java.util.HashSet; +import java.util.Set; + +public class UserDetailsServiceImpl implements UserDetailsService { + + private final UserService userService; + + public UserDetailsServiceImpl(UserService userService) { + this.userService = userService; + } + + + @Override + public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { + User user = userService.getUserByEmail(email); + Set grantedAuthorities = new HashSet<>(); + if(user == null) { + throw new UsernameNotFoundException("User not found"); + } + return new org.springframework.security.core.userdetails.User(user.getEmail(), user.getPassword(), grantedAuthorities); + } +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java new file mode 100644 index 00000000..d2f308fc --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java @@ -0,0 +1,46 @@ +package com.uniovi.wichatwebapp.services; + +import com.uniovi.wichatwebapp.entities.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; + +@Service +public class UserService { + + @Autowired + private WebClient.Builder webClientBuilder; + + public User getUserByEmail(String email){ + return webClientBuilder + .baseUrl("http://localhost:8090") // Set base URL here or in config + .build() + .get() + .uri(uriBuilder -> uriBuilder + .path("/getUser") + .queryParam("email", email) + .build()) + .retrieve() + .bodyToMono(User.class) + .block(); + + } + + public boolean addUser(User user){ + User result = + webClientBuilder + .baseUrl("http://localhost:8090") + .build() + .post() + .uri("/addUser") + .bodyValue(user) + .retrieve() + .bodyToMono(User.class) + .block(); + if(result == null){ + return false; + } else{ + return result.isCorrect(); + } + } +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java b/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java new file mode 100644 index 00000000..179ef514 --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java @@ -0,0 +1,28 @@ +package com.uniovi.wichatwebapp.validators; + +import com.uniovi.wichatwebapp.entities.User; +import org.apache.commons.validator.routines.EmailValidator; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.ValidationUtils; +import org.springframework.validation.Validator; + +@Component +public class SignUpValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return User.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + User user = (User) target; + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "email", "The email is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "The password is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "The name is required"); + + if(!EmailValidator.getInstance().isValid(user.getEmail())) { + errors.rejectValue("email", "The email is not valid"); + } + } +} diff --git a/webapp/src/main/resources/templates/login.html b/webapp/src/main/resources/templates/login.html new file mode 100644 index 00000000..90ff0feb --- /dev/null +++ b/webapp/src/main/resources/templates/login.html @@ -0,0 +1,18 @@ + + + + + Login + + +

Login

+
+ + + + + + +
+ + \ No newline at end of file diff --git a/webapp/src/main/resources/templates/signup.html b/webapp/src/main/resources/templates/signup.html new file mode 100644 index 00000000..db0c36c0 --- /dev/null +++ b/webapp/src/main/resources/templates/signup.html @@ -0,0 +1,20 @@ + + + + + Signup + + +

Signup

+
+ + + + + + + + +
+ + \ No newline at end of file From 11f15d412ab4d27fc018872fde074fb97a482d72 Mon Sep 17 00:00:00 2001 From: uo294186 Date: Mon, 24 Feb 2025 20:11:13 +0100 Subject: [PATCH 4/9] Added the UsserService module that get a user and adds users to the database --- userservice/pom.xml | 6 +++ .../controller/UserController.java | 39 ++++++++++++++++ .../com/uniovi/userservice/entities/User.java | 26 +++++++++++ .../repository/UserRepository.java | 10 +++++ .../userservice/service/UserService.java | 45 +++++++++++++++++++ .../src/main/resources/application.properties | 4 ++ .../src/main/resources/static/test.html | 24 ++++++++++ .../uniovi/wichatwebapp/entities/User.java | 10 +++++ 8 files changed, 164 insertions(+) create mode 100644 userservice/src/main/java/com/uniovi/userservice/controller/UserController.java create mode 100644 userservice/src/main/java/com/uniovi/userservice/repository/UserRepository.java create mode 100644 userservice/src/main/java/com/uniovi/userservice/service/UserService.java create mode 100644 userservice/src/main/resources/static/test.html diff --git a/userservice/pom.xml b/userservice/pom.xml index 79e07819..e7bb060c 100644 --- a/userservice/pom.xml +++ b/userservice/pom.xml @@ -40,6 +40,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-starter-data-mongodb + + diff --git a/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java b/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java new file mode 100644 index 00000000..28381dab --- /dev/null +++ b/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java @@ -0,0 +1,39 @@ +package com.uniovi.userservice.controller; + +import com.uniovi.userservice.entities.User; +import com.uniovi.userservice.service.UserService; +import org.springframework.web.bind.annotation.*; + +/** + * RestController that manages the users + * Manages: + * -Adding users to the database + * -Getting users from the database + */ +@RestController +public class UserController { + + private final UserService userService; + + public UserController(UserService userService) { + this.userService = userService; + } + + @RequestMapping(value = "/addUser", method = RequestMethod.POST) + public User addUser(@ModelAttribute User user) { + //Get the user by the email + User newUser = userService.addUser(user); + + return newUser; + } + + @RequestMapping(value="/getUser", method = RequestMethod.GET) + public User findUser(@RequestParam String email){ + //Get the user by the email + User user = userService.findByEmail(email); + + return user; + + } + +} diff --git a/userservice/src/main/java/com/uniovi/userservice/entities/User.java b/userservice/src/main/java/com/uniovi/userservice/entities/User.java index 34f50762..6f887ae9 100644 --- a/userservice/src/main/java/com/uniovi/userservice/entities/User.java +++ b/userservice/src/main/java/com/uniovi/userservice/entities/User.java @@ -1,7 +1,25 @@ package com.uniovi.userservice.entities; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +/** + * Basic enity that represents the Users in the application + * It contains: + * -ID: an unique identifier used by the DB + * -Name: username + * -Email: email of the user. It must be unique + * -Password: password of the user. Encrypted by the webapp + * -Correct: a boolean that indicates if the user of correct. It will be used by the + * webapp to check the success of operations (adding an already existing user would return a User with this + * value set to false to the application). + */ +@Document(collection="users") public class User { + @Id + private String id; //No need to add GeneratedValue since MongoDB handles that + private String name; private String email; private String password; @@ -47,4 +65,12 @@ public boolean isCorrect() { public void setCorrect(boolean correct) { this.correct = correct; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/userservice/src/main/java/com/uniovi/userservice/repository/UserRepository.java b/userservice/src/main/java/com/uniovi/userservice/repository/UserRepository.java new file mode 100644 index 00000000..d3397bb5 --- /dev/null +++ b/userservice/src/main/java/com/uniovi/userservice/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.uniovi.userservice.repository; + +import com.uniovi.userservice.entities.User; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserRepository extends MongoRepository { + User findByEmail(String email); +} diff --git a/userservice/src/main/java/com/uniovi/userservice/service/UserService.java b/userservice/src/main/java/com/uniovi/userservice/service/UserService.java new file mode 100644 index 00000000..3940c989 --- /dev/null +++ b/userservice/src/main/java/com/uniovi/userservice/service/UserService.java @@ -0,0 +1,45 @@ +package com.uniovi.userservice.service; + +import com.uniovi.userservice.entities.User; +import com.uniovi.userservice.repository.UserRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Service that manages the users' logic + */ +@Service +public class UserService { + + private final UserRepository userRepository; + + public UserService(UserRepository userRepository) { + this.userRepository = userRepository; + } + + public User findByEmail(String email){ + User user = userRepository.findByEmail(email); + + if(user == null){ + user = new User(); + user.setCorrect(false); + + } + + return user; + } + + public User addUser(User user){ + + User checkUser = userRepository.findByEmail(user.getEmail()); + if(checkUser != null){ + user.setCorrect(false); + }else{ + user.setCorrect(true); + userRepository.save(user); + } + return user; + + } + +} diff --git a/userservice/src/main/resources/application.properties b/userservice/src/main/resources/application.properties index 1ea8e955..dbcddf72 100644 --- a/userservice/src/main/resources/application.properties +++ b/userservice/src/main/resources/application.properties @@ -1 +1,5 @@ spring.application.name=userservice + +server.port=8100 + +spring.data.mongodb.uri=mongodb://localhost:27017/users diff --git a/userservice/src/main/resources/static/test.html b/userservice/src/main/resources/static/test.html new file mode 100644 index 00000000..f1486b22 --- /dev/null +++ b/userservice/src/main/resources/static/test.html @@ -0,0 +1,24 @@ + + + + + Test + + + +
+ + +
+ + +
+ + +
+ + +
+ + + \ No newline at end of file diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java index 0e40f3d7..dc7e82c7 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/entities/User.java @@ -2,6 +2,8 @@ public class User { + private String id; + private String name; private String email; private String password; @@ -47,4 +49,12 @@ public boolean isCorrect() { public void setCorrect(boolean correct) { this.correct = correct; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } From a5bc0d8eeecef013561c35b1d22d2c8160fac8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Mon, 24 Feb 2025 20:17:43 +0100 Subject: [PATCH 5/9] Changed user service port to match the one in the user service --- .../java/com/uniovi/wichatwebapp/services/UserService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java index d2f308fc..72f5cc5e 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java @@ -13,7 +13,7 @@ public class UserService { public User getUserByEmail(String email){ return webClientBuilder - .baseUrl("http://localhost:8090") // Set base URL here or in config + .baseUrl("http://localhost:8100") // Set base URL here or in config .build() .get() .uri(uriBuilder -> uriBuilder @@ -29,7 +29,7 @@ public User getUserByEmail(String email){ public boolean addUser(User user){ User result = webClientBuilder - .baseUrl("http://localhost:8090") + .baseUrl("http://localhost:8100") .build() .post() .uri("/addUser") From dff988b4bf0fbaf77adfd7953d27a45c0246728b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Mon, 24 Feb 2025 21:59:15 +0100 Subject: [PATCH 6/9] Fixed bugs in security configuration --- .../controller/UserController.java | 2 +- .../wichatwebapp/WebSecurityConfig.java | 18 +++++++ .../controllers/UserController.java | 11 +++++ .../repositories/UserRepository.java | 49 +++++++++++++++++++ .../services/UserDetailsServiceImpl.java | 13 ++--- .../wichatwebapp/services/UserService.java | 37 ++++---------- webapp/src/main/resources/templates/home.html | 11 +++++ .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/signup.html | 4 +- 9 files changed, 111 insertions(+), 38 deletions(-) create mode 100644 webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java create mode 100644 webapp/src/main/resources/templates/home.html diff --git a/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java b/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java index 28381dab..6540db13 100644 --- a/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java +++ b/userservice/src/main/java/com/uniovi/userservice/controller/UserController.java @@ -20,7 +20,7 @@ public UserController(UserService userService) { } @RequestMapping(value = "/addUser", method = RequestMethod.POST) - public User addUser(@ModelAttribute User user) { + public User addUser(@RequestBody User user) { //Get the user by the email User newUser = userService.addUser(user); diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java index f061ad56..293a2f23 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java @@ -1,12 +1,15 @@ package com.uniovi.wichatwebapp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; @@ -16,15 +19,20 @@ @Configuration public class WebSecurityConfig { + @Autowired + private UserDetailsService userDetailsServiceImpl; + @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth + .requestMatchers("/signup").permitAll() .anyRequest().authenticated() ) .formLogin(form -> form .loginPage("/login") .permitAll() + .defaultSuccessUrl("/home") ) .logout(logout -> logout .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) @@ -35,6 +43,16 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti return http.build(); } + @Bean + public DaoAuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); + + authProvider.setUserDetailsService(userDetailsServiceImpl); + authProvider.setPasswordEncoder(passwordEncoder()); + + return authProvider; + } + @Bean public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { return authenticationConfiguration.getAuthenticationManager(); diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java index 6a22a4ec..14e864f2 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java @@ -3,6 +3,8 @@ import com.uniovi.wichatwebapp.entities.User; import com.uniovi.wichatwebapp.services.UserService; import com.uniovi.wichatwebapp.validators.SignUpValidator; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -43,4 +45,13 @@ public String signup(@Validated User user, Model model, BindingResult result){ } return "redirect:login"; } + + @RequestMapping(value = "/home") + public String home(Model model){ + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + String email = auth.getName(); + User user = userService.getUserByEmail(email); + model.addAttribute("user", user); + return "home"; + } } diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java b/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java new file mode 100644 index 00000000..b64def5f --- /dev/null +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java @@ -0,0 +1,49 @@ +package com.uniovi.wichatwebapp.repositories; + +import com.uniovi.wichatwebapp.entities.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Repository; +import org.springframework.web.reactive.function.client.WebClient; + +@Repository +public class UserRepository { + + private WebClient.Builder webClientBuilder; + + public UserRepository(WebClient.Builder webClientBuilder) { + this.webClientBuilder = webClientBuilder; + } + + public User getUserByEmail(String email){ + return webClientBuilder + .baseUrl("http://localhost:8100") // Set base URL here or in config + .build() + .get() + .uri(uriBuilder -> uriBuilder + .path("/getUser") + .queryParam("email", email) + .build()) + .retrieve() + .bodyToMono(User.class) + .block(); + } + + public boolean addUser(User user){ + User result = + webClientBuilder + .baseUrl("http://localhost:8100") + .build() + .post() + .uri("/addUser") + .bodyValue(user) + .retrieve() + .bodyToMono(User.class) + .block(); + if(result == null){ + return false; + } else{ + return result.isCorrect(); + } + } +} diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java index 4d8704bf..e2cf06c0 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java @@ -1,27 +1,28 @@ package com.uniovi.wichatwebapp.services; import com.uniovi.wichatwebapp.entities.User; +import com.uniovi.wichatwebapp.repositories.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.GrantedAuthority; 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.Service; import java.util.HashSet; import java.util.Set; -public class UserDetailsServiceImpl implements UserDetailsService { - private final UserService userService; +@Service("userDetailsService") +public class UserDetailsServiceImpl implements UserDetailsService { - public UserDetailsServiceImpl(UserService userService) { - this.userService = userService; - } + @Autowired + private UserRepository userRepository; @Override public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { - User user = userService.getUserByEmail(email); + User user = userRepository.getUserByEmail(email); Set grantedAuthorities = new HashSet<>(); if(user == null) { throw new UsernameNotFoundException("User not found"); diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java index 72f5cc5e..e1d4a08e 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserService.java @@ -1,7 +1,10 @@ package com.uniovi.wichatwebapp.services; import com.uniovi.wichatwebapp.entities.User; +import com.uniovi.wichatwebapp.repositories.UserRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; @@ -9,38 +12,18 @@ public class UserService { @Autowired - private WebClient.Builder webClientBuilder; + private UserRepository userRepository; + + @Autowired + private PasswordEncoder passwordEncoder; public User getUserByEmail(String email){ - return webClientBuilder - .baseUrl("http://localhost:8100") // Set base URL here or in config - .build() - .get() - .uri(uriBuilder -> uriBuilder - .path("/getUser") - .queryParam("email", email) - .build()) - .retrieve() - .bodyToMono(User.class) - .block(); + return userRepository.getUserByEmail(email); } public boolean addUser(User user){ - User result = - webClientBuilder - .baseUrl("http://localhost:8100") - .build() - .post() - .uri("/addUser") - .bodyValue(user) - .retrieve() - .bodyToMono(User.class) - .block(); - if(result == null){ - return false; - } else{ - return result.isCorrect(); - } + user.setPassword(passwordEncoder.encode(user.getPassword())); + return userRepository.addUser(user); } } diff --git a/webapp/src/main/resources/templates/home.html b/webapp/src/main/resources/templates/home.html new file mode 100644 index 00000000..ea78de90 --- /dev/null +++ b/webapp/src/main/resources/templates/home.html @@ -0,0 +1,11 @@ + + + + + Home + + +

Home

+

Welcome,

+ + \ No newline at end of file diff --git a/webapp/src/main/resources/templates/login.html b/webapp/src/main/resources/templates/login.html index 90ff0feb..d39c2bf6 100644 --- a/webapp/src/main/resources/templates/login.html +++ b/webapp/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + Login @@ -12,7 +12,7 @@

Login

- + \ No newline at end of file diff --git a/webapp/src/main/resources/templates/signup.html b/webapp/src/main/resources/templates/signup.html index db0c36c0..8802d839 100644 --- a/webapp/src/main/resources/templates/signup.html +++ b/webapp/src/main/resources/templates/signup.html @@ -12,9 +12,9 @@

Signup

- + - + \ No newline at end of file From 5108490656e04a43adc6e171ee7141a2ea5c30b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Tue, 25 Feb 2025 17:55:01 +0100 Subject: [PATCH 7/9] Added form validation messages --- .../uniovi/wichatwebapp/controllers/UserController.java | 3 ++- .../uniovi/wichatwebapp/validators/SignUpValidator.java | 8 ++++---- webapp/src/main/resources/templates/signup.html | 6 +++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java index 14e864f2..d49bac1c 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/controllers/UserController.java @@ -41,7 +41,8 @@ public String signup(@Validated User user, Model model, BindingResult result){ } boolean addResult = userService.addUser(user); if(!addResult){ - model.addAttribute("adderror"); + model.addAttribute("adderror", true); + return "signup"; } return "redirect:login"; } diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java b/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java index 179ef514..92af16f3 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/validators/SignUpValidator.java @@ -17,12 +17,12 @@ public boolean supports(Class clazz) { @Override public void validate(Object target, Errors errors) { User user = (User) target; - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "email", "The email is required"); - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "The password is required"); - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "The name is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "email", "email.empty", "The email is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "password.empty", "The password is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "name.empty", "The name is required"); if(!EmailValidator.getInstance().isValid(user.getEmail())) { - errors.rejectValue("email", "The email is not valid"); + errors.rejectValue("email", "email.invalid", "The email is not valid"); } } } diff --git a/webapp/src/main/resources/templates/signup.html b/webapp/src/main/resources/templates/signup.html index 8802d839..770e3b79 100644 --- a/webapp/src/main/resources/templates/signup.html +++ b/webapp/src/main/resources/templates/signup.html @@ -1,5 +1,5 @@ - + Signup @@ -9,11 +9,15 @@

Signup

+

+

+

+

The account could not be created, an account with that email might already exist

From 8c8e24e3a1092a3f1a8e37534d0f806185ceaa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Tue, 25 Feb 2025 18:00:33 +0100 Subject: [PATCH 8/9] Externalized user service URL to properties file, added comment --- .../java/com/uniovi/wichatwebapp/WebSecurityConfig.java | 3 +++ .../uniovi/wichatwebapp/repositories/UserRepository.java | 8 ++++++-- webapp/src/main/resources/application.properties | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java index 293a2f23..99ee9753 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java @@ -22,6 +22,9 @@ public class WebSecurityConfig { @Autowired private UserDetailsService userDetailsServiceImpl; + /* + Must change rules if access without login is necessary in any new pages + */ @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java b/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java index b64def5f..8de00dc9 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/repositories/UserRepository.java @@ -2,6 +2,7 @@ import com.uniovi.wichatwebapp.entities.User; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Repository; import org.springframework.web.reactive.function.client.WebClient; @@ -11,13 +12,16 @@ public class UserRepository { private WebClient.Builder webClientBuilder; + @Value("${userservice.url}") + private String baseUrl; + public UserRepository(WebClient.Builder webClientBuilder) { this.webClientBuilder = webClientBuilder; } public User getUserByEmail(String email){ return webClientBuilder - .baseUrl("http://localhost:8100") // Set base URL here or in config + .baseUrl(baseUrl) // Set base URL here or in config .build() .get() .uri(uriBuilder -> uriBuilder @@ -32,7 +36,7 @@ public User getUserByEmail(String email){ public boolean addUser(User user){ User result = webClientBuilder - .baseUrl("http://localhost:8100") + .baseUrl(baseUrl) .build() .post() .uri("/addUser") diff --git a/webapp/src/main/resources/application.properties b/webapp/src/main/resources/application.properties index 67753dcf..32bd5e35 100644 --- a/webapp/src/main/resources/application.properties +++ b/webapp/src/main/resources/application.properties @@ -1 +1,2 @@ spring.application.name=wichat-webapp +userservice.url=http://localhost:8100 \ No newline at end of file From 8dfd629a7d5f13730db4e2950b12458157050f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <85810125+pablordgez@users.noreply.github.com> Date: Tue, 25 Feb 2025 18:31:31 +0100 Subject: [PATCH 9/9] Fixed login bug, externalized head to fragment, added basic CSS and links to signup/login/logout in the corresponding page --- .../wichatwebapp/WebSecurityConfig.java | 5 ++-- .../services/UserDetailsServiceImpl.java | 2 +- .../src/main/resources/static/css/forms.css | 28 +++++++++++++++++++ webapp/src/main/resources/static/css/main.css | 8 ++++++ .../resources/templates/fragments/head.html | 7 +++++ webapp/src/main/resources/templates/home.html | 6 ++-- .../src/main/resources/templates/login.html | 11 ++++---- .../src/main/resources/templates/signup.html | 16 +++++------ 8 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 webapp/src/main/resources/static/css/forms.css create mode 100644 webapp/src/main/resources/static/css/main.css create mode 100644 webapp/src/main/resources/templates/fragments/head.html diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java index 99ee9753..bb82ce7c 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/WebSecurityConfig.java @@ -29,13 +29,14 @@ public class WebSecurityConfig { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .requestMatchers("/signup").permitAll() + .requestMatchers("/signup", "/css/**").permitAll() .anyRequest().authenticated() ) .formLogin(form -> form .loginPage("/login") .permitAll() - .defaultSuccessUrl("/home") + .defaultSuccessUrl("/home", true) + // Must use true, if you don't it might redirect you to the latest request that the page has done, which in some cases is the css file ) .logout(logout -> logout .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) diff --git a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java index e2cf06c0..22ae92a8 100644 --- a/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java +++ b/webapp/src/main/java/com/uniovi/wichatwebapp/services/UserDetailsServiceImpl.java @@ -24,7 +24,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { User user = userRepository.getUserByEmail(email); Set grantedAuthorities = new HashSet<>(); - if(user == null) { + if(user == null || user.getEmail() == null || user.getPassword() == null) { throw new UsernameNotFoundException("User not found"); } return new org.springframework.security.core.userdetails.User(user.getEmail(), user.getPassword(), grantedAuthorities); diff --git a/webapp/src/main/resources/static/css/forms.css b/webapp/src/main/resources/static/css/forms.css new file mode 100644 index 00000000..301e4186 --- /dev/null +++ b/webapp/src/main/resources/static/css/forms.css @@ -0,0 +1,28 @@ +.form{ + display: flex; + flex-direction: column; + gap: 0.5em; + margin-bottom: 1em; +} + +.form input, .form button{ + border-radius: 5px; + width: max-content; + +} + +.form input{ + background-color: white; + border: black solid 1px; +} + +.form button{ + padding: 0.5em 1em; + background-color: #2c88f1; + color: white; + border: none; +} + +.error{ + color: red; +} \ No newline at end of file diff --git a/webapp/src/main/resources/static/css/main.css b/webapp/src/main/resources/static/css/main.css new file mode 100644 index 00000000..f343b5c3 --- /dev/null +++ b/webapp/src/main/resources/static/css/main.css @@ -0,0 +1,8 @@ +body{ + font-family: Arial, sans-serif; + font-size: 16px; +} + +button:hover{ + cursor:pointer; +} \ No newline at end of file diff --git a/webapp/src/main/resources/templates/fragments/head.html b/webapp/src/main/resources/templates/fragments/head.html new file mode 100644 index 00000000..60d79ff8 --- /dev/null +++ b/webapp/src/main/resources/templates/fragments/head.html @@ -0,0 +1,7 @@ + + + + + + Wichat + \ No newline at end of file diff --git a/webapp/src/main/resources/templates/home.html b/webapp/src/main/resources/templates/home.html index ea78de90..ae1e5e43 100644 --- a/webapp/src/main/resources/templates/home.html +++ b/webapp/src/main/resources/templates/home.html @@ -1,11 +1,9 @@ - - - Home - +

Home

Welcome,

+ Logout \ No newline at end of file diff --git a/webapp/src/main/resources/templates/login.html b/webapp/src/main/resources/templates/login.html index d39c2bf6..ba84fc2f 100644 --- a/webapp/src/main/resources/templates/login.html +++ b/webapp/src/main/resources/templates/login.html @@ -1,18 +1,19 @@ - - - Login - +

Login

-
+ +

+ Invalid username or password. Please try again. +

+ Signup \ No newline at end of file diff --git a/webapp/src/main/resources/templates/signup.html b/webapp/src/main/resources/templates/signup.html index 770e3b79..2793b7f6 100644 --- a/webapp/src/main/resources/templates/signup.html +++ b/webapp/src/main/resources/templates/signup.html @@ -1,24 +1,22 @@ - - - Signup - +

Signup

-
+ -

+

-

+

-

+

-

The account could not be created, an account with that email might already exist

+

The account could not be created, an account with that email might already exist

+ Login \ No newline at end of file