Skip to content
Merged

Dev #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0f60b34
configuration
Raydberg Sep 12, 2025
19b9b1b
feat: add authenticated with email and password and cookies
Raydberg Sep 18, 2025
b7bfe3f
feat: add or remove roles for users
Raydberg Sep 18, 2025
4bc8607
feat: add new method for activate and desactivate for users
Raydberg Sep 18, 2025
b6d681c
feat: refactor for code about good practices
Raydberg Sep 18, 2025
a7ded03
fix: update packages names
Raydberg Sep 18, 2025
10b9303
Merge remote-tracking branch 'origin/dev' into feat/config-security-w…
Raydberg Sep 19, 2025
373f237
Merge pull request #6 from FitDesk/feat/config-security-with-roles
Raydberg Sep 19, 2025
4f11e19
feat: actualizar Dockerfile y agregar configuración de Kafka
Raydberg Sep 25, 2025
66de0d9
fix: add config for kafka producer
Raydberg Sep 28, 2025
7ec2e91
fix: add config for kafka producer
Raydberg Sep 29, 2025
0cd50dd
refactor: simplificar configuración del productor de Kafka y agregar …
Raydberg Sep 29, 2025
f3ba89d
send message with user created for microservices members
Raydberg Sep 29, 2025
60edf42
Merge pull request #8 from FitDesk/feat/enviar-notificacion-al-micros…
Raydberg Sep 29, 2025
e236370
refactor: mejorar la configuración de cookies y agregar comentarios s…
Raydberg Sep 30, 2025
450367a
Merge pull request #9 from FitDesk/feat/enviar-notificacion-al-micros…
Raydberg Sep 30, 2025
c226228
update files
Raydberg Oct 3, 2025
7de4305
Merge pull request #10 from FitDesk/feat/enviar-notificacion-al-micro…
Raydberg Oct 3, 2025
d5da3e5
complete login with oauth2 for google
Raydberg Oct 6, 2025
bce7a33
Merge pull request #12 from FitDesk/11-implementar-oauth2
Raydberg Oct 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 4 additions & 65 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,70 +1,9 @@
FROM openjdk:21-jdk-slim
WORKDIR /app
COPY pom.xml .
COPY mvnw .
COPY .mvn .mvn
COPY mvnw pom.xml ./
RUN chmod +x mvnw
RUN ./mvnw dependency:go-offline
RUN ./mvnw -T 4 dependency:go-offline
COPY src ./src
EXPOSE 9091
CMD ["./mvnw", "spring-boot:run"]

# FROM openjdk:21-jdk-slim

# # Instalar Maven
# RUN apt-get update && apt-get install -y maven && rm -rf /var/lib/apt/lists/*

# WORKDIR /app

# # ✅ Instalar security-common primero
# COPY security-common /app/security-common
# WORKDIR /app/security-common
# RUN mvn clean install -DskipTests

# # ✅ Construir msvc-security
# WORKDIR /app/msvc-security
# COPY msvc-security/pom.xml .
# COPY msvc-security/mvnw .
# COPY msvc-security/.mvn .mvn
# RUN chmod +x mvnw

# COPY msvc-security/src ./src

# EXPOSE 9091
# CMD ["./mvnw", "spring-boot:run", "-Dspring-boot.run.fork=false"]



# FROM openjdk:21-jdk-slim

# RUN apt-get update && \
# apt-get install -y maven && \
# rm -rf /var/lib/apt/lists/* && \
# mvn --version

# WORKDIR /app

# COPY security-common/pom.xml /app/security-common/pom.xml
# COPY msvc-security/pom.xml /app/msvc-security/pom.xml

# WORKDIR /app/security-common
# RUN mvn dependency:resolve || true

# COPY security-common /app/security-common
# RUN mvn clean install -DskipTests -q

# WORKDIR /app/msvc-security
# COPY msvc-security/mvnw .
# COPY msvc-security/.mvn .mvn
# RUN chmod +x mvnw

# RUN ./mvnw dependency:go-offline -q || true

# COPY msvc-security/src ./src

# EXPOSE 9091
# ENV SPRING_PROFILES_ACTIVE=dev

# CMD ["./mvnw", "spring-boot:run", \
# "-Dspring-boot.run.fork=false", \
# "-Dspring-boot.run.jvmArguments=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005"]
EXPOSE 9091 5005
CMD ["./mvnw", "spring-boot:run", "-Dspring-boot.run.jvmArguments=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"]
11 changes: 9 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -135,7 +135,10 @@
<version>${mapstruct.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
</dependency>

<!-- Security -->
<dependency>
Expand All @@ -150,6 +153,10 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
Expand Down
25 changes: 0 additions & 25 deletions src/main/java/com/security/config/Audit.java

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/com/security/config/CommonPointcuts.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@Component
public class CommonPointcuts {
@Pointcut("execution(* com.security.services.*.*(..))")
public void greetingLoggerServices(){};
public void greetingLoggerServices(){}

@Pointcut("execution(* com.security.controllers.*.*(..))")
public void greetingLoggerControllers(){};
public void greetingLoggerControllers(){}
}
105 changes: 0 additions & 105 deletions src/main/java/com/security/config/DataInitializer.java

This file was deleted.

34 changes: 34 additions & 0 deletions src/main/java/com/security/config/RoleInitializer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.security.config;

import com.security.entity.RoleEntity;
import com.security.repository.RoleRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;


@Component
@RequiredArgsConstructor
@Slf4j
public class RoleInitializer implements CommandLineRunner {
private final RoleRepository roleRepository;

@Override
public void run(String... args) throws Exception {
createRoleIfNotExists("ADMIN", "Administrator role");
createRoleIfNotExists("USER", "User role");
createRoleIfNotExists("TRAINER", "Trainer role");
}

private void createRoleIfNotExists(String name, String description) {
roleRepository.findByName(name)
.orElseGet(() -> {
log.info("Creando {} role", name);
return roleRepository.save(RoleEntity.builder()
.name(name)
.description(description)
.build());
});
}
}
Loading