diff --git a/app/src/components/AutoLogin/AutoLogin.js b/app/src/components/AutoLogin/AutoLogin.js index 5e4c686..e64fe18 100644 --- a/app/src/components/AutoLogin/AutoLogin.js +++ b/app/src/components/AutoLogin/AutoLogin.js @@ -1,4 +1,4 @@ -import { login } from 'actions/isLogin'; +import { login } from '../../actions/isLogin'; import React, { Component } from 'react'; import "react-datepicker/dist/react-datepicker.css"; import { HOST } from '../../config/index'; diff --git a/app/src/components/ImportImg/ImportImage.js b/app/src/components/ImportImg/ImportImage.js index 982ce87..08bf172 100644 --- a/app/src/components/ImportImg/ImportImage.js +++ b/app/src/components/ImportImg/ImportImage.js @@ -59,6 +59,7 @@ class ImportImage extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token }, data: { @@ -129,6 +130,7 @@ class ImportImage extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token }, body: JSON.stringify({ 'image_obj_id_list': [img._id] }) diff --git a/app/src/components/LabelImg/LabelImage.js b/app/src/components/LabelImg/LabelImage.js index e869377..b25f282 100644 --- a/app/src/components/LabelImg/LabelImage.js +++ b/app/src/components/LabelImg/LabelImage.js @@ -10,6 +10,7 @@ import { HOST } from '../../config/index'; import swal from 'sweetalert'; import { useLocation } from 'react-router-dom'; import { useSelector } from 'react-redux'; +import Store from '../../store'; const initialDataPost = { index: 1, @@ -76,6 +77,7 @@ export default function LabelImage() { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token, }, data: dataDel, @@ -119,6 +121,7 @@ export default function LabelImage() { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token }, data: data ? data : dataPost, diff --git a/app/src/components/List/ListItem.js b/app/src/components/List/ListItem.js index 4a9a654..c7df15d 100644 --- a/app/src/components/List/ListItem.js +++ b/app/src/components/List/ListItem.js @@ -10,6 +10,7 @@ import { HOST } from '../../config/index'; import swal from 'sweetalert'; import { useLocation } from 'react-router-dom'; import { useSelector } from 'react-redux'; +import Store from '../../store'; const initialDataPost = { index: 1, @@ -74,6 +75,7 @@ export default function ListItem() { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token, + 'Authorization': Store.getState().isLogin.access_token, }, data: dataDel, }) @@ -117,6 +119,7 @@ export default function ListItem() { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, data: data ? data : dataPost, }) diff --git a/app/src/components/Modal/ModaEditLabel.js b/app/src/components/Modal/ModaEditLabel.js index b77ec1b..b25b3ab 100644 --- a/app/src/components/Modal/ModaEditLabel.js +++ b/app/src/components/Modal/ModaEditLabel.js @@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Button, Modal } from 'react-bootstrap'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; +import Store from '../../store'; @@ -85,6 +86,8 @@ const ModalEditLabel = (props) => { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token, + + 'Authorization': Store.getState().isLogin.access_token, }, data: dataPost, }) @@ -232,6 +235,8 @@ const ModalEditLabel = (props) => { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token + + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify(dataUploadImg) }) @@ -277,6 +282,8 @@ const ModalEditLabel = (props) => { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token }, body: JSON.stringify({ diff --git a/app/src/components/Modal/ModalEdit.js b/app/src/components/Modal/ModalEdit.js index 9eaf050..43004cc 100644 --- a/app/src/components/Modal/ModalEdit.js +++ b/app/src/components/Modal/ModalEdit.js @@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Button, Modal } from 'react-bootstrap'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; +import Store from '../../store'; @@ -84,6 +85,8 @@ const Modaledit = (props) => { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token, }, data: dataPost, @@ -229,6 +232,8 @@ const Modaledit = (props) => { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token }, body: JSON.stringify(dataUploadImg) @@ -273,7 +278,7 @@ const Modaledit = (props) => { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify({ person_obj_id: crrData._id ? crrData._id : "", diff --git a/app/src/components/Modal/ModalEditImg.js b/app/src/components/Modal/ModalEditImg.js index 9751fd1..92ba73d 100644 --- a/app/src/components/Modal/ModalEditImg.js +++ b/app/src/components/Modal/ModalEditImg.js @@ -3,6 +3,7 @@ import moment from 'moment'; import 'moment/locale/vi'; import React, { Component } from 'react'; import { Button, Modal } from 'react-bootstrap'; +import Store from '../../store'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; @@ -25,11 +26,11 @@ class ModalEditImg extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify({ "origin_name": this.state.valueImg.origin_name, - "obj_id": this.state.valueImg._id + "obj_id": this.state.valueImg._id, }) }).then((response) => { return ( diff --git a/app/src/components/Modal/ModalRole.js b/app/src/components/Modal/ModalRole.js index e73a996..b73109c 100644 --- a/app/src/components/Modal/ModalRole.js +++ b/app/src/components/Modal/ModalRole.js @@ -5,6 +5,7 @@ import Switch from "react-switch"; import swal from 'sweetalert'; import $ from 'jquery'; import Select from "react-select"; +import Store from '../../store'; import { HOST } from '../../config/index'; class ModalRole extends Component { @@ -61,6 +62,7 @@ class ModalRole extends Component { headers: { 'Content-Type': 'application/json', // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify(dataPost) }).then((response) => { @@ -96,7 +98,7 @@ class ModalRole extends Component { method: 'POST', headers: { 'Content-Type': 'application/json', - // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify(dataPost) }).then((response) => { @@ -178,6 +180,8 @@ class ModalRole extends Component { headers: { 'Content-Type': 'application/json', // 'Authorization': token + + 'Authorization': Store.getState().isLogin.access_token, }, }).then((response) => { return response.json() @@ -196,6 +200,8 @@ class ModalRole extends Component { headers: { 'Content-Type': 'application/json', // 'Authorization': token + + 'Authorization': Store.getState().isLogin.access_token, }, }).then((response) => { return response.json() diff --git a/app/src/components/Modal/ModalUpload.js b/app/src/components/Modal/ModalUpload.js index 60a8d10..e5d42dd 100644 --- a/app/src/components/Modal/ModalUpload.js +++ b/app/src/components/Modal/ModalUpload.js @@ -9,6 +9,7 @@ import LoadingOverlay from 'react-loading-overlay'; import { PulseLoader } from 'react-spinners'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; +import Store from '../../store'; const { Dragger } = Upload; @@ -39,7 +40,8 @@ const ModalUpload = (props) => { .post(`${HOST}/api/files_face_import`, formData, { headers: { "X-Requested-With": "XMLHttpRequest", - "Content-Type": "application/x-www-form-urlencoded", + "Content-Type": "application/x-www-form-urlencoded", + 'Authorization': Store.getState().isLogin.access_token, } }) ) diff --git a/app/src/components/Modal/ModalUser.js b/app/src/components/Modal/ModalUser.js index 94d27fa..8fa4692 100644 --- a/app/src/components/Modal/ModalUser.js +++ b/app/src/components/Modal/ModalUser.js @@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Button, Modal } from 'react-bootstrap'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; +import Store from '../../store'; const { Option } = Select; @@ -85,6 +86,7 @@ const ModalUser = (props) => { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token, + 'Authorization': Store.getState().isLogin.access_token, }, data: dataPost, }) diff --git a/app/src/components/Role/Role.js b/app/src/components/Role/Role.js index 4339d05..23036e7 100644 --- a/app/src/components/Role/Role.js +++ b/app/src/components/Role/Role.js @@ -51,6 +51,7 @@ class Role extends Component { 'Accept': 'application/json', 'Content-Type': 'application/json', // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, }).then((response) => { return response.json() @@ -91,6 +92,7 @@ class Role extends Component { method: 'DELETE', headers: { 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, // 'Authorization': token, }, }).then((response) => { diff --git a/app/src/components/SearchImg/SearchImage.js b/app/src/components/SearchImg/SearchImage.js index 1000337..ecc1f6c 100644 --- a/app/src/components/SearchImg/SearchImage.js +++ b/app/src/components/SearchImg/SearchImage.js @@ -135,7 +135,7 @@ class SearchImage extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - 'Authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJjbGFzc2lmeS9sb2dpbiJdLCJleHAiOjE2NDE5NzQ5NjV9.2F2PAUKjpfjPJKzgvzgCDtyBuTXDRl86EnJJGdYgWTM' + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify({ encodings: this.state.selectedEncoding, @@ -205,6 +205,7 @@ class SearchImage extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, }, body: JSON.stringify({ image: image_base64 diff --git a/app/src/components/User/User.js b/app/src/components/User/User.js index 69689eb..0ac6b01 100644 --- a/app/src/components/User/User.js +++ b/app/src/components/User/User.js @@ -12,6 +12,7 @@ import swal from 'sweetalert'; import { useLocation } from 'react-router-dom'; import Switch from "react-switch"; import Select from "react-select"; +import Store from '../../store'; import { useSelector } from 'react-redux'; const initialDataPost = { @@ -86,7 +87,7 @@ export default function User() { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - // 'Authorization': token, + 'Authorization': Store.getState().isLogin.access_token, }, }) if (result.data.status === 10000) { @@ -137,7 +138,7 @@ export default function User() { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - // 'Authorization': token + 'Authorization': Store.getState().isLogin.access_token, }, data: data ? data : dataPost, }) diff --git a/app/src/components/layouts/Header.js b/app/src/components/layouts/Header.js index b35dda4..e12f6bb 100644 --- a/app/src/components/layouts/Header.js +++ b/app/src/components/layouts/Header.js @@ -29,6 +29,7 @@ class Header extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, }, }) .then(response => {