Skip to content
Snippets Groups Projects
Commit a00f340a authored by migudel's avatar migudel :speech_balloon:
Browse files

Configuración e integración de kong, alineamiento de los metadatos de los microservicios

parent 9ab8a9d2
No related branches found
No related tags found
2 merge requests!36Develop,!33Fix/kong review
This commit is part of merge request !33. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 136 additions and 91 deletions
.env
+ 24
− 10
View file @ a00f340a
...@@ -2,31 +2,39 @@ ...@@ -2,31 +2,39 @@
# Environment # Environment
####################################### #######################################
## Meter aquí cosas sobre las keys del token y esas mierdas
####################################### #######################################
# APIs # APIs
####################################### #######################################
## AUTH ## AUTH
API_AUTH_ENDPOINT=/users
API_AUTH_HOSTNAME=auth-api API_AUTH_HOSTNAME=auth-api
API_AUTH_PORT=8101 API_AUTH_PORT=8101
API_AUTH_URL=http://$API_AUTH_HOSTNAME:$API_AUTH_PORT$API_AUTH_ENDPOINT API_AUTH_URL=http://$API_AUTH_HOSTNAME:$API_AUTH_PORT
API_AUTH_TOKEN_URL=$API_AUTH_URL/token
## Bookings ## Bookings
API_BOOKINGS_ENDPOINT=/bookings
API_BOOKINGS_HOSTNAME=bookings-api API_BOOKINGS_HOSTNAME=bookings-api
API_BOOKINGS_PORT=8401 API_BOOKINGS_PORT=8401
API_BOOKINGS_URL=http://$API_BOOKINGS_HOSTNAME:$API_BOOKINGS_PORT$API_BOOKINGS_ENDPOINT API_BOOKINGS_URL=http://$API_BOOKINGS_HOSTNAME:$API_BOOKINGS_PORT
## Hotels ## Hotels
API_HOTELS_ENDPOINT=/hotels
API_HOTELS_HOSTNAME=hotels-api API_HOTELS_HOSTNAME=hotels-api
API_HOTELS_PORT=8301 API_HOTELS_PORT=8301
API_HOTELS_URL=http://$API_HOTELS_HOSTNAME:$API_HOTELS_PORT$API_HOTELS_ENDPOINT API_HOTELS_URL=http://$API_HOTELS_HOSTNAME:$API_HOTELS_PORT
## Users ## Users
API_USERS_ENDPOINT=/users
API_USERS_HOSTNAME=users-api API_USERS_HOSTNAME=users-api
API_USERS_PORT=8201 API_USERS_PORT=8201
API_USERS_URL=http://$API_USERS_HOSTNAME:$API_USERS_PORT$API_USERS_ENDPOINT API_USERS_URL=http://$API_USERS_HOSTNAME:$API_USERS_PORT
## Kong
# Kong configuration
API_KONG_HOSTNAME=kong
API_KONG_PORT=8000
API_KONG_URL=http://$API_KONG_HOSTNAME:$API_KONG_PORT
API_KONG_GATEWAY=$API_KONG_URL/api
# Kong Routes
API_KONG_ROUTE_AUTH_URL=$API_KONG_GATEWAY/auth
API_KONG_ROUTE_BOOKINGS_URL=$API_KONG_GATEWAY/bookings
API_KONG_ROUTE_CLIENTS_URL=$API_KONG_GATEWAY/users/clients
API_KONG_ROUTE_HOTELS_URL=$API_KONG_GATEWAY/hotels
API_KONG_ROUTE_MANAGERS_URL=$API_KONG_GATEWAY/users/managers
API_KONG_ROUTE_USERS_URL=$API_KONG_GATEWAY/users
# #
####################################### #######################################
# Databases # Databases
...@@ -40,3 +48,9 @@ DB_HOTELS_HOSTNAME=HotelsDB ...@@ -40,3 +48,9 @@ DB_HOTELS_HOSTNAME=HotelsDB
## DB Users ## DB Users
DB_USERS_DATABASE=Users DB_USERS_DATABASE=Users
DB_USERS_HOSTNAME=UsersDB DB_USERS_HOSTNAME=UsersDB
#
#######################################
# JWT
#######################################
JWT_KEY=MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot
JWT_KID=9L8RmLEKMFd54WrR06CE9zoRSAGpCWeu
.gitignore
+ 2
− 3
View file @ a00f340a
### Own ### ### Own ###
taller .trunk/
*.pdf *.pdf
**/target/ **/target/
**/.vscode **/.vscode
...@@ -7,4 +7,3 @@ taller ...@@ -7,4 +7,3 @@ taller
**/*.tmp **/*.tmp
*.ln *.ln
*.log *.log
\ No newline at end of file
angular/RestClient/src/mocks/users.ts deleted 100644 → 0
+ 0
− 18
View file @ 9ab8a9d2
import { Client, User } from '../app/core/models';
export const users: Client[] = [
{
id: 1,
name: 'John Doe',
email: 'jon@com',
rol: 'CLIENT',
status: 'NO_BOOKINGS',
},
{
id: 2,
name: 'Angela Doe',
email: 'angle@com',
rol: 'CLIENT',
status: 'NO_BOOKINGS',
},
];
docker-compose.yml
+ 56
− 22
View file @ a00f340a
...@@ -8,6 +8,26 @@ networks: #Red interna para comunicar los servicios ...@@ -8,6 +8,26 @@ networks: #Red interna para comunicar los servicios
kong-net: kong-net:
services: services:
#######################################
# Cliente Angular
#######################################
# RoomsBooking-Web:
# image: roomsbooking-web-image
# build:
# context: ./angular/RestClient
# dockerfile: ./Dockerfile
# restart: unless-stopped
# ports:
# - 4200:80
# networks:
# - kong-net
# depends_on:
# - kong
# - Auth-API
# - Users-API
# - Hotels-API
# - Bookings-API
####################################### #######################################
# Kong # Kong
####################################### #######################################
...@@ -110,6 +130,25 @@ services: ...@@ -110,6 +130,25 @@ services:
ports: ports:
- 1337:1337 - 1337:1337
#######################################
# Generate Data
#######################################
Generate-APIs-Data:
image: gen-apis-data
build:
context: ./poblate
dockerfile: Dockerfile
networks:
- kong-net
restart: on-failure
depends_on:
- kong
- Auth-API
- Users-API
- Hotels-API
- Bookings-API
####################################### #######################################
# APIs # APIs
####################################### #######################################
...@@ -124,10 +163,11 @@ services: ...@@ -124,10 +163,11 @@ services:
networks: networks:
- kong-net - kong-net
environment: environment:
SECURITY_JWT_EXPIRATION: 3600000 SECURITY_JWT_SECRET-KEY: ${JWT_KEY}
SECURITY_JWT_KID: ${JWT_KID:-9L8RmLEKMFd54WrR06CE9zoRSAGpCWeu} SECURITY_JWT_KID: ${JWT_KID}
SECURITY_JWT_SECRET_KEY: ${JWT_KEY:-MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot} SECURITY_JWT_EXTERNAL_EXPIRATION: ${JWT_EXTERNAL_EXPIRATION:-3600}
EXTERNAL_SERVICES_USERS_URL: ${API_USERS_URL} SECURITY_JWT_INTERNAL_EXPIRATION: ${JWT_INTERNAL_EXPIRATION:-600}
SERVICES_EXTERNAL_USERS_URL: ${API_KONG_ROUTE_USERS_URL}
depends_on: depends_on:
- Users-API - Users-API
...@@ -142,7 +182,9 @@ services: ...@@ -142,7 +182,9 @@ services:
- kong-net - kong-net
environment: environment:
SPRING_DATASOURCE_URL: jdbc:mysql://${DB_USERS_HOSTNAME}:${DB_USERS_PORT:-3306}/${DB_USERS_DATABASE}?createDatabaseIfNotExist=true SPRING_DATASOURCE_URL: jdbc:mysql://${DB_USERS_HOSTNAME}:${DB_USERS_PORT:-3306}/${DB_USERS_DATABASE}?createDatabaseIfNotExist=true
EXTERNAL_SERVICE_USERS_URL: ${API_USERS_URL}${API_USERS_ENDPOINT} SERVICES_INTERNAL_TOKEN_URL: ${API_AUTH_TOKEN_URL}
SERVICES_EXTERNAL_HOTELS_URL: ${API_KONG_ROUTE_HOTELS_URL}
SERVICES_EXTERNAL_BOOKINGS_URL: ${API_KONG_ROUTE_BOOKINGS_URL}
depends_on: depends_on:
- Users-DB - Users-DB
...@@ -157,6 +199,9 @@ services: ...@@ -157,6 +199,9 @@ services:
- kong-net - kong-net
environment: environment:
SPRING_DATASOURCE_URL: jdbc:mysql://${DB_HOTELS_HOSTNAME}:${DB_HOTELS_PORT:-3306}/${DB_HOTELS_DATABASE}?createDatabaseIfNotExist=true SPRING_DATASOURCE_URL: jdbc:mysql://${DB_HOTELS_HOSTNAME}:${DB_HOTELS_PORT:-3306}/${DB_HOTELS_DATABASE}?createDatabaseIfNotExist=true
SERVICES_INTERNAL_TOKEN_URL: ${API_AUTH_TOKEN_URL}
SERVICES_EXTERNAL_MANAGERS_URL: ${API_KONG_ROUTE_MANAGERS_URL}
SERVICES_EXTERNAL_BOOKINGS_URL: ${API_KONG_ROUTE_BOOKINGS_URL}
depends_on: depends_on:
- Hotels-DB - Hotels-DB
...@@ -171,6 +216,11 @@ services: ...@@ -171,6 +216,11 @@ services:
- kong-net - kong-net
environment: environment:
SPRING_DATASOURCE_URL: jdbc:mysql://${DB_BOOKINGS_HOSTNAME}:${DB_BOOKINGS_PORT:-3306}/${DB_BOOKINGS_DATABASE}?createDatabaseIfNotExist=true SPRING_DATASOURCE_URL: jdbc:mysql://${DB_BOOKINGS_HOSTNAME}:${DB_BOOKINGS_PORT:-3306}/${DB_BOOKINGS_DATABASE}?createDatabaseIfNotExist=true
SERVICES_INTERNAL_TOKEN_URL: ${API_AUTH_TOKEN_URL}
SERVICES_EXTERNAL_CLIENTS_URL: ${API_KONG_ROUTE_CLIENTS_URL}
SERVICES_EXTERNAL_MANAGERS_URL: ${API_KONG_ROUTE_MANAGERS_URL}
SERVICES_EXTERNAL_HOTELS_URL: ${API_KONG_ROUTE_HOTELS_URL}
depends_on: depends_on:
- Users-API - Users-API
- Hotels-API - Hotels-API
...@@ -223,26 +273,10 @@ services: ...@@ -223,26 +273,10 @@ services:
networks: networks:
- kong-net - kong-net
volumes: volumes:
- hotels_data:/var/lib/mysql - bookings_data:/var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: ${DB_CREDENTIALS_ROOT_PASSWORD:-ClaveRoot} MYSQL_ROOT_PASSWORD: ${DB_CREDENTIALS_ROOT_PASSWORD:-ClaveRoot}
MYSQL_USER: ${DB_CREDENTIALS_USER:-user} MYSQL_USER: ${DB_CREDENTIALS_USER:-user}
MYSQL_PASSWORD: ${DB_CREDENTIALS_PASSWORD:-password} MYSQL_PASSWORD: ${DB_CREDENTIALS_PASSWORD:-password}
MYSQL_DATABASE: ${DB_BOOKINGS_DATABASE} MYSQL_DATABASE: ${DB_BOOKINGS_DATABASE}
MYSQL_ROOT_HOST: "%" MYSQL_ROOT_HOST: "%"
#######################################
# Cliente Angular
#######################################
RoomsBooking-Web:
image: roomsbooking-web-image
build:
context: ./angular/RestClient
dockerfile: ./Dockerfile
restart: unless-stopped
ports:
- 4200:80
networks:
- kong-net
depends_on:
- RoomsBooking-database
java/services/auth/src/main/resources/application.properties
+ 2
− 2
View file @ a00f340a
...@@ -2,9 +2,9 @@ spring.application.name=authentication ...@@ -2,9 +2,9 @@ spring.application.name=authentication
server.port=8101 server.port=8101
security.jwt.secret-key=MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot security.jwt.secret-key=MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot
# 1h in seconds # Tiempo de validez para tokens para usuarios (externos) 1h in seconds
security.jwt.external.expiration=3600 security.jwt.external.expiration=3600
# 10min in seconds # Tiempo de validez para tokens para servicios (internos) 10min in seconds
security.jwt.internal.expiration=600 security.jwt.internal.expiration=600
security.jwt.kid=cYz3kNRLAirxVhHXQ5rh5xKrOwHwZVui security.jwt.kid=cYz3kNRLAirxVhHXQ5rh5xKrOwHwZVui
... ...
......
java/services/bookings/src/main/java/com/uva/api/bookings/api/UserApi.java
+ 7
− 4
View file @ a00f340a
...@@ -14,12 +14,15 @@ public class UserApi { ...@@ -14,12 +14,15 @@ public class UserApi {
@Autowired @Autowired
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Value("${services.external.users.url}") @Value("${services.external.clients.url}")
private String USERS_API_URL; private String CLIENTS_API_URL;
@Value("${services.external.managers.url}")
private String MANAGERS_API_URL;
public boolean existsClientById(int id) { public boolean existsClientById(int id) {
try { try {
String url = USERS_API_URL + "/clients/{id}"; String url = CLIENTS_API_URL + "/{id}";
ResponseEntity<Void> response = restTemplate.getForEntity(url, Void.class, id); ResponseEntity<Void> response = restTemplate.getForEntity(url, Void.class, id);
return response.getStatusCode() == HttpStatus.OK; return response.getStatusCode() == HttpStatus.OK;
} catch (HttpClientErrorException ex) { } catch (HttpClientErrorException ex) {
...@@ -32,7 +35,7 @@ public class UserApi { ...@@ -32,7 +35,7 @@ public class UserApi {
public boolean existsManagerById(int id) { public boolean existsManagerById(int id) {
try { try {
String url = USERS_API_URL + "/managers/{id}"; String url = MANAGERS_API_URL + "/{id}";
ResponseEntity<Void> response = restTemplate.getForEntity(url, Void.class, id); ResponseEntity<Void> response = restTemplate.getForEntity(url, Void.class, id);
return response.getStatusCode() == HttpStatus.OK; return response.getStatusCode() == HttpStatus.OK;
} catch (HttpClientErrorException ex) { } catch (HttpClientErrorException ex) {
... ...
......
java/services/bookings/src/main/resources/application.properties
+ 4
− 2
View file @ a00f340a
...@@ -7,8 +7,10 @@ spring.datasource.username=user ...@@ -7,8 +7,10 @@ spring.datasource.username=user
spring.datasource.password=password spring.datasource.password=password
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.security.user.enabled=false spring.security.user.name=user
spring.security.user.password=password
services.internal.token.url=http://localhost:8101/token services.internal.token.url=http://localhost:8101/token
services.external.users.url=http://localhost:8201/users services.external.clients.url=http://localhost:8201/users/clients
services.external.managers.url=http://localhost:8201/users/managers
services.external.hotels.url=http://localhost:8301/hotels services.external.hotels.url=http://localhost:8301/hotels
\ No newline at end of file
java/services/hotels/src/main/resources/application.properties
+ 2
− 6
View file @ a00f340a
...@@ -7,12 +7,8 @@ spring.datasource.username=user ...@@ -7,12 +7,8 @@ spring.datasource.username=user
spring.datasource.password=password spring.datasource.password=password
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.security.user.enabled=false spring.security.user.name=user
spring.security.user.password=password
security.jwt.secret-key=MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot
# 1h in millisecond
security.jwt.expiration-time=3600000
security.jwt.kid=cYz3kNRLAirxVhHXQ5rh5xKrOwHwZVui
services.internal.token.url=http://localhost:8101/token services.internal.token.url=http://localhost:8101/token
services.external.managers.url=http://localhost:8201/users/managers services.external.managers.url=http://localhost:8201/users/managers
... ...
......
java/services/users/src/main/resources/application.properties
+ 0
− 5
View file @ a00f340a
...@@ -10,11 +10,6 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ...@@ -10,11 +10,6 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.security.user.name=user spring.security.user.name=user
spring.security.user.password=password spring.security.user.password=password
security.jwt.secret-key=MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot
# 1h in millisecond
security.jwt.expiration-time=3600000
security.jwt.kid=cYz3kNRLAirxVhHXQ5rh5xKrOwHwZVui
services.internal.token.url=http://localhost:8101/token/ services.internal.token.url=http://localhost:8101/token/
services.external.hotels.url=http://localhost:8301/hotels services.external.hotels.url=http://localhost:8301/hotels
services.external.bookings.url=http://localhost:8401/bookings services.external.bookings.url=http://localhost:8401/bookings
\ No newline at end of file
kong_config.json 0 → 100644
+ 1
− 0
View file @ a00f340a
{"createdUser":null,"updatedUser":null,"id":1,"name":"Practica","kong_node_name":"Kong","kong_node_url":"http://kong:8001","kong_version":"3.9.0","data":{"services":[{"retries":5,"tags":[],"created_at":1735150914,"updated_at":1735150914,"name":"Users","port":8201,"id":"1d1ce8d9-aa4b-4576-8d91-00326d00c26e","client_certificate":null,"write_timeout":60000,"connect_timeout":60000,"read_timeout":60000,"protocol":"http","enabled":true,"ca_certificates":null,"tls_verify":null,"path":"/users","tls_verify_depth":null,"host":"users-api","extras":{"id":1,"service_id":"1d1ce8d9-aa4b-4576-8d91-00326d00c26e","kong_node_id":"1","description":null,"tags":null,"createdAt":"2024-12-25T18:21:54.000Z","updatedAt":"2024-12-25T18:21:54.000Z","createdUser":null,"updatedUser":null}},{"retries":5,"tags":[],"created_at":1735151821,"updated_at":1735151821,"name":"Hotels","port":8301,"id":"37407f92-1d9f-4d88-b80f-0bc9a3fb57fd","client_certificate":null,"write_timeout":60000,"connect_timeout":60000,"read_timeout":60000,"protocol":"http","enabled":true,"ca_certificates":null,"tls_verify":null,"path":"/hotels","tls_verify_depth":null,"host":"hotels-api","extras":{"id":3,"service_id":"37407f92-1d9f-4d88-b80f-0bc9a3fb57fd","kong_node_id":"1","description":null,"tags":null,"createdAt":"2024-12-25T18:37:01.000Z","updatedAt":"2024-12-25T18:37:01.000Z","createdUser":null,"updatedUser":null}},{"retries":5,"tags":[],"created_at":1735151037,"updated_at":1735151134,"name":"Auth","port":8101,"id":"60e76e38-63f1-4fd7-b10c-51456722a312","client_certificate":null,"write_timeout":60000,"connect_timeout":60000,"read_timeout":60000,"protocol":"http","enabled":true,"ca_certificates":null,"tls_verify":null,"path":"/auth","tls_verify_depth":null,"host":"auth-api","extras":{"id":2,"service_id":"60e76e38-63f1-4fd7-b10c-51456722a312","kong_node_id":"1","description":null,"tags":null,"createdAt":"2024-12-25T18:23:57.000Z","updatedAt":"2024-12-25T18:25:34.000Z","createdUser":null,"updatedUser":null}},{"retries":5,"tags":[],"created_at":1735151922,"updated_at":1735151922,"name":"Bookings","port":8401,"id":"ae250c19-10c3-4ed2-8cdb-d62497721da2","client_certificate":null,"write_timeout":60000,"connect_timeout":60000,"read_timeout":60000,"protocol":"http","enabled":true,"ca_certificates":null,"tls_verify":null,"path":"/bookings","tls_verify_depth":null,"host":"bookings-api","extras":{"id":4,"service_id":"ae250c19-10c3-4ed2-8cdb-d62497721da2","kong_node_id":"1","description":null,"tags":null,"createdAt":"2024-12-25T18:38:42.000Z","updatedAt":"2024-12-25T18:38:42.000Z","createdUser":null,"updatedUser":null}}],"routes":[{"tags":null,"created_at":1735151865,"updated_at":1735151865,"name":"hotels","destinations":null,"strip_path":true,"hosts":null,"methods":["GET","POST","PUT","PATCH","DELETE","OPTIONS"],"service":{"id":"37407f92-1d9f-4d88-b80f-0bc9a3fb57fd"},"preserve_host":false,"regex_priority":0,"headers":null,"paths":["/api/hotels"],"request_buffering":true,"response_buffering":true,"protocols":["http","https"],"sources":null,"id":"17bc07be-9af8-499f-9ec6-716504cd801f","path_handling":"v1","https_redirect_status_code":426,"snis":null},{"tags":null,"created_at":1735151081,"updated_at":1735151965,"name":"Auth","destinations":null,"strip_path":true,"hosts":null,"methods":["OPTIONS","POST","DELETE"],"service":{"id":"60e76e38-63f1-4fd7-b10c-51456722a312"},"preserve_host":false,"regex_priority":0,"headers":null,"paths":["/api/auth"],"request_buffering":true,"response_buffering":true,"protocols":["http","https"],"sources":null,"id":"4f7e698c-aed6-4919-8d72-a24ce6a2a333","path_handling":"v1","https_redirect_status_code":426,"snis":null},{"tags":null,"created_at":1735151945,"updated_at":1735151945,"name":"Bookings","destinations":null,"strip_path":true,"hosts":null,"methods":["GET","POST","PATCH","PUT","DELETE","OPTIONS"],"service":{"id":"ae250c19-10c3-4ed2-8cdb-d62497721da2"},"preserve_host":false,"regex_priority":0,"headers":null,"paths":["/api/bookings"],"request_buffering":true,"response_buffering":true,"protocols":["http","https"],"sources":null,"id":"810bbb6d-a10d-416d-b5db-a121762981fa","path_handling":"v1","https_redirect_status_code":426,"snis":null},{"tags":null,"created_at":1735150976,"updated_at":1735150976,"name":"Usuarios","destinations":null,"strip_path":true,"hosts":null,"methods":["OPTIONS","GET","POST","DELETE","PUT","PATCH"],"service":{"id":"1d1ce8d9-aa4b-4576-8d91-00326d00c26e"},"preserve_host":false,"regex_priority":0,"headers":null,"paths":["/api/users"],"request_buffering":true,"response_buffering":true,"protocols":["http","https"],"sources":null,"id":"df0fefa6-7df8-4ae3-baed-ae58add42bbf","path_handling":"v1","https_redirect_status_code":426,"snis":null}],"consumers":[{"id":"c012b84f-63af-461f-8a8d-b8f99a2bd006","tags":[],"created_at":1735155577,"updated_at":1735155577,"custom_id":null,"username":"JWT","credentials":{"jwts":[{"rsa_public_key":null,"algorithm":"HS256","tags":null,"created_at":1735155689,"key":"9L8RmLEKMFd54WrR06CE9zoRSAGpCWeu","consumer":{"id":"c012b84f-63af-461f-8a8d-b8f99a2bd006"},"id":"493ad0f9-23e7-4e5f-b6e1-6982677ba0d6","secret":"MiClaveDeSeguridadMuyLargaParaQueNoFalleSpringBoot"}]}}],"plugins":[{"config":{"secret_is_base64":false,"key_claim_name":"kid","claims_to_verify":["exp"],"maximum_expiration":0,"uri_param_names":["jwt"],"cookie_names":[],"header_names":["Authorization"],"realm":null,"run_on_preflight":true,"anonymous":null},"tags":null,"created_at":1735155843,"updated_at":1735155843,"name":"jwt","route":{"id":"810bbb6d-a10d-416d-b5db-a121762981fa"},"consumer":null,"id":"3e302549-c51f-469d-a71d-98f30f2ddcab","protocols":["grpc","grpcs","http","https"],"instance_name":null,"service":null,"enabled":true},{"config":{"secret_is_base64":false,"key_claim_name":"kid","claims_to_verify":["exp"],"maximum_expiration":0,"uri_param_names":["jwt"],"cookie_names":[],"header_names":["Authorization"],"realm":null,"run_on_preflight":true,"anonymous":null},"tags":null,"created_at":1735156525,"updated_at":1735156585,"name":"jwt","route":{"id":"df0fefa6-7df8-4ae3-baed-ae58add42bbf"},"consumer":null,"id":"8386bf54-ede1-4f34-bb87-989ce4276e8a","protocols":["grpc","grpcs","http","https"],"instance_name":null,"service":null,"enabled":true},{"config":{"secret_is_base64":false,"key_claim_name":"kid","claims_to_verify":["exp"],"maximum_expiration":0,"uri_param_names":["jwt"],"cookie_names":[],"header_names":["Authorization"],"realm":null,"run_on_preflight":true,"anonymous":null},"tags":null,"created_at":1735156492,"updated_at":1735156600,"name":"jwt","route":{"id":"17bc07be-9af8-499f-9ec6-716504cd801f"},"consumer":null,"id":"9ac23748-1964-4038-8cdc-b2db799010a6","protocols":["grpc","grpcs","http","https"],"instance_name":null,"service":null,"enabled":true}],"acls":[],"upstreams":[],"certificates":[],"snis":[]},"createdAt":"2024-12-25T19:59:28.000Z","updatedAt":"2024-12-25T19:59:28.000Z"}
\ No newline at end of file
poblate/Dockerfile 0 → 100644
+ 11
− 0
View file @ a00f340a
FROM node:20
# Establecer el directorio de trabajo
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
CMD ["npm", "run", "prod", "--", "-d"]
\ No newline at end of file
poblate/index.js
+ 27
− 19
View file @ a00f340a
...@@ -10,6 +10,7 @@ const args = process.argv; ...@@ -10,6 +10,7 @@ const args = process.argv;
const isProduction = args.includes("--prod"); const isProduction = args.includes("--prod");
const DEBUG = args.includes("--debug") || args.includes("-d"); const DEBUG = args.includes("--debug") || args.includes("-d");
const FORCE = args.includes("--force") || args.includes("-f"); const FORCE = args.includes("--force") || args.includes("-f");
const ERROR = args.includes("--error") || args.includes("-e");
const env = (isProduction ? prod : dev).env; const env = (isProduction ? prod : dev).env;
const { authApi, hotelsApi, bookingsApi } = env; const { authApi, hotelsApi, bookingsApi } = env;
...@@ -33,7 +34,7 @@ function genDates(ref = new Date()) { ...@@ -33,7 +34,7 @@ function genDates(ref = new Date()) {
// After // After
const afterStart = new Date(ref); const afterStart = new Date(ref);
afterStart.setDate(ref.getDate() + 14); // Restar 2 semanas afterStart.setDate(ref.getDate() + 14); // Sumar 2 semanas
const afterEnd = new Date(afterStart); const afterEnd = new Date(afterStart);
afterEnd.setDate(afterStart.getDate() + 2); afterEnd.setDate(afterStart.getDate() + 2);
...@@ -57,18 +58,23 @@ function getRandomItem(a = []) { ...@@ -57,18 +58,23 @@ function getRandomItem(a = []) {
const savePost = async (data, first, second = "") => { const savePost = async (data, first, second = "") => {
try { try {
try { try {
debug("Trying to register user", data);
return await axios.post(first, data); return await axios.post(first, data);
} catch (error) { } catch (error) {
console.error("ERROR Al REGISTRO, SE PROCEDE A INTENTAR ACCEDER"); debug("Trying to log user", data);
debug("ERROR:", ERROR ? error : error.data ?? error.cause);
debug("ERROR Al REGISTRO, SE PROCEDE A INTENTAR ACCEDER");
const response = await axios.post(second, data);
if (!FORCE) { if (!FORCE) {
console.log("Parece que ya hay datos en el sistema"); console.log("Parece que ya hay datos en el sistema");
process.exit(0); process.exit(0);
} }
return await axios.post(second, data); return response;
} }
} catch (error) { } catch (error) {
console.error("ERROR Al LOGIN"); console.error("ERROR Al LOGIN");
console.error("\nNo se ha podido comunicar con el servicio de auth"); console.error("\nNo se ha podido comunicar con el servicio de auth");
debug("ERROR:", ERROR ? error : error.data ?? error.cause);
process.exit(-1); process.exit(-1);
} }
}; };
...@@ -79,6 +85,7 @@ async function register(user) { ...@@ -79,6 +85,7 @@ async function register(user) {
`${authApi}/register`, `${authApi}/register`,
`${authApi}/login` `${authApi}/login`
); );
debug("User identified successful");
const decoded = jwtDecode(data.token); const decoded = jwtDecode(data.token);
user.id = decoded.id; user.id = decoded.id;
user.token = data.token; user.token = data.token;
...@@ -100,22 +107,21 @@ const addUsers = async () => { ...@@ -100,22 +107,21 @@ const addUsers = async () => {
const insertHotel = async ({ manager, hotel }) => { const insertHotel = async ({ manager, hotel }) => {
try { try {
const { data } = await axios.post( const body = {
hotelsApi,
{
...hotel, ...hotel,
managerId: manager.id, managerId: manager.id,
}, };
{ debug("Trying to add booking", body);
const { data } = await axios.post(hotelsApi, body, {
headers: { headers: {
Authorization: `Bearer ${manager.token}`, Authorization: `Bearer ${manager.token}`,
}, },
} });
); debug("Hotel added successful");
return data; return data;
} catch (e) { } catch (error) {
// console.error(e);
console.error("ERROR Al INSERTAR HOTEL"); console.error("ERROR Al INSERTAR HOTEL");
debug("ERROR:", ERROR ? error : error.data ?? error.cause);
process.exit(-1); process.exit(-1);
} }
}; };
...@@ -131,15 +137,17 @@ async function addHotels(managers) { ...@@ -131,15 +137,17 @@ async function addHotels(managers) {
const insertBookings = async (booking, token) => { const insertBookings = async (booking, token) => {
try { try {
debug("Trying to add booking", booking);
const { data } = await axios.post(bookingsApi, booking, { const { data } = await axios.post(bookingsApi, booking, {
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
}, },
}); });
debug("Booking added successful");
return data; return data;
} catch (e) { } catch (error) {
// console.error(e); console.error("ERROR Al INSERTAR RESERVA");
console.error("ERROR Al INSERTAR HOTEL"); debug("ERROR:", ERROR ? error : error.data ?? error.cause);
process.exit(-1); process.exit(-1);
} }
}; };
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment