Browse Source

Replaced old error code.

KrisVos130 8 years ago
parent
commit
ec97ccce7e

+ 15 - 10
backend/logic/actions/news.js

@@ -47,8 +47,9 @@ module.exports = {
 			}
 		], (err, news) => {
 			if (err) {
-				logger.error("NEWS_INDEX", `Indexing news failed. "${err.message}"`);
-				return cb({status: 'failure', message: 'Something went wrong.'});
+				err = utils.getError(err);
+				logger.error("NEWS_INDEX", `Indexing news failed. "${err}"`);
+				return cb({status: 'failure', message: err});
 			}
 			logger.success("NEWS_INDEX", `Indexing news successful.`);
 			return cb({ status: 'success', data: news });
@@ -72,8 +73,9 @@ module.exports = {
 			}
 		], (err, news) => {
 			if (err) {
-				logger.error("NEWS_CREATE", `Creating news failed. "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong' });
+				err = utils.getError(err);
+				logger.error("NEWS_CREATE", `Creating news failed. "${err}"`);
+				return cb({ 'status': 'failure', 'message': err });
 			}
 			cache.pub('news.create', news);
 			logger.success("NEWS_CREATE", `Creating news successful.`);
@@ -94,8 +96,9 @@ module.exports = {
 			}
 		], (err, news) => {
 			if (err) {
-				logger.error("NEWS_NEWEST", `Getting the latest news failed. "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong' });
+				err = utils.getError(err);
+				logger.error("NEWS_NEWEST", `Getting the latest news failed. "${err}"`);
+				return cb({ 'status': 'failure', 'message': err });
 			}
 			logger.success("NEWS_NEWEST", `Successfully got the latest news.`);
 			return cb({ status: 'success', data: news });
@@ -114,8 +117,9 @@ module.exports = {
 	remove: hooks.adminRequired((session, news, cb, userId) => {
 		db.models.news.remove({ _id: news._id }, err => {
 			if (err) {
-				logger.error("NEWS_REMOVE", `Removing news "${news._id}" failed for user "${userId}". "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong' });
+				err = utils.getError(err);
+				logger.error("NEWS_REMOVE", `Removing news "${news._id}" failed for user "${userId}". "${err}"`);
+				return cb({ 'status': 'failure', 'message': err });
 			} else {
 				cache.pub('news.remove', news);
 				logger.success("NEWS_REMOVE", `Removing news "${news._id}" successful by user "${userId}".`);
@@ -136,8 +140,9 @@ module.exports = {
 	update: hooks.adminRequired((session, _id, news, cb, userId) => {
 		db.models.news.update({ _id }, news, { upsert: true }, err => {
 			if (err) {
-				logger.error("NEWS_UPDATE", `Updating news "${_id}" failed for user "${userId}". "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong' });
+				err = utils.getError(err);
+				logger.error("NEWS_UPDATE", `Updating news "${_id}" failed for user "${userId}". "${err}"`);
+				return cb({ 'status': 'failure', 'message': err });
 			} else {
 				cache.pub('news.update', news);
 				logger.success("NEWS_UPDATE", `Updating news "${_id}" successful for user "${userId}".`);

+ 36 - 60
backend/logic/actions/playlists.js

@@ -92,11 +92,9 @@ let lib = {
 			}
 		], (err, song) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_GET_FIRST_SONG", `Getting the first song of playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: 'Something went wrong when getting the playlist'});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_GET_FIRST_SONG", `Getting the first song of playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_GET_FIRST_SONG", `Successfully got the first song of playlist "${playlistId}" for user "${userId}".`);
 			cb({
@@ -120,11 +118,9 @@ let lib = {
 			}
 		], (err, playlists) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_INDEX_FOR_USER", `Indexing playlists for user "${userId}" failed. "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_INDEX_FOR_USER", `Indexing playlists for user "${userId}" failed. "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_INDEX_FOR_USER", `Successfully indexed playlists for user "${userId}".`);
 			cb({
@@ -162,11 +158,9 @@ let lib = {
 
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_CREATE", `Creating private playlist failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_CREATE", `Creating private playlist failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			cache.pub('playlist.create', playlist._id);
 			logger.success("PLAYLIST_CREATE", `Successfully created private playlist for user "${userId}".`);
@@ -194,11 +188,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_GET", `Getting private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_GET", `Getting private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_GET", `Successfully got private playlist "${playlistId}" for user "${userId}".`);
 			console.log(playlist);
@@ -230,11 +222,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_UPDATE", `Updating private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_UPDATE", `Updating private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_UPDATE", `Successfully updated private playlist "${playlistId}" for user "${userId}".`);
 			cb({
@@ -291,11 +281,9 @@ let lib = {
 		],
 		(err, playlist, newSong) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_ADD_SONG", `Adding song "${songId}" to private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_ADD_SONG", `Adding song "${songId}" to private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_ADD_SONG", `Successfully added song "${songId}" to private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.addSong', { playlistId: playlist._id, song: newSong, userId: userId });
@@ -341,11 +329,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_IMPORT", `Importing a YouTube playlist to private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_IMPORT", `Importing a YouTube playlist to private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_IMPORT", `Successfully imported a YouTube playlist to private playlist "${playlistId}" for user "${userId}".`);
 			cb({ status: 'success', message: 'Playlist has been successfully imported.', data: playlist.songs });
@@ -377,11 +363,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_REMOVE_SONG", `Removing song "${songId}" from private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_REMOVE_SONG", `Removing song "${songId}" from private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_REMOVE_SONG", `Successfully removed song "${songId}" from private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.removeSong', {playlistId: playlist._id, songId: songId, userId: userId});
@@ -408,11 +392,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_UPDATE_DISPLAY_NAME", `Updating display name to "${displayName}" for private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_UPDATE_DISPLAY_NAME", `Updating display name to "${displayName}" for private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_UPDATE_DISPLAY_NAME", `Successfully updated display name to "${displayName}" for private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.updateDisplayName', {playlistId: playlistId, displayName: displayName, userId: userId});
@@ -469,11 +451,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_MOVE_SONG_TO_TOP", `Moving song "${songId}" to the top for private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_MOVE_SONG_TO_TOP", `Moving song "${songId}" to the top for private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_MOVE_SONG_TO_TOP", `Successfully moved song "${songId}" to the top for private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.moveSongToTop', {playlistId, songId, userId: userId});
@@ -527,11 +507,9 @@ let lib = {
 			}
 		], (err, playlist) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_MOVE_SONG_TO_BOTTOM", `Moving song "${songId}" to the bottom for private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_MOVE_SONG_TO_BOTTOM", `Moving song "${songId}" to the bottom for private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_MOVE_SONG_TO_BOTTOM", `Successfully moved song "${songId}" to the bottom for private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.moveSongToBottom', {playlistId, songId, userId: userId});
@@ -554,11 +532,9 @@ let lib = {
 			}
 		], (err) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("PLAYLIST_REMOVE", `Removing private playlist "${playlistId}" failed for user "${userId}". "${error}"`);
-				return cb({ status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("PLAYLIST_REMOVE", `Removing private playlist "${playlistId}" failed for user "${userId}". "${err}"`);
+				return cb({ status: 'failure', message: err});
 			}
 			logger.success("PLAYLIST_REMOVE", `Successfully removed private playlist "${playlistId}" for user "${userId}".`);
 			cache.pub('playlist.delete', {userId: userId, playlistId});

+ 13 - 16
backend/logic/actions/queueSongs.js

@@ -41,8 +41,9 @@ module.exports = {
 			}
 		], (err, songs) => {
 			if (err) {
-				logger.error("QUEUE_INDEX", `Indexing queuesongs failed. "${err.message}"`);
-				return cb({status: 'failure', message: 'Something went wrong.'});
+				err = utils.getError(err);
+				logger.error("QUEUE_INDEX", `Indexing queuesongs failed. "${err}"`);
+				return cb({status: 'failure', message: err});
 			} else {
 				module.exports.getSet(session, 1, result => {
 					logger.success("QUEUE_INDEX", `Indexing queuesongs successful.`);
@@ -87,11 +88,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("QUEUE_UPDATE", `Updating queuesong "${songId}" failed for user ${userId}. "${err.message}"`);
-				return cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("QUEUE_UPDATE", `Updating queuesong "${songId}" failed for user ${userId}. "${err}"`);
+				return cb({status: 'failure', message: err});
 			}
 			cache.pub('queue.update', songId);
 			logger.success("QUEUE_UPDATE", `User "${userId}" successfully update queuesong "${songId}".`);
@@ -114,11 +113,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("QUEUE_REMOVE", `Removing queuesong "${songId}" failed for user ${userId}. "${err.message}"`);
-				return cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("QUEUE_REMOVE", `Removing queuesong "${songId}" failed for user ${userId}. "${err}"`);
+				return cb({status: 'failure', message: err});
 			}
 			cache.pub('queue.removedSong', songId);
 			logger.success("QUEUE_REMOVE", `User "${userId}" successfully removed queuesong "${songId}".`);
@@ -189,12 +186,12 @@ module.exports = {
 			}
 		], (err, newSong) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				return cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("QUEUE_ADD", `Adding queuesong "${songId}" failed for user ${userId}. "${err}"`);
+				return cb({status: 'failure', message: err});
 			}
 			cache.pub('queue.newSong', newSong._id);
+			logger.success("QUEUE_ADD", `User "${userId}" successfully added queuesong "${songId}".`);
 			return cb({ status: 'success', message: 'Successfully added that song to the queue' });
 		});
 	})

+ 12 - 11
backend/logic/actions/reports.js

@@ -73,8 +73,9 @@ module.exports = {
 			}
 		], (err, reports) => {
 			if (err) {
-				logger.error("REPORTS_INDEX", `Indexing reports failed. "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong'});
+				err = utils.getError(err);
+				logger.error("REPORTS_INDEX", `Indexing reports failed. "${err}"`);
+				return cb({ 'status': 'failure', 'message': err});
 			}
 			logger.success("REPORTS_INDEX", "Indexing reports successful.");
 			cb({ status: 'success', data: reports });
@@ -95,8 +96,9 @@ module.exports = {
 			}
 		], (err, reports) => {
 			if (err) {
-				logger.error("REPORTS_GETFORSONG", `Indexing reports for song "${songId}" failed. "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong'});
+				err = utils.getError(err);
+				logger.error("REPORTS_GETFORSONG", `Indexing reports for song "${songId}" failed. "${err}"`);
+				return cb({ 'status': 'failure', 'message': err});
 			} else {
 				logger.success("REPORTS_GETFORSONG", `Indexing report for song "{songId}" successful.`);
 				return cb({ status: 'success', data: reports.length });
@@ -128,8 +130,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err) {
-				logger.error("REPORTS_RESOLVE", `Resolving report "${reportId}" failed by user "${userId}". Mongo error. "${err.message}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong'});
+				err = utils.getError(err);
+				logger.error("REPORTS_RESOLVE", `Resolving report "${reportId}" failed by user "${userId}". "${err}"`);
+				return cb({ 'status': 'failure', 'message': err});
 			} else {
 				cache.pub('report.resolve', reportId);
 				logger.success("REPORTS_RESOLVE", `User "${userId}" resolved report "${reportId}".`);
@@ -190,11 +193,9 @@ module.exports = {
 
 		], (err, report) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("REPORTS_CREATE", `Creating report for "${data.songId}" failed by user "${userId}". "${error}"`);
-				return cb({ 'status': 'failure', 'message': 'Something went wrong' });
+				err = utils.getError(err);
+				logger.error("REPORTS_CREATE", `Creating report for "${data.songId}" failed by user "${userId}". "${err}"`);
+				return cb({ 'status': 'failure', 'message': err });
 			}
 			else {
 				cache.pub('report.create', report);

+ 2 - 2
backend/logic/actions/songs.js

@@ -261,7 +261,7 @@ module.exports = {
 		});
 	}),
 
-	getOwnSongRatings: hooks.loginRequired(function(session, songId, cb, userId) {
+	getOwnSongRatings: hooks.loginRequired((session, songId, cb, userId) => {
 		db.models.user.findOne({_id: userId}, (err, user) => {
 			if (!err && user) {
 				return cb({
@@ -273,7 +273,7 @@ module.exports = {
 			} else {
 				return cb({
 					status: 'failure',
-					message: 'You are not logged in.'
+					message: utils.getError(err)
 				});
 			}
 		});

+ 27 - 45
backend/logic/actions/users.js

@@ -556,11 +556,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("UPDATE_PASSWORD", `Failed updating user password of user '${userId}'. '${error}'.`);
-				return cb({ status: 'failure', message: error });
+				err = utils.getError(err);
+				logger.error("UPDATE_PASSWORD", `Failed updating user password of user '${userId}'. '${err}'.`);
+				return cb({ status: 'failure', message: err });
 			}
 
 			logger.error("UPDATE_PASSWORD", `User '${userId}' updated their password.`);
@@ -603,11 +601,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("REQUEST_PASSWORD", `UserId '${userId}' failed to request password. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("REQUEST_PASSWORD", `UserId '${userId}' failed to request password. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("REQUEST_PASSWORD", `UserId '${userId}' successfully requested a password.`);
 				cb({
@@ -640,11 +636,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("VERIFY_PASSWORD_CODE", `Code '${code}' failed to verify. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("VERIFY_PASSWORD_CODE", `Code '${code}' failed to verify. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("VERIFY_PASSWORD_CODE", `Code '${code}' successfully verified.`);
 				cb({
@@ -691,11 +685,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("ADD_PASSWORD_WITH_CODE", `Code '${code}' failed to add password. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("ADD_PASSWORD_WITH_CODE", `Code '${code}' failed to add password. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("ADD_PASSWORD_WITH_CODE", `Code '${code}' successfully added password.`);
 				cache.pub('user.linkPassword', userId);
@@ -727,11 +719,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("UNLINK_PASSWORD", `Unlinking password failed for userId '${userId}'. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("UNLINK_PASSWORD", `Unlinking password failed for userId '${userId}'. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("UNLINK_PASSWORD", `Unlinking password successful for userId '${userId}'.`);
 				cache.pub('user.unlinkPassword', userId);
@@ -763,11 +753,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("UNLINK_GITHUB", `Unlinking GitHub failed for userId '${userId}'. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("UNLINK_GITHUB", `Unlinking GitHub failed for userId '${userId}'. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("UNLINK_GITHUB", `Unlinking GitHub successful for userId '${userId}'.`);
 				cache.pub('user.unlinkGitHub', userId);
@@ -812,11 +800,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("REQUEST_PASSWORD_RESET", `Email '${email}' failed to request password reset. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("REQUEST_PASSWORD_RESET", `Email '${email}' failed to request password reset. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("REQUEST_PASSWORD_RESET", `Email '${email}' successfully requested a password reset.`);
 				cb({
@@ -848,11 +834,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("VERIFY_PASSWORD_RESET_CODE", `Code '${code}' failed to verify. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("VERIFY_PASSWORD_RESET_CODE", `Code '${code}' failed to verify. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("VERIFY_PASSWORD_RESET_CODE", `Code '${code}' successfully verified.`);
 				cb({
@@ -898,11 +882,9 @@ module.exports = {
 			}
 		], (err) => {
 			if (err && err !== true) {
-				let error = 'An error occurred.';
-				if (typeof err === "string") error = err;
-				else if (err.message) error = err.message;
-				logger.error("CHANGE_PASSWORD_WITH_RESET_CODE", `Code '${code}' failed to change password. '${error}'`);
-				cb({status: 'failure', message: error});
+				err = utils.getError(err);
+				logger.error("CHANGE_PASSWORD_WITH_RESET_CODE", `Code '${code}' failed to change password. '${err}'`);
+				cb({status: 'failure', message: err});
 			} else {
 				logger.success("CHANGE_PASSWORD_WITH_RESET_CODE", `Code '${code}' successfully changed password.`);
 				cb({