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

update upload

Browse Source
This commit is contained in:
Mohamed Nouffer
2021-09-13 18:34:39 +05:30
parent bcd08f69e4
commit 50592d358e
3 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server.js
View File

@ -85,22 +85,22 @@ var upload = multer({ storage: storage }).single('file')
app.post('/upload', function(req, res, next) {
console.log('email is' + req.body.email);
console.log('email is ' + req.query.email);
upload(req, res, function(err) {
if (err instanceof multer.MulterError) {
return res.status(500).json(err)
} else if (err) {
return res.status(500).json(err)
}
else {
var FileName = req.file.filename;
callInitFileMover(res);
res.status(200).send(FileName);
}
//return res.status(200).send(req.file)
// upload(req, res, function(err) {
// if (err instanceof multer.MulterError) {
// return res.status(500).json(err)
// } else if (err) {
// return res.status(500).json(err)
// }
// else {
// var FileName = req.file.filename;
// callInitFileMover(res);
// res.status(200).send(FileName);
// }
// //return res.status(200).send(req.file)
})
// })
});

88
src/containers/TheContent.js
View File

@ -28,11 +28,11 @@ const TheContent = () => {
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" ] } ] }')
// const result = await axios('https://fsbsso.sumasen.net/Shibboleth.sso/Session');
// if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) {
// setSsoSession(result.data);
// }
//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');
if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) {
setSsoSession(result.data);
}
}
useEffect(() => {
@ -93,47 +93,47 @@ const TheContent = () => {
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 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 = `[
{
"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;
// }
//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;
}
}
@ -151,7 +151,7 @@ const TheContent = () => {
render = {
props =>
get_token_from_storage_or_cookie() !== null ?
( <route.component {...props} userid={UserId} email={"test@test.com"}/>
( <route.component {...props} userid={UserId} email={UserData.email}/>
) : ( <Redirect to = {
{ pathname: "/sso" }
}

10
src/views/Uploader/index.js
View File

@ -24,17 +24,19 @@ function Uploader(props) {
}
function onClickHandler(e) {
const data = new FormData()
data.append('email', props.email);
// data.append('file', file);
let data = new FormData()
data.append('file', file);
const chk = file.name.trim();
const collator = new Intl.Collator('ja');
const order1 = collator.compare('ini_工程内検査票.xlsx', chk);
const order2 = collator.compare('ini_データ入力シート.xlsx', chk);
if(order1 === 0 || order2 === 0)
{
axios.post("https://fsbsso.sumasen.net/upload", data, { // receive two parameter endpoint url ,form data
axios.post("http://localhost:8000/upload?email=" + props.email, {
body: data,
headers: {'Content-Type': 'multipart/form-data' }
})
//axios.post("http://localhost:8000/upload", data, headers: {'Content-Type': 'multipart/form-data' })
.then(res => { // then print response status
//console.log(res.statusText)
if (res.statusText == 'OK') {