diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 49e1109..00e719c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -8,6 +8,7 @@
+
@@ -19,6 +20,15 @@
+
+
+
+
+
+
+
+
+
@@ -30,6 +40,7 @@
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index d467aae..2883b26 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -6,5 +6,6 @@
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f097322..fde02e6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,6 +9,7 @@
+
diff --git a/beastxfit/src/main/java/com/fitness/beastxfit/dto/RegisterRequest.java b/beastxfit/src/main/java/com/fitness/beastxfit/dto/RegisterRequest.java
index ea84465..922583b 100644
--- a/beastxfit/src/main/java/com/fitness/beastxfit/dto/RegisterRequest.java
+++ b/beastxfit/src/main/java/com/fitness/beastxfit/dto/RegisterRequest.java
@@ -11,7 +11,7 @@ public class RegisterRequest {
@NotBlank(message ="Email is required")
@Email(message ="Invalid email format")
private String email;
-
+ private String KeycloakId;
@NotBlank(message="Passsword is required")
@Size(min = 6,message = "password must have 6 characters ")
private String password;
diff --git a/beastxfit/src/main/java/com/fitness/beastxfit/dto/UserResponse.java b/beastxfit/src/main/java/com/fitness/beastxfit/dto/UserResponse.java
index 334413e..52f6c12 100644
--- a/beastxfit/src/main/java/com/fitness/beastxfit/dto/UserResponse.java
+++ b/beastxfit/src/main/java/com/fitness/beastxfit/dto/UserResponse.java
@@ -13,7 +13,7 @@
@Data
public class UserResponse {
private String id;
-
+ private String keyCloakId;
private String email;
private String password;
private String firstName;
diff --git a/beastxfit/src/main/java/com/fitness/beastxfit/model/User.java b/beastxfit/src/main/java/com/fitness/beastxfit/model/User.java
index a44f2af..d8df3cd 100644
--- a/beastxfit/src/main/java/com/fitness/beastxfit/model/User.java
+++ b/beastxfit/src/main/java/com/fitness/beastxfit/model/User.java
@@ -16,6 +16,8 @@ public class User {
@GeneratedValue(strategy = GenerationType.UUID)
private String id;
+ private String keycloakId;
+
@Column(unique = true)
private String email;
diff --git a/beastxfit/src/main/java/com/fitness/beastxfit/repository/UserRepository.java b/beastxfit/src/main/java/com/fitness/beastxfit/repository/UserRepository.java
index 8af218f..2d8ecb3 100644
--- a/beastxfit/src/main/java/com/fitness/beastxfit/repository/UserRepository.java
+++ b/beastxfit/src/main/java/com/fitness/beastxfit/repository/UserRepository.java
@@ -1,10 +1,16 @@
package com.fitness.beastxfit.repository;
import com.fitness.beastxfit.model.User;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends JpaRepository {
Boolean existsByEmail(String email);
+
+ Boolean existsByKeycloakId(String userId);
+
+ User findByEmail( String email);
}
diff --git a/beastxfit/src/main/java/com/fitness/beastxfit/services/UserService.java b/beastxfit/src/main/java/com/fitness/beastxfit/services/UserService.java
index 58673b3..32e5604 100644
--- a/beastxfit/src/main/java/com/fitness/beastxfit/services/UserService.java
+++ b/beastxfit/src/main/java/com/fitness/beastxfit/services/UserService.java
@@ -15,11 +15,21 @@ public class UserService {
private final UserRepository repository;
public UserResponse register(RegisterRequest request) {
if (repository.existsByEmail(request.getEmail())){
- throw new RuntimeException(" Email already exist");
+ User existingUser =repository.findByEmail(request.getEmail());
+ UserResponse userResponse = new UserResponse();
+ userResponse.setId(existingUser.getId());
+ userResponse.setPassword(existingUser.getPassword());
+ userResponse.setFirstName(existingUser.getFirstName());
+ userResponse.setLastName(existingUser.getLastName());
+ userResponse.setEmail(existingUser.getEmail());
+ userResponse.setCreatedAt(existingUser.getCreatedAt());
+ userResponse.setUpdatedAt(existingUser.getUpdatedAt());
+ return userResponse;
}
User user=new User();
user.setEmail(request.getEmail());
+ user.setKeycloakId(request.getKeycloakId());
user.setFirstName(request.getFirstName());
user.setLastName(request.getLastName());
user.setPassword((request.getPassword()));
@@ -28,6 +38,7 @@ public UserResponse register(RegisterRequest request) {
UserResponse userResponse = new UserResponse();
userResponse.setId(savedUser.getId());
userResponse.setPassword(savedUser.getPassword());
+ userResponse.setKeyCloakId(savedUser.getKeycloakId());
userResponse.setFirstName(savedUser.getFirstName());
userResponse.setLastName(savedUser.getLastName());
userResponse.setEmail(savedUser.getEmail());
@@ -52,6 +63,8 @@ public UserResponse getUserProfile(String userId){
public Boolean existByUserId(String userId) {
log.info("Calling User service for {}",userId);
- return repository.existsById(userId);
+ return repository.existsByKeycloakId(userId);
}
+
+
}
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 9cf47c5..d4d37c6 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -35,7 +35,6 @@
org.springframework.cloud
spring-cloud-config-server
-
org.springframework.boot
spring-boot-starter-test
diff --git a/configserver/src/main/resources/config/gateway-service.yml b/configserver/src/main/resources/config/gateway-service.yml
new file mode 100644
index 0000000..8fedb4c
--- /dev/null
+++ b/configserver/src/main/resources/config/gateway-service.yml
@@ -0,0 +1,34 @@
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:8761/eureka/
+
+spring:
+ application:
+ name: gateway-service
+ security:
+ oauth2:
+ resourceserver:
+ jwt:
+ jwk-set-uri: http://localhost:8181/realms/fitness/protocol/openid-connect/certs
+
+ cloud:
+ gateway:
+ routes:
+ - id: beastxfit
+ uri: lb://BEASTXFIT
+ predicates:
+ - Path=/api/users/**
+
+ - id: activity-service
+ uri: lb://ACTIVITY-SERVICE
+ predicates:
+ - Path=/api/activities/**
+
+ - id: ai-service
+ uri: lb://AI-SERVICE
+ predicates:
+ - Path=/api/recommendations/**
+
+server:
+ port: 8080
diff --git a/gateway/.gitattributes b/gateway/.gitattributes
new file mode 100644
index 0000000..3b41682
--- /dev/null
+++ b/gateway/.gitattributes
@@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf
diff --git a/gateway/.gitignore b/gateway/.gitignore
new file mode 100644
index 0000000..667aaef
--- /dev/null
+++ b/gateway/.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/gateway/.mvn/wrapper/maven-wrapper.properties b/gateway/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..8dea6c2
--- /dev/null
+++ b/gateway/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
diff --git a/gateway/mvnw b/gateway/mvnw
new file mode 100644
index 0000000..bd8896b
--- /dev/null
+++ b/gateway/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/gateway/mvnw.cmd b/gateway/mvnw.cmd
new file mode 100644
index 0000000..92450f9
--- /dev/null
+++ b/gateway/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/gateway/pom.xml b/gateway/pom.xml
new file mode 100644
index 0000000..3279eff
--- /dev/null
+++ b/gateway/pom.xml
@@ -0,0 +1,92 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 3.5.9
+
+
+ com.fitness
+ gateway
+ 0.0.1-SNAPSHOT
+ gateway
+ Demo project for Spring Boot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 25
+ 2025.0.1
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-config
+
+
+ org.springframework.boot
+ spring-boot-starter-oauth2-resource-server
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-gateway-server-webflux
+
+
+ org.springframework.cloud
+ spring-cloud-starter-netflix-eureka-client
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ io.projectreactor
+ reactor-test
+ test
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
\ No newline at end of file
diff --git a/gateway/src/main/java/com/fitness/gateway/GatewayApplication.java b/gateway/src/main/java/com/fitness/gateway/GatewayApplication.java
new file mode 100644
index 0000000..05157f9
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/GatewayApplication.java
@@ -0,0 +1,13 @@
+package com.fitness.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class GatewayApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(GatewayApplication.class, args);
+ }
+
+}
diff --git a/gateway/src/main/java/com/fitness/gateway/KeycloakUserSyncFilter.java b/gateway/src/main/java/com/fitness/gateway/KeycloakUserSyncFilter.java
new file mode 100644
index 0000000..be5eeba
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/KeycloakUserSyncFilter.java
@@ -0,0 +1,80 @@
+package com.fitness.gateway;
+
+import com.fitness.gateway.user.RegisterRequest;
+import com.fitness.gateway.user.UserService;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class KeycloakUserSyncFilter implements WebFilter {
+ private final UserService userService;
+
+ @Override
+ //ex:Bro, I don’t have the value now, but I’ll give you one value later OR an error.
+ public Mono filter(ServerWebExchange exchange, WebFilterChain chain) {
+ String token = exchange.getRequest().getHeaders().getFirst("Authorization");
+ String userId = exchange.getRequest().getHeaders().getFirst("X-User-ID");
+ RegisterRequest registerRequest = getUserDetails(token);
+
+ if (userId == null) {
+ userId = registerRequest.getKeycloakId();
+ }
+
+ if (userId != null && token != null){
+ String finalUserId = userId;
+ return userService.validateUser(userId)
+ .flatMap(exist -> {
+ if (!exist) {
+ // Register User
+
+ if (registerRequest != null) {
+ return userService.registerUser(registerRequest)
+ .then(Mono.empty());
+ } else {
+ return Mono.empty();
+ }
+ } else {
+ log.info("User already exist, Skipping sync.");
+ return Mono.empty();
+ }
+ }) //After the previous async check succeeds, add X-User-ID to the request and continue the gateway filter chain.
+ //jab tak is code block ko run na karo tab tak uper ka completely run na hojaye
+ .then(Mono.defer(() -> {
+ ServerHttpRequest mutatedRequest = exchange.getRequest().mutate()
+ .header("X-User-ID", finalUserId)
+ .build();
+ return chain.filter(exchange.mutate().request(mutatedRequest).build());
+ }));
+ }
+ return chain.filter(exchange);
+ }
+
+ private RegisterRequest getUserDetails(String token) {
+ try {
+ String tokenWithoutBearer = token.replace("Bearer ", "").trim();
+ SignedJWT signedJWT = SignedJWT.parse(tokenWithoutBearer);
+ JWTClaimsSet claims = signedJWT.getJWTClaimsSet();
+
+ RegisterRequest registerRequest = new RegisterRequest();
+ registerRequest.setEmail(claims.getStringClaim("email"));
+ registerRequest.setKeycloakId(claims.getStringClaim("sub"));
+ registerRequest.setPassword("dummy@123123");
+ registerRequest.setFirstName(claims.getStringClaim("given_name"));
+ registerRequest.setLastName(claims.getStringClaim("family_name"));
+ return registerRequest;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/fitness/gateway/SecurityConfig.java b/gateway/src/main/java/com/fitness/gateway/SecurityConfig.java
new file mode 100644
index 0000000..1c0e75f
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/SecurityConfig.java
@@ -0,0 +1,31 @@
+package com.fitness.gateway;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.oauth2.jwt.NimbusReactiveJwtDecoder;
+import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+
+@Configuration
+@EnableWebFluxSecurity
+public class SecurityConfig {
+
+ @Bean
+ public ReactiveJwtDecoder reactiveJwtDecoder() {
+ return NimbusReactiveJwtDecoder
+ .withIssuerLocation("http://localhost:8181/realms/fitness")
+ .build();
+ }
+
+ @Bean
+ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http){
+ return http
+ .csrf(ServerHttpSecurity.CsrfSpec::disable)
+ .authorizeExchange(exchange -> exchange.anyExchange().authenticated())
+ .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()))
+ .build();
+ }
+}
diff --git a/gateway/src/main/java/com/fitness/gateway/user/RegisterRequest.java b/gateway/src/main/java/com/fitness/gateway/user/RegisterRequest.java
new file mode 100644
index 0000000..977063b
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/user/RegisterRequest.java
@@ -0,0 +1,21 @@
+package com.fitness.gateway.user;
+
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class RegisterRequest {
+ @NotBlank(message ="Email is required")
+ @Email(message ="Invalid email format")
+ private String email;
+
+ @NotBlank(message="Passsword is required")
+ @Size(min = 6,message = "password must have 6 characters ")
+ private String keycloakId;
+ private String password;
+ private String firstName;
+ private String lastName;
+}
diff --git a/gateway/src/main/java/com/fitness/gateway/user/UserResponse.java b/gateway/src/main/java/com/fitness/gateway/user/UserResponse.java
new file mode 100644
index 0000000..489d2a5
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/user/UserResponse.java
@@ -0,0 +1,19 @@
+package com.fitness.gateway.user;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class UserResponse {
+ private String id;
+ private String keyCloakId;
+ private String email;
+ private String password;
+ private String firstName;
+ private String lastName;
+ //whenever we push any record its value(time bro)is automatically genereation
+ private LocalDateTime createdAt;
+ private LocalDateTime updatedAt;
+
+}
diff --git a/gateway/src/main/java/com/fitness/gateway/user/UserService.java b/gateway/src/main/java/com/fitness/gateway/user/UserService.java
new file mode 100644
index 0000000..8019a02
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/user/UserService.java
@@ -0,0 +1,47 @@
+package com.fitness.gateway.user;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Mono;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class UserService {
+ private final WebClient userServiceWebClient;
+
+ public Mono validateUser(String userId) {
+ log.info("Calling User Validation API for userId: {}", userId);
+ return userServiceWebClient.get()
+ .uri("/api/users/{userId}/validate", userId)
+ .retrieve()
+ .bodyToMono(Boolean.class)
+ .onErrorResume(WebClientResponseException.class, e -> {
+ if (e.getStatusCode() == HttpStatus.NOT_FOUND)
+ return Mono.error(new RuntimeException("User Not Found: " + userId));
+ else if (e.getStatusCode() == HttpStatus.BAD_REQUEST)
+ return Mono.error(new RuntimeException("Invalid Request: " + userId));
+ return Mono.error(new RuntimeException("Unexpected error: " + e.getMessage()));
+ });
+ }
+
+ public Mono registerUser(RegisterRequest request) {
+ log.info("Calling User Registration API for email: {}", request.getEmail());
+ return userServiceWebClient.post()
+ .uri("/api/users/register")
+ .bodyValue(request)
+ .retrieve()
+ .bodyToMono(UserResponse.class)
+ .onErrorResume(WebClientResponseException.class, e -> {
+ if (e.getStatusCode() == HttpStatus.BAD_REQUEST)
+ return Mono.error(new RuntimeException("Bad Request: " + e.getMessage()));
+ else if (e.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR)
+ return Mono.error(new RuntimeException("Internal Server Error: " + e.getMessage()));
+ return Mono.error(new RuntimeException("Unexpected error: " + e.getMessage()));
+ });
+ }
+}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/fitness/gateway/user/WebClientConfig.java b/gateway/src/main/java/com/fitness/gateway/user/WebClientConfig.java
new file mode 100644
index 0000000..4618056
--- /dev/null
+++ b/gateway/src/main/java/com/fitness/gateway/user/WebClientConfig.java
@@ -0,0 +1,22 @@
+package com.fitness.gateway.user;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+
+@Configuration
+public class WebClientConfig {
+
+ @Bean
+ @LoadBalanced
+ public WebClient.Builder webClientBuilder(){
+ return WebClient.builder();
+ }
+ @Bean
+ public WebClient userServiceWebClient(WebClient.Builder webClientBuilder){
+ return webClientBuilder.baseUrl("http://BEASTXFIT")
+ .build();
+ }
+}
diff --git a/gateway/src/main/resources/application.yaml b/gateway/src/main/resources/application.yaml
new file mode 100644
index 0000000..4737771
--- /dev/null
+++ b/gateway/src/main/resources/application.yaml
@@ -0,0 +1,5 @@
+spring:
+ application:
+ name: gateway-service
+ config:
+ import: optional:configserver:http://localhost:8888
diff --git a/gateway/src/test/java/com/fitness/gateway/GatewayApplicationTests.java b/gateway/src/test/java/com/fitness/gateway/GatewayApplicationTests.java
new file mode 100644
index 0000000..141164a
--- /dev/null
+++ b/gateway/src/test/java/com/fitness/gateway/GatewayApplicationTests.java
@@ -0,0 +1,13 @@
+package com.fitness.gateway;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class GatewayApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}