Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
4e6bdf7a
Commit
4e6bdf7a
authored
2 years ago
by
Rajesh Kumaravel
Browse files
Options
Download
Patches
Plain Diff
testing
parent
326c44e6
gcp_test
Tags unavailable
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/helpers/resourceBundleHelper.js
+1
-0
src/app/helpers/resourceBundleHelper.js
src/app/package.json
+1
-1
src/app/package.json
src/app/routes/desktopAppRoutes.js
+3
-0
src/app/routes/desktopAppRoutes.js
src/app/routes/reportRoutes.js
+15
-0
src/app/routes/reportRoutes.js
with
20 additions
and
1 deletion
+20
-1
src/app/helpers/resourceBundleHelper.js
+
1
−
0
View file @
4e6bdf7a
...
...
@@ -15,6 +15,7 @@ const getGeneralisedResourcesBundles = (req, res) => {
if
(
envHelper
.
sunbird_cloud_storage_provider
===
'
gcloud
'
)
{
container
=
envHelper
.
sunbird_gcloud_labels
;
}
console
.
log
(
'
called getGeneralisedResourcesBundles
'
);
// TODO: log!
StorageService
.
CLOUD_CLIENT
.
getFileAsText
(
container
,
blobName
,
function
(
error
,
result
,
response
)
{
if
(
error
&&
error
.
statusCode
===
404
)
{
logger
.
error
({
msg
:
"
Blob %s wasn't found container %s
"
,
blobName
,
container
})
...
...
This diff is collapsed.
Click to expand it.
src/app/package.json
+
1
−
1
View file @
4e6bdf7a
...
...
@@ -79,7 +79,7 @@
"azure-storage"
:
"2.10.2"
,
"body-parser"
:
"1.17.2"
,
"cassandra-session-store"
:
"1.0.6"
,
"client-cloud-services"
:
"2.0.
0
"
,
"client-cloud-services"
:
"2.0.
1
"
,
"compare-versions"
:
"3.5.1"
,
"compression"
:
"1.7.2"
,
"connect-redis"
:
"4.0.4"
,
...
...
This diff is collapsed.
Click to expand it.
src/app/routes/desktopAppRoutes.js
+
3
−
0
View file @
4e6bdf7a
...
...
@@ -14,6 +14,9 @@ module.exports = function (app) {
})
app
.
post
(
'
/v1/desktop/upload-crash-logs
'
,
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called /v1/desktop
'
);
// TODO: log!
},
(
req
,
res
,
next
)
=>
{
logger
.
info
({
msg
:
'
desktop crash upload API
'
+
req
.
url
+
'
called
'
});
next
();
...
...
This diff is collapsed.
Click to expand it.
src/app/routes/reportRoutes.js
+
15
−
0
View file @
4e6bdf7a
...
...
@@ -134,23 +134,35 @@ module.exports = function (app) {
app
.
get
(
'
/courseReports/:slug/:filename
'
,
proxyUtils
.
verifyToken
(),
reportHelper
.
validateRoles
([
'
CONTENT_CREATOR
'
]),
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called reporrts 1
'
);
// TODO: log!
},
StorageService
.
CLOUD_CLIENT
.
fileReadStream
(
envHelper
.
sunbird_aws_reports
));
app
.
get
(
'
/course-reports/metadata
'
,
proxyUtils
.
verifyToken
(),
reportHelper
.
validateRoles
([
'
CONTENT_CREATOR
'
,
'
REPORT_VIEWER
'
,
'
REPORT_ADMIN
'
,
'
ORG_ADMIN
'
]),
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called reporrts 2
'
);
// TODO: log!
},
StorageService
.
CLOUD_CLIENT
.
getFileProperties
(
envHelper
.
sunbird_aws_reports
)
);
app
.
get
(
`/reports/fetch/:slug/:filename`
,
proxyUtils
.
verifyToken
(),
reportHelper
.
validateRoles
([
'
REPORT_VIEWER
'
,
'
REPORT_ADMIN
'
,
'
PROGRAM_DESIGNER
'
,
'
PROGRAM_MANAGER
'
]),
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called reporrts 3
'
);
// TODO: log!
},
StorageService
.
CLOUD_CLIENT
.
fileReadStream
(
envHelper
.
sunbird_aws_reports
));
app
.
get
(
'
/reports/:slug/:filename
'
,
proxyUtils
.
verifyToken
(),
reportHelper
.
validateSlug
([
'
public
'
]),
reportHelper
.
validateRoles
([
'
ORG_ADMIN
'
,
'
REPORT_VIEWER
'
,
'
REPORT_ADMIN
'
,
'
PROGRAM_DESIGNER
'
,
'
PROGRAM_MANAGER
'
]),
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called reporrts 4
'
);
// TODO: log!
},
StorageService
.
CLOUD_CLIENT
.
fileReadStream
(
envHelper
.
sunbird_aws_reports
));
app
.
get
(
'
/admin-reports/:slug/:filename
'
,
...
...
@@ -158,6 +170,9 @@ module.exports = function (app) {
reportHelper
.
validateSlug
([
'
geo-summary
'
,
'
geo-detail
'
,
'
geo-summary-district
'
,
'
user-summary
'
,
'
user-detail
'
,
'
validated-user-summary
'
,
'
validated-user-summary-district
'
,
'
validated-user-detail
'
,
'
declared_user_detail
'
]),
reportHelper
.
validateRoles
([
'
ORG_ADMIN
'
]),
(
req
,
res
,
next
)
=>
{
console
.
log
(
'
called reporrts 5
'
);
// TODO: log!
},
StorageService
.
CLOUD_CLIENT
.
fileReadStream
(
envHelper
.
sunbird_aws_reports
));
app
.
get
(
`
${
BASE_REPORT_URL
}
/dataset/get/:datasetId`
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets