Skip to content

Commit b67245e

Browse files
Merge pull request #1603 from topcoder-platform/PM-228
PM- 228 Fix system information leak
2 parents addbf7e + 47e1549 commit b67245e

File tree

6 files changed

+30
-10
lines changed

6 files changed

+30
-10
lines changed

scripts/build.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ process.on('unhandledRejection', err => {
1010
// Ensure environment variables are read.
1111
require('../config/env')
1212

13-
console.log(`Build script is run with FILE_PICKER_API_KEY=${process.env.FILE_PICKER_API_KEY}`)
13+
console.log(`Build script is run`)
1414

1515
const path = require('path')
1616
const chalk = require('chalk')
@@ -114,8 +114,10 @@ checkBrowsers(paths.appPath, isInteractive)
114114
}
115115
)
116116
.catch(err => {
117-
if (err && err.message) {
118-
console.error(err.message)
117+
if (err && process.env.NODE_ENV === 'development') {
118+
console.log(err)
119+
} else {
120+
console.error('An unexpected error occurred while build')
119121
}
120122
process.exit(1)
121123
})

scripts/start.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ checkBrowsers(paths.appPath, isInteractive)
111111
})
112112
})
113113
.catch(err => {
114-
if (err && err.message) {
115-
console.error(err.message)
114+
if (err && process.env.NODE_ENV === 'development') {
115+
console.log(err)
116+
} else {
117+
console.error('An error occurred while starting the development server')
116118
}
117119
process.exit(1)
118120
})

server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ app.get('/*', (req, res) => res.sendFile(path.join(__dirname, 'build', 'index.ht
4040
const port = process.env.PORT || 3000
4141
app.listen(port)
4242

43-
console.log(`App is listening on port ${port}`)
43+
console.log(`App is now listening...`)

src/components/ChallengeEditor/Description-Field/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,11 @@ class DescriptionField extends Component {
782782
}).then(res => {
783783
onload(res)
784784
}).catch(err => {
785-
console.log(err)
785+
if (process.env.NODE_ENV === 'development') {
786+
console.log(err)
787+
} else {
788+
console.log('An unexpected error occured while uploading image')
789+
}
786790
onerror()
787791
})
788792
}

src/routes.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ class Routes extends React.Component {
9494
getFreshToken().then((token) => {
9595
this.props.saveToken(token)
9696
}).catch((error) => {
97-
console.error(error.message)
97+
if (process.env.NODE_ENV === 'development') {
98+
console.error(error)
99+
} else {
100+
console.error('An unexpected error occurred while getting auth token')
101+
}
98102
const redirectBackToUrl = encodeURIComponent(window.location.origin + this.props.location.pathname)
99103
window.location = `${ACCOUNTS_APP_LOGIN_URL}?retUrl=${redirectBackToUrl}`
100104
})

src/services/axiosWithAuth.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ export const getToken = () => {
1818
resolve(token)
1919
})
2020
.catch((err) => {
21-
console.error(err)
21+
if (process.env.NODE_ENV === 'development') {
22+
console.log(err)
23+
} else {
24+
console.error('Error getting auth token')
25+
}
2226
reject(err)
2327
})
2428
}
@@ -40,7 +44,11 @@ axiosInstance.interceptors.request.use(config => {
4044
return config
4145
})
4246
.catch((err) => {
43-
console.error(err)
47+
if (process.env.NODE_ENV === 'development') {
48+
console.log(err)
49+
} else {
50+
console.error('An unexpected error occured while retrieving the auth token.')
51+
}
4452
const redirectBackToUrl = window.location.origin
4553
window.location = ACCOUNTS_APP_LOGIN_URL + '?retUrl=' + redirectBackToUrl
4654
})

0 commit comments

Comments
 (0)