From bb83aa148244b8fc34de0f324c0f49439ea81e3f Mon Sep 17 00:00:00 2001 From: Traym17 <51390112+Traym17@users.noreply.github.com> Date: Mon, 18 Jul 2022 21:33:36 -0600 Subject: [PATCH] Pruebas de cors --- api-gateway/package-lock.json | 1 + api-gateway/package.json | 1 + api-gateway/src/app.controller.ts | 3 +- api-gateway/src/app.service.ts | 4 +-- api-gateway/src/main.ts | 2 +- web-ui/web-react/package-lock.json | 22 +++++++++++++++ web-ui/web-react/package.json | 11 ++++---- .../src/components/GuardasSeguridad.js | 28 +++++++++++++------ 8 files changed, 55 insertions(+), 17 deletions(-) diff --git a/api-gateway/package-lock.json b/api-gateway/package-lock.json index 45818f0c..14bac898 100644 --- a/api-gateway/package-lock.json +++ b/api-gateway/package-lock.json @@ -12,6 +12,7 @@ "@nestjs/core": "^8.0.0", "@nestjs/microservices": "^8.4.7", "@nestjs/platform-express": "^8.0.0", + "cors": "^2.8.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.2.0" diff --git a/api-gateway/package.json b/api-gateway/package.json index cdd17cfe..fb1d5eba 100644 --- a/api-gateway/package.json +++ b/api-gateway/package.json @@ -25,6 +25,7 @@ "@nestjs/core": "^8.0.0", "@nestjs/microservices": "^8.4.7", "@nestjs/platform-express": "^8.0.0", + "cors": "^2.8.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.2.0" diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts index ff3bfa32..7bcf7867 100644 --- a/api-gateway/src/app.controller.ts +++ b/api-gateway/src/app.controller.ts @@ -34,9 +34,10 @@ export class AppController { @Body('user_type') user_type: string, @Body('status') status: string, @Body('date_entry') date_entry: Date, + @Body('community_id') community_id:string ) { return this.appService.createGuard(dni, name, last_name, email, phone, password, - user_type, status, date_entry); + user_type, status, date_entry,community_id); } @Post('user/createUser') diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts index 8c88538d..413b0737 100644 --- a/api-gateway/src/app.service.ts +++ b/api-gateway/src/app.service.ts @@ -51,11 +51,11 @@ export class AppService { } createGuard(dni: string, name: string, last_name: string, email: string, phone: number - , password: string, user_type: string, status: string, date_entry: Date) { + , password: string, user_type: string, status: string, date_entry: Date, community_id: string) { const pattern = { cmd: 'createGuard' }; const payload = { dni: dni, name: name, last_name: last_name, email: email, phone: phone, - password: password, user_type: user_type, status: status, date_entry: date_entry + password: password, user_type: user_type, status: status, date_entry: date_entry, community_id }; return this.clientUserApp .send(pattern, payload) diff --git a/api-gateway/src/main.ts b/api-gateway/src/main.ts index 3bea0f30..aba64268 100644 --- a/api-gateway/src/main.ts +++ b/api-gateway/src/main.ts @@ -4,6 +4,6 @@ const cors= require('cors'); async function bootstrap() { const app = await NestFactory.create(AppModule); await app.listen(4000); - app.use(cors()); + app.use(cors()) } bootstrap(); diff --git a/web-ui/web-react/package-lock.json b/web-ui/web-react/package-lock.json index 45064bbd..48c45103 100644 --- a/web-ui/web-react/package-lock.json +++ b/web-ui/web-react/package-lock.json @@ -17,6 +17,7 @@ "axios": "^0.19.0", "chart.js": "3.3.2", "classnames": "^2.2.6", + "cors": "^2.8.5", "primeflex": "3.1.0", "primeicons": "^5.0.0", "primereact": "7.2.0", @@ -5183,6 +5184,18 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", @@ -21869,6 +21882,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", diff --git a/web-ui/web-react/package.json b/web-ui/web-react/package.json index 7c1031f7..00421d8f 100644 --- a/web-ui/web-react/package.json +++ b/web-ui/web-react/package.json @@ -12,12 +12,15 @@ "@fullcalendar/core": "^5.7.2", "@fullcalendar/daygrid": "^5.7.2", "@fullcalendar/interaction": "^5.7.2", - "@fullcalendar/timegrid": "^5.7.2", "@fullcalendar/react": "^5.7.0", + "@fullcalendar/timegrid": "^5.7.2", + "axios": "^0.19.0", "chart.js": "3.3.2", - "primereact": "7.2.0", + "classnames": "^2.2.6", + "cors": "^2.8.5", "primeflex": "3.1.0", "primeicons": "^5.0.0", + "primereact": "7.2.0", "prismjs": "1.9.0", "react": "^17.0.1", "react-app-polyfill": "^1.0.6", @@ -25,9 +28,7 @@ "react-router-dom": "^5.2.0", "react-scripts": "3.4.1", "react-transition-group": "^4.4.1", - "sass": "^1.32.8", - "axios": "^0.19.0", - "classnames": "^2.2.6" + "sass": "^1.32.8" }, "scripts": { "start": "react-scripts start", diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index 626f3faa..e3e05eb8 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -18,7 +18,7 @@ const GuardasSeguridad = () => { fetchP(); },[]) - function registrarAdmin() { + function registrarGuarda() { var data = { dni: document.getElementById('identificacion').value, name: document.getElementById('nombre').value, @@ -26,15 +26,27 @@ const GuardasSeguridad = () => { email: document.getElementById('correo_electronico').value, phone: document.getElementById('telefono').value, password: document.getElementById('correo_electronico').value, - user_type: "1", //1 es admin - status: "1" + user_type: "4", //4 es guarda + status: "1", + community_id:"62be68215692582bbfd77134" }; - // console.log(data); + var data2={ + dni: "98765", + name: "Danielito", + last_name: "Rodriguez", + email: "danirodriguez@gmail.com", + phone: 84664515, + password: "1203", + user_type: "2", + status: "4", + community_id:"62be68215692582bbfd77134" + } + console.log(data2); - fetch('http://localhost:4000/user/createAdminSystem/', { + fetch('http://localhost:4000/user/createGuard', { cache: 'no-cache', method: 'POST', - body: JSON.stringify(data), + body: JSON.stringify(data2), headers: { 'Content-Type': 'application/json' } @@ -73,7 +85,7 @@ const GuardasSeguridad = () => {
-
Registro de un administrador del sistema
+
Registro de un guarda de seguridad
@@ -95,7 +107,7 @@ const GuardasSeguridad = () => {
- +