diff --git a/angular/RestClient/Dockerfile b/angular/RestClient/Dockerfile index aaff9569e4c40a877c90fe14463a0e0d2e2d1e04..22f1432244fd2560ef3afbab315703dc52b0cd59 100644 --- a/angular/RestClient/Dockerfile +++ b/angular/RestClient/Dockerfile @@ -19,6 +19,7 @@ FROM nginx:alpine AS production # Copiar los archivos de construcción generados en la etapa anterior a la carpeta de Nginx COPY --from=build /app/dist/app/browser /usr/share/nginx/html +COPY --from=build-step /app/*.conf /etc/nginx/sites-available/default # Exponer el puerto 80 para Nginx EXPOSE 80 diff --git a/angular/RestClient/nginx-custom.conf b/angular/RestClient/nginx-custom.conf new file mode 100644 index 0000000000000000000000000000000000000000..a560219f7e4adb58bc6fd7e0abf571675ee9b5fa --- /dev/null +++ b/angular/RestClient/nginx-custom.conf @@ -0,0 +1,8 @@ +server { + listen 80; + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html =404; + } +} \ No newline at end of file diff --git a/angular/RestClient/src/app/core/navigation/navigation.component.ts b/angular/RestClient/src/app/core/navigation/navigation.component.ts index f6c8317d8abca7534558fe3ebabe62c1ec5c2c45..effeb032ae23e20086be4661a92971ac5543cb36 100644 --- a/angular/RestClient/src/app/core/navigation/navigation.component.ts +++ b/angular/RestClient/src/app/core/navigation/navigation.component.ts @@ -91,6 +91,13 @@ export class NavigationComponent implements OnInit { allowRoles: ['HOTEL_ADMIN'], link: '/me/hotels', }, + { + id: genId(), + icon: 'fiber_new', + text: 'Registrar hotel', + allowRoles: ['HOTEL_ADMIN'], + link: '/hotels/register', + }, { id: genId(), icon: 'settings', diff --git a/java/roomBooking/src/main/java/com/uva/monolith/config/SecurityConfig.java b/java/roomBooking/src/main/java/com/uva/monolith/config/SecurityConfig.java index d9b84fbad965da3f54577198e81d76122beb5d2e..8264f84a2e9f57dabaedc5892ea8a3ca0e931232 100644 --- a/java/roomBooking/src/main/java/com/uva/monolith/config/SecurityConfig.java +++ b/java/roomBooking/src/main/java/com/uva/monolith/config/SecurityConfig.java @@ -28,8 +28,8 @@ public class SecurityConfig { // Permitir OPTIONS sin autenticación .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() // Acceso restringido a usuarios y administradores - .requestMatchers("users", "users/**") - .hasAnyRole(UserRol.ADMIN.toString(), UserRol.CLIENT.toString()) + .requestMatchers("users", "users/**").hasAnyRole( + UserRol.CLIENT.toString(), UserRol.HOTEL_ADMIN.toString(), UserRol.ADMIN.toString()) // Acceso restringido a gestores de hoteles y administradores .requestMatchers(HttpMethod.GET, "hotels", "hotels/*").hasAnyRole( UserRol.CLIENT.toString(), UserRol.HOTEL_ADMIN.toString(), UserRol.ADMIN.toString())