Commit 1c2f5e70 authored 3 months ago by migudel

Merge branch 'dev/sercure-services' into 'develop'

Dev/sercure services

See merge request !35

parents cec15f27 059f548d

No related branches found

No related tags found

2 merge requests!36Develop,!35Dev/sercure services

Hide whitespace changes

Inline Side-by-side

Showing

java/services/bookings/src/main/java/com/uva/api/bookings/api/TokenAPI.java 1 addition, 1 deletion

...ings/src/main/java/com/uva/api/bookings/api/TokenAPI.java
java/services/bookings/src/main/java/com/uva/api/bookings/config/MyScheduledTasks.java 2 additions, 2 deletions

...in/java/com/uva/api/bookings/config/MyScheduledTasks.java
java/services/bookings/src/main/java/com/uva/api/bookings/config/SecurityConfig.java 56 additions, 27 deletions

...main/java/com/uva/api/bookings/config/SecurityConfig.java
java/services/bookings/src/main/java/com/uva/api/bookings/controllers/BookingController.java 17 additions, 10 deletions

...a/com/uva/api/bookings/controllers/BookingController.java
java/services/bookings/src/main/java/com/uva/api/bookings/filter/JwtAuthenticationFilter.java 36 additions, 32 deletions

.../com/uva/api/bookings/filter/JwtAuthenticationFilter.java
java/services/bookings/src/main/java/com/uva/api/bookings/models/external/jwt/JwtData.java 2 additions, 2 deletions

...ava/com/uva/api/bookings/models/external/jwt/JwtData.java
java/services/bookings/src/main/java/com/uva/api/bookings/models/external/jwt/Service.java 8 additions, 0 deletions

...ava/com/uva/api/bookings/models/external/jwt/Service.java
java/services/bookings/src/main/java/com/uva/api/bookings/models/external/users/UserRol.java 1 addition, 1 deletion

...a/com/uva/api/bookings/models/external/users/UserRol.java
java/services/bookings/src/main/java/com/uva/api/bookings/services/BookingService.java 61 additions, 44 deletions

...in/java/com/uva/api/bookings/services/BookingService.java
java/services/bookings/src/main/java/com/uva/api/bookings/services/TokenService.java 42 additions, 8 deletions

...main/java/com/uva/api/bookings/services/TokenService.java
java/services/bookings/src/main/java/com/uva/api/bookings/utils/Utils.java 14 additions, 0 deletions

...kings/src/main/java/com/uva/api/bookings/utils/Utils.java
java/services/hotels/src/main/java/com/uva/api/hotels/apis/TokenAPI.java 1 addition, 1 deletion

...otels/src/main/java/com/uva/api/hotels/apis/TokenAPI.java
java/services/hotels/src/main/java/com/uva/api/hotels/config/RestTemplateInterceptor.java 0 additions, 1 deletion

...va/com/uva/api/hotels/config/RestTemplateInterceptor.java
java/services/hotels/src/main/java/com/uva/api/hotels/config/SecurityConfig.java 58 additions, 24 deletions

...c/main/java/com/uva/api/hotels/config/SecurityConfig.java
java/services/hotels/src/main/java/com/uva/api/hotels/controllers/HotelController.java 26 additions, 23 deletions

.../java/com/uva/api/hotels/controllers/HotelController.java
java/services/hotels/src/main/java/com/uva/api/hotels/filter/JwtAuthenticationFilter.java 37 additions, 32 deletions

...va/com/uva/api/hotels/filter/JwtAuthenticationFilter.java
java/services/hotels/src/main/java/com/uva/api/hotels/models/Hotel.java 1 addition, 1 deletion

...hotels/src/main/java/com/uva/api/hotels/models/Hotel.java
java/services/hotels/src/main/java/com/uva/api/hotels/models/external/jwt/JwtData.java 2 additions, 2 deletions

.../java/com/uva/api/hotels/models/external/jwt/JwtData.java
java/services/hotels/src/main/java/com/uva/api/hotels/models/external/jwt/Service.java 8 additions, 0 deletions

.../java/com/uva/api/hotels/models/external/jwt/Service.java
java/services/hotels/src/main/java/com/uva/api/hotels/models/external/users/UserRol.java 1 addition, 1 deletion

...ava/com/uva/api/hotels/models/external/users/UserRol.java

with 374 additions and 212 deletions

Please register or to comment