Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added patch request for File upload Survey #324

Open
wants to merge 20 commits into
base: cbrelease-4.8.12
Choose a base branch
from
Open

Added patch request for File upload Survey #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d9a23da
update for file upload survey
vishnubansaltarento Apr 3, 2024
6d067e3
Merge branch 'cbrelease-4.8.12' of github.com:sunbird-cb/sunbird-cb-u…
vishnubansaltarento Apr 3, 2024
b569861
update for file upload for survey
vishnubansaltarento Apr 3, 2024
5544d77
update for fileupload survey
vishnubansaltarento Apr 4, 2024
b24111e
update for fileupload survey
vishnubansaltarento Apr 4, 2024
472148f
update for fileupload survey
vishnubansaltarento Apr 4, 2024
a702a48
update for fileupload survey
vishnubansaltarento Apr 4, 2024
beb39b1
update for fileupload survey
vishnubansaltarento Apr 4, 2024
00d76d5
update for fileupload survey
vishnubansaltarento Apr 4, 2024
48874f5
update for fileupload survey
vishnubansaltarento Apr 4, 2024
b0d5357
Merge branch 'cbrelease-4.8.12' of github.com:sunbird-cb/sunbird-cb-u…
vishnubansaltarento Apr 4, 2024
0989358
update for fileupload survey
vishnubansaltarento Apr 4, 2024
46aa377
update for fileupload survey
vishnubansaltarento Apr 4, 2024
2c38338
update for fileupload survey
vishnubansaltarento Apr 4, 2024
3841503
update for fileupload survey
vishnubansaltarento Apr 4, 2024
12d5746
update for fileupload survey
vishnubansaltarento Apr 4, 2024
f10a1aa
update for fileupload survey
vishnubansaltarento Apr 4, 2024
6c81d81
update for fileupload survey
vishnubansaltarento Apr 4, 2024
a942599
update for fileupload survey
vishnubansaltarento Apr 4, 2024
4104f52
update for fileupload survey
vishnubansaltarento Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 164 additions & 1 deletion src/proxies_v8/proxies_v8.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ proxiesV8.use('/notification/*',

proxiesV8.post('/org/v1/search', async (req, res) => {
const roleData = lodash.get(req, 'session.userRoles')
// tslint:disable-next-line
const rootOrgId = lodash.get(req, 'session.rootOrgId')
// tslint:disable-next-line
let urlPath = API_END_POINTS.kongSearchOrg
if (roleData.includes('STATE_ADMIN')) {
req.body.request.filters.sbRootOrgId = rootOrgId
Expand Down Expand Up @@ -378,7 +380,12 @@ proxiesV8.use('/dashboard/*',
)
// tslint:disable-next-line:max-line-length
proxiesV8.post(['/user/v1/bulkupload', '/storage/profilePhotoUpload/*', '/workflow/admin/transition/bulkupdate', '/cloud-services/mlcore/v1/files/upload'], (req, res) => {
// tslint:disable-next-line: all
console.log('req for files--->', req);
// tslint:disable-next-line: all
console.log('req files--->', req.files);
if (req.files && req.files.data) {
// tslint:disable-next-line:all
const url = removePrefix('/proxies/v8', req.originalUrl)
const file: UploadedFile = req.files.data as UploadedFile
const formData = new FormData()
Expand All @@ -390,6 +397,7 @@ proxiesV8.post(['/user/v1/bulkupload', '/storage/profilePhotoUpload/*', '/workfl
if (!rootOrgId) {
rootOrgId = ''
}
// tslint:disable-next-line:all
let channel = _.get(req, 'session.channel')
if (!channel) {
channel = ''
Expand All @@ -401,7 +409,9 @@ proxiesV8.post(['/user/v1/bulkupload', '/storage/profilePhotoUpload/*', '/workfl
Authorization: CONSTANTS.SB_API_KEY,
// tslint:disable-next-line: all
'x-authenticated-user-channel': encodeURIComponent(channel),
// tslint:disable-next-line
'x-authenticated-user-orgid': rootOrgId,
// tslint:disable-next-line
'x-authenticated-user-orgname': encodeURIComponent(channel),
'x-authenticated-user-token': extractUserToken(req),
'x-authenticated-userid': extractUserIdFromRequest(req),
Expand All @@ -425,7 +435,54 @@ proxiesV8.post(['/user/v1/bulkupload', '/storage/profilePhotoUpload/*', '/workfl
}
}
)
} else {
} else if (req.files && req.files.file) {
const url = removePrefix('/proxies/v8', req.originalUrl)
const file: UploadedFile = req.files.file as UploadedFile
const formData = new FormData()
formData.append('file', Buffer.from(file.data), {
contentType: file.mimetype,
filename: file.name,
})
let rootOrgId = _.get(req, 'session.rootOrgId')
if (!rootOrgId) {
rootOrgId = ''
}
let channel = _.get(req, 'session.channel')
if (!channel) {
channel = ''
}
formData.submit(
{
headers: {
// tslint:disable-next-line:max-line-length
Authorization: CONSTANTS.SB_API_KEY,
// tslint:disable-next-line: all
'x-authenticated-user-channel': encodeURIComponent(channel),
'x-authenticated-user-orgid': rootOrgId,
'x-authenticated-user-orgname': encodeURIComponent(channel),
'x-authenticated-user-token': extractUserToken(req),
'x-authenticated-userid': extractUserIdFromRequest(req),
},
host: 'kong',
path: url,
port: 8000,
},
// tslint:disable-next-line: all
(err, response) => {
// tslint:disable-next-line: all
response.on('data', (data) => {
if (!err && (response.statusCode === 200 || response.statusCode === 201 || response.statusCode === 406)) {
res.status(response.statusCode).send(JSON.parse(data.toString('utf8')))
} else {
res.status(500).send(data.toString('utf8'))
}
})
if (err) {
res.status(500).send(err)
}
}
)
} else {
res.status(500).send(FILE_NOT_FOUND_ERR)
}
})
Expand Down Expand Up @@ -833,6 +890,112 @@ proxiesV8.use('/catalog/*',
proxyCreatorSunbird(express.Router(), `${CONSTANTS.KONG_API_BASE}`)
)

// tslint:disable-next-line:max-line-length
proxiesV8.patch(['/cloud-services/mlcore/v1/files/upload'], (req, res) => {
// tslint:disable-next-line: all
console.log('req for files--->', req);
// tslint:disable-next-line: all
console.log('req files--->', req.files);
if (req.files && req.files.data) {
const url = removePrefix('/proxies/v8', req.originalUrl)
const file: UploadedFile = req.files.data as UploadedFile
const formData = new FormData()
formData.append('file', Buffer.from(file.data), {
contentType: file.mimetype,
filename: file.name,
})
let rootOrgId = _.get(req, 'session.rootOrgId')
if (!rootOrgId) {
rootOrgId = ''
}
let channel = _.get(req, 'session.channel')
if (!channel) {
channel = ''
}
formData.submit(
{
headers: {
// tslint:disable-next-line:max-line-length
Authorization: CONSTANTS.SB_API_KEY,
// tslint:disable-next-line: all
'x-authenticated-user-channel': encodeURIComponent(channel),
'x-authenticated-user-orgid': rootOrgId,
'x-authenticated-user-orgname': encodeURIComponent(channel),
'x-authenticated-user-token': extractUserToken(req),
'x-authenticated-userid': extractUserIdFromRequest(req),
},
host: 'kong',
path: url,
port: 8000,
},
// tslint:disable-next-line: all
(err, response) => {
// tslint:disable-next-line: all
response.on('data', (data) => {
if (!err && (response.statusCode === 200 || response.statusCode === 201)) {
res.send(JSON.parse(data.toString('utf8')))
} else {
res.send(data.toString('utf8'))
}
})
if (err) {
res.send(err)
}
}
)
} else {
res.send(FILE_NOT_FOUND_ERR)
}
})

// proxiesV8.patch(['/cloud-services/mlcore/v1/files/upload'], (req, res) => {
// // tslint:disable-next-line: all
// console.log('req', req);
// if (req.files && req.files.data) {
// const url = removePrefix('/proxies/v8', req.originalUrl)
// const file: UploadedFile = req.files.data as UploadedFile
// // tslint:disable-next-line: all
// console.log('url', url);
// // tslint:disable-next-line: all
// console.log('file', file);
// const formData = new FormData()
// formData.append('file', Buffer.from(file.data), {
// contentType: file.mimetype,
// filename: file.name,
// })
// // tslint:disable-next-line: all
// console.log('formData', formData);
// formData.submit(
// {
// headers: {
// // tslint:disable-next-line:max-line-length
// Authorization: CONSTANTS.SB_API_KEY,
// // tslint:disable-next-line: all
// 'x-authenticated-user-token': extractUserToken(req)
// },
// host: 'kong',
// path: url,
// port: 8000,
// },
// // tslint:disable-next-line: all
// (err, response) => {
// // tslint:disable-next-line: all
// response.on('data', (data) => {
// if (!err && (response.statusCode === 200 || response.statusCode === 201)) {
// res.send(JSON.parse(data.toString('utf8')))
// } else {
// res.send(data.toString('utf8'))
// }
// })
// if (err) {
// res.send(err)
// }
// }
// )
// } else {
// res.send(FILE_NOT_FOUND_ERR)
// }
// })
export interface IUserProfile {
channel: string
firstName: string
Expand Down
9 changes: 8 additions & 1 deletion src/utils/proxyCreator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ proxy.on('proxyReq', (proxyReq: any, req: any, _res: any, _options: any) => {
console.log('REQ_URL_ORIGINAL discussion', proxyReq.path)

}
if (!req.originalUrl.includes('/storage/upload') && !req.originalUrl.includes('/storage/profilePhotoUpload/*') && req.body) {
// tslint:disable-next-line:max-line-length
if (!req.originalUrl.includes('/storage/upload') && !req.originalUrl.includes('/storage/profilePhotoUpload/*') && req.body) {
// tslint:disable-next-line: no-console
console.log('req in creator original url', req.originalUrl)
// tslint:disable-next-line: no-console
console.log('req in creator original url including not condition', !req.originalUrl.includes('/cloud-services/mlcore/v1/files/*'))
// tslint:disable-next-line: no-console
console.log('req in creator', req)
const bodyData = JSON.stringify(req.body)
proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData))
proxyReq.write(bodyData)
Expand Down