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) { 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) { // upload(req, res, function(err) {
if (err instanceof multer.MulterError) { // if (err instanceof multer.MulterError) {
return res.status(500).json(err) // return res.status(500).json(err)
} else if (err) { // } else if (err) {
return res.status(500).json(err) // return res.status(500).json(err)
} // }
else { // else {
var FileName = req.file.filename; // var FileName = req.file.filename;
callInitFileMover(res); // callInitFileMover(res);
res.status(200).send(FileName); // res.status(200).send(FileName);
} // }
//return res.status(200).send(req.file) // //return res.status(200).send(req.file)
}) // })
}); });

88
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(() => {
@ -93,47 +93,47 @@ const TheContent = () => {
function get_token_from_storage_or_cookie() { function get_token_from_storage_or_cookie() {
//return true; //return true;
// const cookies = new Cookies(); const cookies = new Cookies();
// const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468') const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
// if (shib !== undefined) { if (shib !== undefined) {
// fetchSession().then(() => { fetchSession().then(() => {
// if (SsoSession !== null) { if (SsoSession !== null) {
// console.log(shib); console.log(shib);
// fetchUser().then(() => { fetchUser().then(() => {
// if(UserId === ''){ if(UserId === ''){
// let id = Math.floor(100000 + Math.random() * 900000) let id = Math.floor(100000 + Math.random() * 900000)
// setUserId(id); setUserId(id);
// } }
// const _firstname = UserData.firstname; const _firstname = UserData.firstname;
// const _lastname = UserData.lastname; const _lastname = UserData.lastname;
// const _email = UserData.email; const _email = UserData.email;
// const _empcode = UserData.employee_code; const _empcode = UserData.employee_code;
// const json_str = `[ const json_str = `[
// { {
// "mailadress": "${_email}", "mailadress": "${_email}",
// "name": "${_lastname} ${_firstname}", "name": "${_lastname} ${_firstname}",
// "jsessionid": ${UserId}, "jsessionid": ${UserId},
// "_idp_session": "", "_idp_session": "",
// "_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468", "_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468",
// "_opensaml_value": "${shib}" "_opensaml_value": "${shib}"
// } }
// ]`; ]`;
// //const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]'; //const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]';
// if(_empcode !== null && _empcode !== undefined){ if(_empcode !== null && _empcode !== undefined){
// if(isCSVPath()){ if(isCSVPath()){
// postUserData(json_str); postUserData(json_str);
// } }
// } }
// return true; return true;
// }); });
// } }
// }); });
// } else { } else {
// return null; return null;
// } }
} }
@ -151,7 +151,7 @@ const TheContent = () => {
render = { render = {
props => props =>
get_token_from_storage_or_cookie() !== null ? 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 = { ) : ( <Redirect to = {
{ pathname: "/sso" } { pathname: "/sso" }
} }

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

@ -24,17 +24,19 @@ function Uploader(props) {
} }
function onClickHandler(e) { function onClickHandler(e) {
const data = new FormData() let data = new FormData()
data.append('email', props.email); data.append('file', file);
// data.append('file', file);
const chk = file.name.trim(); const chk = file.name.trim();
const collator = new Intl.Collator('ja'); const collator = new Intl.Collator('ja');
const order1 = collator.compare('ini_工程内検査票.xlsx', chk); const order1 = collator.compare('ini_工程内検査票.xlsx', chk);
const order2 = collator.compare('ini_データ入力シート.xlsx', chk); const order2 = collator.compare('ini_データ入力シート.xlsx', chk);
if(order1 === 0 || order2 === 0) 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 .then(res => { // then print response status
//console.log(res.statusText) //console.log(res.statusText)
if (res.statusText == 'OK') { if (res.statusText == 'OK') {