diff --git a/server.js b/server.js index 5529728..a45d369 100644 --- a/server.js +++ b/server.js @@ -16,28 +16,57 @@ app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); app.use(cors(corsOptions)); -function callInitFileMover(re) { +function callLoadInitializeData(projectid, construction_id, username, sheetname, filename){ + https.get('https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=1&username=1&sheetname=dataSheet&filename=ini_データ入力シート.xlsx', (resp) => { + let data = ''; -https.get('https://natnats.mobilous.com/iniFileMover', (resp) => { - let data = ''; + // A chunk of data has been received. + resp.on('data', (chunk) => { + data += chunk; + }); - // A chunk of data has been received. - resp.on('data', (chunk) => { - data += chunk; - }); - - // The whole response has been received. Print out the result. - resp.on('end', () => { - if(data !== 'no match'){ - resdata = JSON.parse(data); - console.log(resdata); - } + // The whole response has been received. Print out the result. + resp.on('end', () => { + if(data !== 'no match'){ - }); + resdata = JSON.parse(data); + console.log(resdata); + } + + }); - }).on("error", (err) => { - console.log("Error: " + err.message); - }); + }).on("error", (err) => { + console.log("Error: " + err.message); + }); +} + +function callInitFileMover(re) { + https.get('https://natnats.mobilous.com/iniFileMover', (resp) => { + let data = ''; + + // A chunk of data has been received. + resp.on('data', (chunk) => { + //debug + data = "{ + "construction_id": 3, + "file_name": "ini_データ入力シート.xlsx", + "file_type": "dataSheet" + }" + data += chunk; + }); + + // The whole response has been received. Print out the result. + resp.on('end', () => { + if(data !== 'no match'){ + resdata = JSON.parse(data); + console.log(resdata); + } + + }); + + }).on("error", (err) => { + console.log("Error: " + err.message); + }); } @@ -55,6 +84,8 @@ var upload = multer({ storage: storage }).single('file') app.post('/upload', function(req, res, next) { + console.log(req.body.email); + upload(req, res, function(err) { if (err instanceof multer.MulterError) { return res.status(500).json(err) diff --git a/src/containers/TheContent.js b/src/containers/TheContent.js index cf6f0ae..8e79622 100644 --- a/src/containers/TheContent.js +++ b/src/containers/TheContent.js @@ -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 ? - ( + ( ) : ( - < - CCard > - < - CCardHeader > - アップロード < - /CCardHeader> < - CCardBody > - < - CFormGroup row > - < - CCol md = "3" > - < - CLabel htmlFor = "date-input" > アップロードするファイルを選んでください < /CLabel> < / - CCol > < - CCol xs = "12" - md = "9" > - < - CInputFile type = "file" - onChange = { onChangeHandler } - id = "file-input" - name = "file-input" / > - < - /CCol> < / - CFormGroup > + return ( +
+ + + アップロード + + + + + アップロードするファイルを選んでください < /CLabel> + + + + + < CIcon name = "cil-scrubber" / > アップロード < /CButton> < / - CCardFooter> + color = "primary" > < CIcon name = "cil-scrubber" / > アップロード +