diff --git a/api-server/common/models/User-Identity.js b/api-server/common/models/User-Identity.js index bff8f3e6a5..e028fd3ce6 100644 --- a/api-server/common/models/User-Identity.js +++ b/api-server/common/models/User-Identity.js @@ -50,9 +50,9 @@ export default function(UserIdent) { new Error('invalid or empty email recieved from auth0'), { message: dedent` - Oops... something is not right. We did not find a valid email from your - ${provider} account. Please try again with a different provider that has an - email available with it. + ${provider} did not return a valid email address. + Please try again with a different account that has an + email associated with it your update your settings on ${provider}, for us to be able to retrieve your email. `, type: 'info', redirectTo: '/' @@ -73,8 +73,7 @@ export default function(UserIdent) { new Error('could not find or create a user'), { message: dedent` - Oops... something is not right. We could not find or create a - user with that email. + We could not find or create a user with that email address. `, type: 'info', redirectTo: '/' diff --git a/api-server/server/boot/authentication.js b/api-server/server/boot/authentication.js index a915e2fff8..b39523a4ae 100644 --- a/api-server/server/boot/authentication.js +++ b/api-server/server/boot/authentication.js @@ -53,7 +53,7 @@ module.exports = function enableAuthentication(app) { if (err) { throw wrapHandledError(new Error('could not destroy session'), { type: 'info', - message: 'Oops, something is not right.', + message: 'We could not log you out, please try again in a moment.', redirectTo: homeLocation }); } diff --git a/api-server/server/boot/user.js b/api-server/server/boot/user.js index 63a594c76d..5a5aec68d5 100644 --- a/api-server/server/boot/user.js +++ b/api-server/server/boot/user.js @@ -205,7 +205,7 @@ function createPostReportUserProfile(app) { if (!username || !report || report === '') { return res.json({ type: 'danger', - message: 'Oops, something is not right please re-check your submission.' + message: 'Check if you have provided a username and a report' }); } return Email.send$( diff --git a/api-server/server/middlewares/error-handlers.js b/api-server/server/middlewares/error-handlers.js index 5f3744869c..59c59b0371 100644 --- a/api-server/server/middlewares/error-handlers.js +++ b/api-server/server/middlewares/error-handlers.js @@ -26,7 +26,8 @@ export default function prodErrorHandler() { const redirectTo = handled.redirectTo || `${homeLocation}/`; const message = - handled.message || 'Oops! Something went wrong. Please try again later'; + handled.message || + 'Oops! Something went wrong. Please try again in a moment.'; if (isDev) { console.error(err);