nouffer/FBSAdminTool
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'localdev'

Browse Source
This commit is contained in:
Mohamed Nouffer
2021-09-07 19:48:30 +05:30
parent 7abbff3c72 5a09e47171
commit 35d5f9c149
2 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/containers/TheContent.js
View File

@ -28,11 +28,11 @@ const TheContent = () => {
async function fetchSession() { async function fetchSession() {
//setSsoSession('{ "expiration": 468, "client_address": "111.223.144.163", "protocol": "urn:oasis:names:tc:SAML:2.0:protocol", "identity_provider": "https://sso.ts.bizside.biz/idp/shibboleth", "authn_instant": "2021-09-03T08:26:41.248Z", "authncontext_class": "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "attributes": [ { "name": "mail", "values": [ "akira.miyata@mobilous.com" ] } ] }') setSsoSession('{ "expiration": 468, "client_address": "111.223.144.163", "protocol": "urn:oasis:names:tc:SAML:2.0:protocol", "identity_provider": "https://sso.ts.bizside.biz/idp/shibboleth", "authn_instant": "2021-09-03T08:26:41.248Z", "authncontext_class": "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "attributes": [ { "name": "mail", "values": [ "akira.miyata@mobilous.com" ] } ] }')
const result = await axios('https://fsbsso.sumasen.net/Shibboleth.sso/Session'); // const result = await axios('https://fsbsso.sumasen.net/Shibboleth.sso/Session');
if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) { // if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) {
setSsoSession(result.data); // setSsoSession(result.data);
} // }
} }
useEffect(() => { useEffect(() => {
@ -92,48 +92,48 @@ const TheContent = () => {
} }
function get_token_from_storage_or_cookie() { function get_token_from_storage_or_cookie() {
//return true;
const cookies = new Cookies();
const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
if (shib !== undefined) {
fetchSession().then(() => {
if (SsoSession !== null) {
console.log(shib);
fetchUser().then(() => {
if(UserId === ''){
let id = Math.floor(100000 + Math.random() * 900000)
setUserId(id);
}
const _firstname = UserData.firstname;
const _lastname = UserData.lastname;
const _email = UserData.email;
const _empcode = UserData.employee_code;
const json_str = `[
{
"mailadress": "${_email}",
"name": "${_lastname} ${_firstname}",
"jsessionid": ${UserId},
"_idp_session": "",
"_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468",
"_opensaml_value": "${shib}"
}
]`;
//const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]';
if(_empcode !== null && _empcode !== undefined){
if(isCSVPath()){
postUserData(json_str);
}
}
return true; return true;
}); // const cookies = new Cookies();
} // const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
}); // if (shib !== undefined) {
} else { // fetchSession().then(() => {
return null; // if (SsoSession !== null) {
} // console.log(shib);
// fetchUser().then(() => {
// if(UserId === ''){
// let id = Math.floor(100000 + Math.random() * 900000)
// setUserId(id);
// }
// const _firstname = UserData.firstname;
// const _lastname = UserData.lastname;
// const _email = UserData.email;
// const _empcode = UserData.employee_code;
// const json_str = `[
// {
// "mailadress": "${_email}",
// "name": "${_lastname} ${_firstname}",
// "jsessionid": ${UserId},
// "_idp_session": "",
// "_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468",
// "_opensaml_value": "${shib}"
// }
// ]`;
// //const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]';
// if(_empcode !== null && _empcode !== undefined){
// if(isCSVPath()){
// postUserData(json_str);
// }
// }
// return true;
// });
// }
// });
// } else {
// return null;
// }
} }

11
src/views/BoxDisplacemen/index.js
View File

@ -94,6 +94,7 @@ function Index() {
return; return;
} }
var url = ""; var url = "";
if(startDate !== null){
if(graph){ if(graph){
url = baseUrl + "/generate" + report + "?construction_id=" +selectedcons+ "&construction_date="+getDateWithFormat(startDate)+"&graph=true"; url = baseUrl + "/generate" + report + "?construction_id=" +selectedcons+ "&construction_date="+getDateWithFormat(startDate)+"&graph=true";
} }
@ -102,6 +103,16 @@ function Index() {
} }
downloadReport(url); downloadReport(url);
} }
else {
if(graph){
url = baseUrl + "/generate" + report + "?construction_id=" +selectedcons+"&graph=true";
}
else{
url = baseUrl + "/generate" + report + "?construction_id=" +selectedcons;
}
downloadReport(url);
}
}
function downloadReport(url) { function downloadReport(url) {
axios({ axios({