diff --git a/webapp/BUILD.ps1 b/BUILD.ps1 similarity index 71% rename from webapp/BUILD.ps1 rename to BUILD.ps1 index dd4c86d..e96ddcc 100644 --- a/webapp/BUILD.ps1 +++ b/BUILD.ps1 @@ -3,11 +3,17 @@ ## winget install --id Microsoft.Powershell --source winget mkdir dist +cd webapp npm run build -cp -r .next/static .next/standalone/CoffeeChat/portal/.next -cp -r .next/standalone/CoffeeChat/portal dist -Compress-Archive -Path dist -DestinationPath dist.zip -Force +cp -r .next/static .next/standalone/gitea/CoffeeChat/webapp/.next +mkdir dist +cp -r .next/standalone/gitea/CoffeeChat/webapp/* dist +Compress-Archive -Path .\dist\* -DestinationPath ..\dist\client-dist.zip -Force Remove-Item dist -Recurse -Force +cd .. +# cd dist +# npm publish +# cd .. # Create an SSH session #$remoteUser = "cinton" diff --git a/coffeechat/.gitattributes b/coffeechat/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/coffeechat/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/coffeechat/.gitignore b/coffeechat/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/coffeechat/.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/coffeechat/mvnw b/coffeechat/mvnw new file mode 100644 index 0000000..bd8896b --- /dev/null +++ b/coffeechat/mvnw @@ -0,0 +1,295 @@ +#!/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.4 +# +# 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:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# 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 <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.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${scriptName#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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/coffeechat/mvnw.cmd b/coffeechat/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/coffeechat/mvnw.cmd @@ -0,0 +1,189 @@ +<# : 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.4 +@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 -eq $False) { "/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_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -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/coffeechat/pom.xml b/coffeechat/pom.xml new file mode 100644 index 0000000..eb732cd --- /dev/null +++ b/coffeechat/pom.xml @@ -0,0 +1,115 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.3 + + + za.co.rootbranch + coffeechat + 0.0.1-SNAPSHOT + Coffee Chat + Simple Chat Using Java + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-webmvc + + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.springframework.boot + spring-boot-starter-security + + + io.jsonwebtoken + jjwt-api + 0.11.5 + + + io.jsonwebtoken + jjwt-impl + 0.11.5 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.11.5 + runtime + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + \ No newline at end of file diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/CoffeeChatApplication.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/CoffeeChatApplication.java new file mode 100644 index 0000000..d1a1774 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/CoffeeChatApplication.java @@ -0,0 +1,16 @@ +package za.co.rootbranch.coffeechat; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CoffeeChatApplication { + + public static void main(String[] args) { + SpringApplication.run(CoffeeChatApplication.class, args); + } + +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/Test.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/Test.java new file mode 100644 index 0000000..252bc83 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/Test.java @@ -0,0 +1,42 @@ +package za.co.rootbranch.coffeechat; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class Test { + public static void main(String[] args) { + + Map sample = new HashMap<>(Map.of( + "A", 1, + "B", 2, + "C", 3)); + + System.out.println( + sample.entrySet().stream() + .filter(a -> a.getKey() != "A") + .map(a -> a.getKey()).toList()); + + List toSort = new ArrayList<>(List.of(2, 3, 1)); + + System.out.println( + toSort + .stream() + .filter(a -> a > 1) + .reduce((a, b) -> { + return a + b; + })); + + List revers = new ArrayList<>(); + for (int i = toSort.size(); i < 0; i++) + revers.add((Integer) toSort.get(i)); + + System.out.println( + toSort + .stream() + .reduce((a, b) -> { + return b > a ? a : b; + })); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/AuthController.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/AuthController.java new file mode 100644 index 0000000..310ca55 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/AuthController.java @@ -0,0 +1,66 @@ +package za.co.rootbranch.coffeechat.controllers; + +import org.apache.catalina.connector.Response; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.CrossOrigin; +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 za.co.rootbranch.coffeechat.models.APIResponse; +import za.co.rootbranch.coffeechat.models.User; +import za.co.rootbranch.coffeechat.repositories.UserRepository; +import za.co.rootbranch.coffeechat.security.JwtUtil; + +@CrossOrigin("*") +@RestController +@RequestMapping("/api/auth") +public class AuthController { + @Autowired + AuthenticationManager authenticationManager; + @Autowired + UserRepository userRepository; + @Autowired + PasswordEncoder encoder; + @Autowired + JwtUtil jwtUtils; + + @PostMapping("/signin") + public APIResponse authenticateUser(@RequestBody User user) { + + Authentication authentication = authenticationManager.authenticate( + new UsernamePasswordAuthenticationToken( + user.getEmail(), + user.getPassword() + // encoder.encode("Password") // user.getPassword() + + )); + UserDetails userDetails = (UserDetails) authentication.getPrincipal(); + return new APIResponse("success", jwtUtils.GenerateToken(userDetails.getUsername())); + } + + @PostMapping("/signup") + public APIResponse registerUser(@RequestBody User user) { + if (userRepository.existsByEmail(user.getEmail())) { + return new APIResponse("Fail", "Error: Username is already taken!"); + } + // Create new user's account + User newUser = new User( + null, + user.getEmail(), + user.getEmail(), + encoder.encode(user.getPassword()) + + // encoder.encode("Password") + ); + // encoder.encode(user.getPassword())); + userRepository.save(newUser); + return new APIResponse("Success", "User registered successfully!"); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/RoomsController.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/RoomsController.java new file mode 100644 index 0000000..6fd9832 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/RoomsController.java @@ -0,0 +1,29 @@ +package za.co.rootbranch.coffeechat.controllers; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +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 za.co.rootbranch.coffeechat.models.Room; +import za.co.rootbranch.coffeechat.services.RoomService; + +@RestController +public class RoomsController { + @Autowired + private RoomService roomService; + + @GetMapping("/api/rooms") + public List getRooms(){ + return roomService.findRooms(); + } + @PostMapping("/api/room") + public Room addRoom(@RequestBody Room room){ + return roomService.addRoom(room); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/UsersController.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/UsersController.java new file mode 100644 index 0000000..54b700f --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/controllers/UsersController.java @@ -0,0 +1,46 @@ +package za.co.rootbranch.coffeechat.controllers; + +import java.util.List; + +import org.hibernate.service.spi.InjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import za.co.rootbranch.coffeechat.models.User; +import za.co.rootbranch.coffeechat.services.UserService; +@CrossOrigin("*") +@RestController +public class UsersController { + + @Autowired + private UserService service; + + @PostMapping("/api/user") + public ResponseEntity CreateUser(@RequestBody User user) { + System.out.println("Create new user " + user.getEmail()); + try { + service.createUser(user); + } catch (Exception e) { + return new ResponseEntity(e.getMessage(), HttpStatus.BAD_REQUEST); + } + return new ResponseEntity("OK", HttpStatus.CREATED); + } + + @GetMapping("/api/user/me") + public User GetUserProfile(@RequestParam String email) { + User found = service.findUserByEmail(email); + return found; + } + + @GetMapping("/api/users") + public List listUsers() { + return service.listUsers(); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/exceptions/DuplicateEmailException.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/exceptions/DuplicateEmailException.java new file mode 100644 index 0000000..41b2105 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/exceptions/DuplicateEmailException.java @@ -0,0 +1,9 @@ +package za.co.rootbranch.coffeechat.exceptions; + +public class DuplicateEmailException extends Exception { + + public DuplicateEmailException(String exception) { + super(exception); + } + +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/APIResponse.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/APIResponse.java new file mode 100644 index 0000000..bfb3e16 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/APIResponse.java @@ -0,0 +1,9 @@ +package za.co.rootbranch.coffeechat.models; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public class APIResponse { + public String status; + public String result; +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/Room.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/Room.java new file mode 100644 index 0000000..aa7a4c2 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/Room.java @@ -0,0 +1,30 @@ +package za.co.rootbranch.coffeechat.models; + +import java.sql.Blob; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@AllArgsConstructor +@Entity +public class Room { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public int id; + @Getter + public String title; + @Getter + public String color; + @Getter + @Column(columnDefinition="LONGBLOB") + public String image; + @Getter + public String room; +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/User.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/User.java new file mode 100644 index 0000000..72cd8d4 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/models/User.java @@ -0,0 +1,25 @@ +package za.co.rootbranch.coffeechat.models; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@AllArgsConstructor +@Entity +public class User { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + @Getter + private String name; + @Getter + private String email; + @Getter + private String password; + // ... Getters/Setters +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/RoomRepository.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/RoomRepository.java new file mode 100644 index 0000000..c9279f5 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/RoomRepository.java @@ -0,0 +1,11 @@ +package za.co.rootbranch.coffeechat.repositories; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +import za.co.rootbranch.coffeechat.models.Room; + +public interface RoomRepository extends JpaRepository { + // List findRooms(); +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/UserRepository.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/UserRepository.java new file mode 100644 index 0000000..a67430b --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/repositories/UserRepository.java @@ -0,0 +1,13 @@ +package za.co.rootbranch.coffeechat.repositories; + +import org.springframework.data.jpa.repository.JpaRepository; + +import za.co.rootbranch.coffeechat.models.User; + +public interface UserRepository extends JpaRepository { + User findByName(String name); + + User findByEmail(String email); + + boolean existsByEmail(String email); +} \ No newline at end of file diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthEntryPointJWT.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthEntryPointJWT.java new file mode 100644 index 0000000..5af00ed --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthEntryPointJWT.java @@ -0,0 +1,21 @@ +package za.co.rootbranch.coffeechat.security; + +import java.io.IOException; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +@Component +public class AuthEntryPointJWT implements AuthenticationEntryPoint { + @Override + public void commence( + HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException) throws IOException { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Error: Unauthorized"); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthTokenFilter.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthTokenFilter.java new file mode 100644 index 0000000..d6dba7c --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/AuthTokenFilter.java @@ -0,0 +1,55 @@ +package za.co.rootbranch.coffeechat.security; + +import java.io.IOException; + +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.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.web.filter.OncePerRequestFilter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +public class AuthTokenFilter extends OncePerRequestFilter { + @Autowired + private JwtUtil jwtUtils; + @Autowired + private UserDetailsService userDetailsService; + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + try { + String jwt = parseJwt(request); + if (jwt != null && jwtUtils.validateToken(jwt)) { + String username = jwtUtils.getUsernameFromToken(jwt); + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( + userDetails, + null, + userDetails.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } catch (Exception e) { + System.out.println("Cannot set user authentication: " + e); + } + filterChain.doFilter(request, response); + } + + private String parseJwt(HttpServletRequest request) { + String headerAuth = request.getHeader("Authorization"); + if (headerAuth != null && headerAuth.startsWith("Bearer ")) { + return headerAuth.substring(7); + } + return null; + } + +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/JwtUtil.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/JwtUtil.java new file mode 100644 index 0000000..b34f561 --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/JwtUtil.java @@ -0,0 +1,69 @@ +package za.co.rootbranch.coffeechat.security; + +import java.nio.charset.StandardCharsets; +import java.util.Date; + +import javax.crypto.SecretKey; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.UnsupportedJwtException; +import io.jsonwebtoken.security.Keys; +import jakarta.annotation.PostConstruct; + +@Configuration +public class JwtUtil { + @Value("${jwt.secret}") + private String jwtSecret; + @Value("${jwt.expiration}") + private int jwtExpreMs; + private SecretKey key; + + @PostConstruct + public void init() { + this.key = Keys.hmacShaKeyFor(jwtSecret.getBytes(StandardCharsets.UTF_8)); + } + + public String GenerateToken(String username) { + return Jwts.builder() + .setSubject(username) + .setIssuedAt(new Date()) + .setExpiration(new Date(new Date().getTime() + jwtExpreMs)) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public String getUsernameFromToken(String token) { + return Jwts.parserBuilder() + .setSigningKey(key).build() + .parseClaimsJws(token) + .getBody() + .getSubject(); + } + + public boolean validateToken(String token) { + try { + Jwts.parserBuilder() + .setSigningKey(key).build() + .parseClaimsJws(token); + return true; + } catch (SecurityException e) { + System.out.println("Invalid JWT signature: " + e.getMessage()); + } catch (MalformedJwtException e) { + System.out.println("Invalid JWT token: " + e.getMessage()); + } catch (ExpiredJwtException e) { + System.out.println("JWT token is expired: " + e.getMessage()); + } catch (UnsupportedJwtException e) { + System.out.println("JWT token is unsupported: " + e.getMessage()); + } catch (IllegalArgumentException e) { + System.out.println("JWT claims string is empty: " + e.getMessage()); + } + return false; + } + +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/WebSecurityConfig.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/WebSecurityConfig.java new file mode 100644 index 0000000..4d2d00a --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/security/WebSecurityConfig.java @@ -0,0 +1,75 @@ +package za.co.rootbranch.coffeechat.security; + +import java.util.Arrays; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; +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.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +@Configuration +@EnableWebSecurity(debug = true) +public class WebSecurityConfig { + @Autowired + UserDetailsService userDetailsService; + @Autowired + private AuthEntryPointJWT unauthorizedHandler; + + @Bean + public AuthTokenFilter authenticationJwtTokenFilter() { + return new AuthTokenFilter(); + } + + @Bean + public AuthenticationManager authenticationManager( + AuthenticationConfiguration authenticationConfiguration) throws Exception { + return authenticationConfiguration.getAuthenticationManager(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + // return PasswordEncoderFactories.createDelegatingPasswordEncoder(); + } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + // Updated configuration for Spring Security 6.x + http + .csrf(AbstractHttpConfigurer::disable) // Disable CSRF + // .csrf(csrf -> csrf.disable()) // Disable CSRF + .cors(Customizer.withDefaults()) // Disable CORS (or configure if needed) + .exceptionHandling(exceptionHandling -> exceptionHandling.authenticationEntryPoint(unauthorizedHandler)) + .sessionManagement( + sessionManagement -> sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests(authorizeRequests -> authorizeRequests + // .requestMatchers("/api/auth/**", + // "/api/test/all","/api/auth/signin").permitAll() // Use 'requestMatchers' + // instead + // .anyRequest().permitAll() // Use 'requestMatchers' instead + .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .requestMatchers("/api/auth/**", "/error","/api/rooms").permitAll() // Use 'requestMatchers' instead + // of 'antMatchers' + .anyRequest().authenticated()); + // Add the JWT Token filter before the UsernamePasswordAuthenticationFilter + http.addFilterBefore(authenticationJwtTokenFilter(), + UsernamePasswordAuthenticationFilter.class); + return http.build(); + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/RoomService.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/RoomService.java new file mode 100644 index 0000000..203ca8a --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/RoomService.java @@ -0,0 +1,31 @@ +package za.co.rootbranch.coffeechat.services; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import za.co.rootbranch.coffeechat.models.Room; +import za.co.rootbranch.coffeechat.repositories.RoomRepository; + +@Service +public class RoomService { + + private final RoomRepository roomRepository; + + public RoomService(RoomRepository repository) { + this.roomRepository = repository; + } + + public List findRooms() { + return roomRepository.findAll(); + } + + public Room addRoom(Room room) { + try { + return roomRepository.save(room); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + return null; + } +} diff --git a/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/UserService.java b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/UserService.java new file mode 100644 index 0000000..66807ed --- /dev/null +++ b/coffeechat/src/main/java/za/co/rootbranch/coffeechat/services/UserService.java @@ -0,0 +1,53 @@ +package za.co.rootbranch.coffeechat.services; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +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 za.co.rootbranch.coffeechat.exceptions.DuplicateEmailException; +import za.co.rootbranch.coffeechat.models.User; +import za.co.rootbranch.coffeechat.repositories.UserRepository; + +@Service +public class UserService implements UserDetailsService { + + private final UserRepository userRepository; + + public UserService(UserRepository userRepository) { + this.userRepository = userRepository; + } + + public User findUserByEmail(String email) { + return userRepository.findByEmail(email); + } + + public User createUser(User user) throws DuplicateEmailException { + // Business logic: check for existing email before saving + if (userRepository.findByEmail(user.getEmail()) != null) { + throw new DuplicateEmailException("Email already exists"); + } + return userRepository.save(user); + } + + @Override + public UserDetails loadUserByUsername(String username) + throws UsernameNotFoundException { + User user = findUserByEmail(username); + if (user == null) { + throw new UsernameNotFoundException("User not found"); + } + return new org.springframework.security.core.userdetails.User( + user.getEmail(), + user.getPassword(), + Collections.emptyList()); + } + + public List listUsers() { + return userRepository.findAll(); + } +} diff --git a/coffeechat/src/main/resources/application.properties b/coffeechat/src/main/resources/application.properties new file mode 100644 index 0000000..6c338fa --- /dev/null +++ b/coffeechat/src/main/resources/application.properties @@ -0,0 +1,15 @@ +spring.application.name=Coffee Chat +server.port=8081 +logging.level.root=DEBUG +# Database properties +spring.datasource.url=jdbc:mysql://localhost:3306/coffeeChat +spring.datasource.username=coffeeChat +spring.datasource.password=coffeeChat + +# JPA/Hibernate settings (optional but useful) +# 'update' automatically updates the database schema based on your entities +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true + +jwt.secret=your_secret_key_heretjldjfgljfdsigjj9psejgjsidgjscgtj +jwt.expiration=3600000 \ No newline at end of file diff --git a/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CoffeeChatApplicationTests.java b/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CoffeeChatApplicationTests.java new file mode 100644 index 0000000..9c171db --- /dev/null +++ b/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CoffeeChatApplicationTests.java @@ -0,0 +1,13 @@ +package za.co.rootbranch.coffeechat; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CoffeeChatApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CreateUserTest.java b/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CreateUserTest.java new file mode 100644 index 0000000..1558b2f --- /dev/null +++ b/coffeechat/src/test/java/za/co/rootbranch/coffeechat/CreateUserTest.java @@ -0,0 +1,44 @@ +package za.co.rootbranch.coffeechat; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import za.co.rootbranch.coffeechat.models.User; +import za.co.rootbranch.coffeechat.repositories.UserRepository; +import za.co.rootbranch.coffeechat.services.UserService; + +@ExtendWith(MockitoExtension.class) +public class CreateUserTest { + + @Mock + private UserRepository userRepository; + + @InjectMocks + private UserService userService; + + @BeforeEach() + void init() { + // do setup + } + + @Test + void TestCreateANewUser() { + // Mock the behavior of the repository + String email = "test@example.com"; + User mockUser = new User(null,"", "", email); + when(userRepository.findByEmail(email)).thenReturn(mockUser); // Stub the method call + + // Call the service method + User foundUser = userService.findUserByEmail(email); + + // Verify the result using JUnit assertions + assertEquals(email, foundUser.getEmail()); + } +} diff --git a/dist/client-dist.zip b/dist/client-dist.zip new file mode 100644 index 0000000..70a0bb1 Binary files /dev/null and b/dist/client-dist.zip differ diff --git a/webapp/README.md b/webapp/README.md index 1a59266..dc8d52f 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -37,6 +37,6 @@ Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/bui ## Publish - -npm config set @test:registry=https://gitea.example.com/api/packages/testuser/npm/ -npm config set -- '//gitea.example.com/api/packages/testuser/npm/:_authToken' "personal_access_token" \ No newline at end of file + +npm config set @test:registry=http://git.rootbranch.co.za:7891/api/packages/clinton/npm/ +npm config set -- '//git.rootbranch.co.za:7891/api/packages/clinton/npm/:_authToken' "72ebe222c679d3eb3cbba357a1d1f879f9952d53" \ No newline at end of file diff --git a/webapp/package.json b/webapp/package.json index 7c37f25..187898b 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { - "name": "webapp", - "version": "0.1.0", - "private": true, + "name": "coffee-chat-webapp", + "version": "0.1.2", + "private": false, "scripts": { "dev": "next dev", "build": "next build",