From 45f7cf04abbfd0028dc0ffa5303095b95b46a74d Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 2 Oct 2019 19:45:27 +0200 Subject: [PATCH] remove old module.exports from server aswell --- website/server/controllers/api-v3/auth.js | 2 +- website/server/controllers/api-v3/challenges.js | 2 +- website/server/controllers/api-v3/chat.js | 2 +- website/server/controllers/api-v3/content.js | 2 +- website/server/controllers/api-v3/coupon.js | 2 +- website/server/controllers/api-v3/cron.js | 2 +- website/server/controllers/api-v3/debug.js | 2 +- website/server/controllers/api-v3/groups.js | 2 +- website/server/controllers/api-v3/hall.js | 2 +- website/server/controllers/api-v3/i18n.js | 2 +- website/server/controllers/api-v3/iap.js | 3 ++- website/server/controllers/api-v3/inbox.js | 2 +- website/server/controllers/api-v3/members.js | 2 +- website/server/controllers/api-v3/modelsPaths.js | 2 +- website/server/controllers/api-v3/news.js | 2 +- website/server/controllers/api-v3/notifications.js | 2 +- .../server/controllers/api-v3/pushNotifications.js | 2 +- website/server/controllers/api-v3/quests.js | 2 +- website/server/controllers/api-v3/shops.js | 2 +- website/server/controllers/api-v3/status.js | 2 +- website/server/controllers/api-v3/tags.js | 2 +- website/server/controllers/api-v3/tasks.js | 2 +- website/server/controllers/api-v3/tasks/groups.js | 2 +- website/server/controllers/api-v3/user.js | 2 +- website/server/controllers/api-v3/user/spells.js | 2 +- website/server/controllers/api-v3/user/stats.js | 2 +- website/server/controllers/api-v3/webhook.js | 2 +- website/server/controllers/api-v3/world.js | 2 +- website/server/controllers/api-v4/auth.js | 2 +- website/server/controllers/api-v4/coupon.js | 2 +- website/server/controllers/api-v4/inbox.js | 2 +- website/server/controllers/api-v4/members.js | 2 +- website/server/controllers/api-v4/user.js | 2 +- website/server/controllers/api-v4/user/spells.js | 2 +- website/server/controllers/top-level/auth.js | 2 +- website/server/controllers/top-level/dataexport.js | 2 +- website/server/controllers/top-level/email.js | 2 +- website/server/controllers/top-level/pages.js | 2 +- .../server/controllers/top-level/payments/amazon.js | 2 +- website/server/controllers/top-level/payments/iap.js | 2 +- .../server/controllers/top-level/payments/paypal.js | 2 +- .../server/controllers/top-level/payments/stripe.js | 2 +- website/server/controllers/top-level/qrcodes.js | 2 +- website/server/index.js | 2 +- website/server/libs/analyticsService.js | 2 +- website/server/libs/auth/index.js | 2 +- website/server/libs/auth/social.js | 6 +----- website/server/libs/auth/utils.js | 9 ++------- website/server/libs/bannedSlurs.js | 4 ++-- website/server/libs/bannedWords.js | 2 +- website/server/libs/baseModel.js | 4 ++-- website/server/libs/csvStringify.js | 2 +- website/server/libs/forbiddenUsernames.js | 4 ++-- website/server/libs/guildsAllowingBannedWords.js | 4 ++-- website/server/libs/inAppPurchases.js | 2 +- website/server/libs/invites/index.js | 2 +- website/server/libs/logger.js | 2 +- website/server/libs/payments/amazon.js | 2 +- website/server/libs/payments/apple.js | 2 +- website/server/libs/payments/gems.js | 2 +- website/server/libs/payments/google.js | 2 +- website/server/libs/payments/groupPayments.js | 2 +- website/server/libs/payments/payments.js | 2 +- website/server/libs/payments/paypal.js | 2 +- website/server/libs/payments/stripe.js | 2 +- website/server/libs/payments/stripe/api.js | 2 +- website/server/libs/payments/stripe/checkout.js | 2 +- website/server/libs/payments/stripe/constants.js | 2 +- website/server/libs/payments/subscriptions.js | 2 +- website/server/libs/pushNotifications.js | 2 +- website/server/libs/routes.js | 12 ++++++------ website/server/libs/setupNconf.js | 4 ++-- website/server/libs/slack.js | 2 +- website/server/middlewares/analytics.js | 4 ++-- website/server/middlewares/appRoutes.js | 4 ++-- website/server/middlewares/cors.js | 4 ++-- website/server/middlewares/cron.js | 4 ++-- website/server/middlewares/domain.js | 4 ++-- website/server/middlewares/ensureDevelpmentMode.js | 4 ++-- website/server/middlewares/errorHandler.js | 4 ++-- website/server/middlewares/index.js | 4 ++-- website/server/middlewares/maintenanceMode.js | 4 ++-- website/server/middlewares/notFound.js | 4 ++-- website/server/middlewares/response.js | 4 ++-- website/server/middlewares/setupBody.js | 4 ++-- website/server/middlewares/static.js | 4 ++-- website/server/middlewares/v1.js | 2 +- website/server/middlewares/v2.js | 2 +- website/server/models/coupon.js | 1 - website/server/models/user/schema.js | 6 ++---- website/server/server.js | 2 +- 91 files changed, 116 insertions(+), 127 deletions(-) diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js index 9d5d2a4977..782e52c5ba 100644 --- a/website/server/controllers/api-v3/auth.js +++ b/website/server/controllers/api-v3/auth.js @@ -432,4 +432,4 @@ api.deleteSocial = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/challenges.js b/website/server/controllers/api-v3/challenges.js index f0a60396a9..655bd4585b 100644 --- a/website/server/controllers/api-v3/challenges.js +++ b/website/server/controllers/api-v3/challenges.js @@ -827,4 +827,4 @@ api.cloneChallenge = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js index e56337e76d..e72ae98d4c 100644 --- a/website/server/controllers/api-v3/chat.js +++ b/website/server/controllers/api-v3/chat.js @@ -542,4 +542,4 @@ api.deleteChat = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/content.js b/website/server/controllers/api-v3/content.js index ed1ede77e2..f175872033 100644 --- a/website/server/controllers/api-v3/content.js +++ b/website/server/controllers/api-v3/content.js @@ -135,4 +135,4 @@ api.getContent = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/coupon.js b/website/server/controllers/api-v3/coupon.js index 7acc406a44..38109f51be 100644 --- a/website/server/controllers/api-v3/coupon.js +++ b/website/server/controllers/api-v3/coupon.js @@ -137,4 +137,4 @@ api.validateCoupon = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/cron.js b/website/server/controllers/api-v3/cron.js index 32ed99039a..ecba00df92 100644 --- a/website/server/controllers/api-v3/cron.js +++ b/website/server/controllers/api-v3/cron.js @@ -19,4 +19,4 @@ api.cron = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/debug.js b/website/server/controllers/api-v3/debug.js index eb2cd31260..d6ffe3252f 100644 --- a/website/server/controllers/api-v3/debug.js +++ b/website/server/controllers/api-v3/debug.js @@ -198,4 +198,4 @@ api.questProgress = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index 41e1884ae5..a5b6039aef 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -1217,4 +1217,4 @@ api.getGroupPlans = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js index 621433b76f..1c81cc25ac 100644 --- a/website/server/controllers/api-v3/hall.js +++ b/website/server/controllers/api-v3/hall.js @@ -302,4 +302,4 @@ api.updateHero = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/i18n.js b/website/server/controllers/api-v3/i18n.js index de6cfddebb..63e6e54450 100644 --- a/website/server/controllers/api-v3/i18n.js +++ b/website/server/controllers/api-v3/i18n.js @@ -43,4 +43,4 @@ api.geti18nBrowserScript = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/iap.js b/website/server/controllers/api-v3/iap.js index a626817c82..0d07063f88 100644 --- a/website/server/controllers/api-v3/iap.js +++ b/website/server/controllers/api-v3/iap.js @@ -1,4 +1,5 @@ // NOTE: this file is only used because the mobile apps expect IAP routes // to be found at /api/v3/iap instead of /iap. -module.exports = require('../top-level/payments/iap'); +import iap from '../top-level/payments/iap'; +export default iap; diff --git a/website/server/controllers/api-v3/inbox.js b/website/server/controllers/api-v3/inbox.js index b806931a8d..a6ad1d1410 100644 --- a/website/server/controllers/api-v3/inbox.js +++ b/website/server/controllers/api-v3/inbox.js @@ -33,4 +33,4 @@ api.getInboxMessages = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js index 3623477205..3a010090ab 100644 --- a/website/server/controllers/api-v3/members.js +++ b/website/server/controllers/api-v3/members.js @@ -737,4 +737,4 @@ api.transferGems = { }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/modelsPaths.js b/website/server/controllers/api-v3/modelsPaths.js index 93b8641b10..56ae235986 100644 --- a/website/server/controllers/api-v3/modelsPaths.js +++ b/website/server/controllers/api-v3/modelsPaths.js @@ -51,4 +51,4 @@ api.getModelPaths = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 599f36910d..be8ef0e10d 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -87,4 +87,4 @@ api.tellMeLaterNews = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/notifications.js b/website/server/controllers/api-v3/notifications.js index e656063529..45d92d0f77 100644 --- a/website/server/controllers/api-v3/notifications.js +++ b/website/server/controllers/api-v3/notifications.js @@ -191,4 +191,4 @@ api.seeNotifications = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/pushNotifications.js b/website/server/controllers/api-v3/pushNotifications.js index 14330e4e6b..64400345d9 100644 --- a/website/server/controllers/api-v3/pushNotifications.js +++ b/website/server/controllers/api-v3/pushNotifications.js @@ -103,4 +103,4 @@ api.removePushDevice = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/quests.js b/website/server/controllers/api-v3/quests.js index f43b5f7f6b..ee6da8afcf 100644 --- a/website/server/controllers/api-v3/quests.js +++ b/website/server/controllers/api-v3/quests.js @@ -513,4 +513,4 @@ api.leaveQuest = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/shops.js b/website/server/controllers/api-v3/shops.js index 32c46bcd9d..16dbb497ec 100644 --- a/website/server/controllers/api-v3/shops.js +++ b/website/server/controllers/api-v3/shops.js @@ -142,4 +142,4 @@ api.getBackgroundShopItems = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/status.js b/website/server/controllers/api-v3/status.js index baba426ba7..ab2c764d5c 100644 --- a/website/server/controllers/api-v3/status.js +++ b/website/server/controllers/api-v3/status.js @@ -22,4 +22,4 @@ api.getStatus = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/tags.js b/website/server/controllers/api-v3/tags.js index 4d90311257..55ecc251e5 100644 --- a/website/server/controllers/api-v3/tags.js +++ b/website/server/controllers/api-v3/tags.js @@ -246,4 +246,4 @@ api.deleteTag = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js index 0eb220767f..4c93c66a4b 100644 --- a/website/server/controllers/api-v3/tasks.js +++ b/website/server/controllers/api-v3/tasks.js @@ -1356,4 +1356,4 @@ api.deleteTask = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js index 27fcc62db4..2317b4b4ff 100644 --- a/website/server/controllers/api-v3/tasks/groups.js +++ b/website/server/controllers/api-v3/tasks/groups.js @@ -541,4 +541,4 @@ api.getGroupApprovals = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js index c1b721650e..9277df007f 100644 --- a/website/server/controllers/api-v3/user.js +++ b/website/server/controllers/api-v3/user.js @@ -1689,4 +1689,4 @@ api.movePinnedItem = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/user/spells.js b/website/server/controllers/api-v3/user/spells.js index 8740458427..4052e72876 100644 --- a/website/server/controllers/api-v3/user/spells.js +++ b/website/server/controllers/api-v3/user/spells.js @@ -65,4 +65,4 @@ api.castSpell = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/user/stats.js b/website/server/controllers/api-v3/user/stats.js index c3d3ed74e1..97e8af637a 100644 --- a/website/server/controllers/api-v3/user/stats.js +++ b/website/server/controllers/api-v3/user/stats.js @@ -134,4 +134,4 @@ api.allocateNow = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/webhook.js b/website/server/controllers/api-v3/webhook.js index 1ab37bf6a3..62079fd93b 100644 --- a/website/server/controllers/api-v3/webhook.js +++ b/website/server/controllers/api-v3/webhook.js @@ -222,4 +222,4 @@ api.deleteWebhook = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v3/world.js b/website/server/controllers/api-v3/world.js index 1bc7a6ff5c..635ae05826 100644 --- a/website/server/controllers/api-v3/world.js +++ b/website/server/controllers/api-v3/world.js @@ -43,4 +43,4 @@ api.getWorldState = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v4/auth.js b/website/server/controllers/api-v4/auth.js index 05f8b6dd9b..cc2b269862 100644 --- a/website/server/controllers/api-v4/auth.js +++ b/website/server/controllers/api-v4/auth.js @@ -78,4 +78,4 @@ api.registerLocal = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v4/coupon.js b/website/server/controllers/api-v4/coupon.js index dde0f8c8d0..7b28948af0 100644 --- a/website/server/controllers/api-v4/coupon.js +++ b/website/server/controllers/api-v4/coupon.js @@ -31,4 +31,4 @@ api.enterCouponCode = { }, }; -module.exports = api; \ No newline at end of file +export default api; \ No newline at end of file diff --git a/website/server/controllers/api-v4/inbox.js b/website/server/controllers/api-v4/inbox.js index d37eb62e35..d0f0f00455 100644 --- a/website/server/controllers/api-v4/inbox.js +++ b/website/server/controllers/api-v4/inbox.js @@ -135,4 +135,4 @@ api.getInboxMessages = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v4/members.js b/website/server/controllers/api-v4/members.js index 57a1b39ddd..d4bd021135 100644 --- a/website/server/controllers/api-v4/members.js +++ b/website/server/controllers/api-v4/members.js @@ -40,4 +40,4 @@ api.flagPrivateMessage = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v4/user.js b/website/server/controllers/api-v4/user.js index 2474c31dc0..966f000cec 100644 --- a/website/server/controllers/api-v4/user.js +++ b/website/server/controllers/api-v4/user.js @@ -235,4 +235,4 @@ api.verifyDisplayName = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/api-v4/user/spells.js b/website/server/controllers/api-v4/user/spells.js index b167a1aa0a..59022e88cb 100644 --- a/website/server/controllers/api-v4/user/spells.js +++ b/website/server/controllers/api-v4/user/spells.js @@ -71,4 +71,4 @@ api.castSpell = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/auth.js b/website/server/controllers/top-level/auth.js index f7fd76fe2b..d153020e35 100644 --- a/website/server/controllers/top-level/auth.js +++ b/website/server/controllers/top-level/auth.js @@ -32,4 +32,4 @@ api.logout = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/dataexport.js b/website/server/controllers/top-level/dataexport.js index 39333edead..d343c6faf4 100644 --- a/website/server/controllers/top-level/dataexport.js +++ b/website/server/controllers/top-level/dataexport.js @@ -343,4 +343,4 @@ api.exportUserPrivateMessages = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/email.js b/website/server/controllers/top-level/email.js index c769fe6ccb..a4da992f28 100644 --- a/website/server/controllers/top-level/email.js +++ b/website/server/controllers/top-level/email.js @@ -54,4 +54,4 @@ api.unsubscribe = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/pages.js b/website/server/controllers/top-level/pages.js index d0daf9e911..063f413e01 100644 --- a/website/server/controllers/top-level/pages.js +++ b/website/server/controllers/top-level/pages.js @@ -16,4 +16,4 @@ api.getNewClient = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/payments/amazon.js b/website/server/controllers/top-level/payments/amazon.js index c2d5d09ffd..74c4d3696b 100644 --- a/website/server/controllers/top-level/payments/amazon.js +++ b/website/server/controllers/top-level/payments/amazon.js @@ -142,4 +142,4 @@ api.subscribeCancel = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/payments/iap.js b/website/server/controllers/top-level/payments/iap.js index c2e8041d0d..a490181ea0 100644 --- a/website/server/controllers/top-level/payments/iap.js +++ b/website/server/controllers/top-level/payments/iap.js @@ -192,4 +192,4 @@ api.iapSubscriptioniOSNoRenew = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/payments/paypal.js b/website/server/controllers/top-level/payments/paypal.js index 100c5d7361..2088bfccb4 100644 --- a/website/server/controllers/top-level/payments/paypal.js +++ b/website/server/controllers/top-level/payments/paypal.js @@ -170,4 +170,4 @@ api.ipn = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/payments/stripe.js b/website/server/controllers/top-level/payments/stripe.js index 4dbd8c8c4d..4bcb45229c 100644 --- a/website/server/controllers/top-level/payments/stripe.js +++ b/website/server/controllers/top-level/payments/stripe.js @@ -98,4 +98,4 @@ api.handleWebhooks = { }, }; -module.exports = api; +export default api; diff --git a/website/server/controllers/top-level/qrcodes.js b/website/server/controllers/top-level/qrcodes.js index e32b5914d2..4df8b3c89f 100644 --- a/website/server/controllers/top-level/qrcodes.js +++ b/website/server/controllers/top-level/qrcodes.js @@ -14,4 +14,4 @@ api.redirectProfileQRCode = { }, }; -module.exports = api; +export default api; diff --git a/website/server/index.js b/website/server/index.js index c1d6757dee..0cf159da91 100644 --- a/website/server/index.js +++ b/website/server/index.js @@ -8,7 +8,7 @@ if (process.env.NODE_ENV !== 'production') { } // Initialize configuration BEFORE anything -const setupNconf = require('./libs/setupNconf'); +const setupNconf = require('./libs/setupNconf').default; setupNconf(); const nconf = require('nconf'); diff --git a/website/server/libs/analyticsService.js b/website/server/libs/analyticsService.js index 769f2a9bce..1e13f5277c 100644 --- a/website/server/libs/analyticsService.js +++ b/website/server/libs/analyticsService.js @@ -320,7 +320,7 @@ const mockAnalyticsService = { trackPurchase: () => { }, }; -module.exports = { +export { track, trackPurchase, mockAnalyticsService, diff --git a/website/server/libs/auth/index.js b/website/server/libs/auth/index.js index 609f546ad8..e18b6cf63f 100644 --- a/website/server/libs/auth/index.js +++ b/website/server/libs/auth/index.js @@ -205,7 +205,7 @@ async function registerLocal (req, res, { isV3 = false }) { return null; } -module.exports = { +export { loginRes, hasBackupAuth, hasLocalAuth, diff --git a/website/server/libs/auth/social.js b/website/server/libs/auth/social.js index 8ac649ab71..24cc8582e7 100644 --- a/website/server/libs/auth/social.js +++ b/website/server/libs/auth/social.js @@ -21,7 +21,7 @@ function _passportProfile (network, accessToken) { }); } -async function loginSocial (req, res) { +export async function loginSocial (req, res) { const existingUser = res.locals.user; const accessToken = req.body.authResponse.access_token; const network = req.body.network; @@ -111,7 +111,3 @@ async function loginSocial (req, res) { return null; } - -module.exports = { - loginSocial, -}; diff --git a/website/server/libs/auth/utils.js b/website/server/libs/auth/utils.js index 588c596037..14bd8062c9 100644 --- a/website/server/libs/auth/utils.js +++ b/website/server/libs/auth/utils.js @@ -6,12 +6,12 @@ import { NotAuthorized } from '../errors'; const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL'); const translator = shortid('0123456789abcdefghijklmnopqrstuvwxyz'); -function generateUsername () { +export function generateUsername () { let newName = `hb-${translator.new()}`; return newName.substring(0, 20); } -function loginRes (user, req, res) { +export function loginRes (user, req, res) { if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {communityManagerEmail: COMMUNITY_MANAGER_EMAIL, userId: user._id})); const responseData = { @@ -23,8 +23,3 @@ function loginRes (user, req, res) { return res.respond(200, responseData); } - -module.exports = { - generateUsername, - loginRes, -}; diff --git a/website/server/libs/bannedSlurs.js b/website/server/libs/bannedSlurs.js index c6c5db35f0..481890f57c 100644 --- a/website/server/libs/bannedSlurs.js +++ b/website/server/libs/bannedSlurs.js @@ -84,7 +84,7 @@ // DO NOT EDIT! See the comments at the top of this file. -let bannedSlurs = [ +const bannedSlurs = [ 'TESTPLACEHOLDERSLURWORDHERE', 'TESTPLACEHOLDERSLURWORDHERE1', @@ -110,4 +110,4 @@ let bannedSlurs = [ 'cunts', ]; -module.exports = bannedSlurs; +export default bannedSlurs; diff --git a/website/server/libs/bannedWords.js b/website/server/libs/bannedWords.js index 5b0bd7b94e..ba0a7d8b4b 100644 --- a/website/server/libs/bannedWords.js +++ b/website/server/libs/bannedWords.js @@ -174,4 +174,4 @@ let bannedWords = [ 'pewdiepie', ]; -module.exports = bannedWords; +export default bannedWords; diff --git a/website/server/libs/baseModel.js b/website/server/libs/baseModel.js index 3a6e7b16a1..fe52e43130 100644 --- a/website/server/libs/baseModel.js +++ b/website/server/libs/baseModel.js @@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'; import validator from 'validator'; import _ from 'lodash'; -module.exports = function baseModel (schema, options = {}) { +export default function baseModel (schema, options = {}) { if (schema.options.typeKey !== '$type') { throw new Error('Every schema must use $type as the typeKey, see https://mongoosejs.com/docs/guide.html#typeKey'); } @@ -79,4 +79,4 @@ module.exports = function baseModel (schema, options = {}) { return result; }, {}); }; -}; +} diff --git a/website/server/libs/csvStringify.js b/website/server/libs/csvStringify.js index 8db0280d57..1b497032c6 100644 --- a/website/server/libs/csvStringify.js +++ b/website/server/libs/csvStringify.js @@ -1,6 +1,6 @@ import csvStringify from 'csv-stringify'; -module.exports = (input) => { +export default (input) => { return new Promise((resolve, reject) => { csvStringify(input, (err, output) => { if (err) return reject(err); diff --git a/website/server/libs/forbiddenUsernames.js b/website/server/libs/forbiddenUsernames.js index b39f10032e..a308b3a515 100644 --- a/website/server/libs/forbiddenUsernames.js +++ b/website/server/libs/forbiddenUsernames.js @@ -1,7 +1,7 @@ /* eslint-disable no-multiple-empty-lines */ // This file contains usernames that we do not want users to use, because they give the account more legitimacy and may deceive users. -let bannedWords = [ +const bannedWords = [ 'TESTPLACEHOLDERSWEARWORDHERE', 'TESTPLACEHOLDERSWEARWORDHERE1', @@ -17,4 +17,4 @@ let bannedWords = [ 'gryphon', ]; -module.exports = bannedWords; +export default bannedWords; diff --git a/website/server/libs/guildsAllowingBannedWords.js b/website/server/libs/guildsAllowingBannedWords.js index 203bcc8bca..596183ba37 100644 --- a/website/server/libs/guildsAllowingBannedWords.js +++ b/website/server/libs/guildsAllowingBannedWords.js @@ -8,7 +8,7 @@ // This is for a short-term, partial solution to the need for swearword blocking in guilds. // Later, it will be replaced with customised lists of disallowed words based on the guilds' tags. -let guildsAllowingBannedWords = { +const guildsAllowingBannedWords = { 'f646bc11-e330-482c-982a-843cd018373c': true, // Abuse Victims and Survivors 'b5843474-07e6-4af2-9bd0-b8a00fe7fe52': true, // Alcoholics Anonymous - One Day at a Time! 'd3339c3d-6744-4c17-b9d3-a16bdcfb5d53': true, // Am Yisrael Chai @@ -140,4 +140,4 @@ let guildsAllowingBannedWords = { '14ae3965-0536-4b63-bc55-3dbd6660e3af': true, // Purely Positive Dog Trainers }; -module.exports = guildsAllowingBannedWords; +export default guildsAllowingBannedWords; diff --git a/website/server/libs/inAppPurchases.js b/website/server/libs/inAppPurchases.js index dab5edd1f6..228626f56a 100644 --- a/website/server/libs/inAppPurchases.js +++ b/website/server/libs/inAppPurchases.js @@ -17,7 +17,7 @@ iap.config({ applePassword: nconf.get('ITUNES_SHARED_SECRET'), }); -module.exports = { +export default { setup: util.promisify(iap.setup.bind(iap)), validate: util.promisify(iap.validate.bind(iap)), isValidated: iap.isValidated, diff --git a/website/server/libs/invites/index.js b/website/server/libs/invites/index.js index 2429794e68..2e0d2b37e0 100644 --- a/website/server/libs/invites/index.js +++ b/website/server/libs/invites/index.js @@ -204,7 +204,7 @@ async function inviteByUserName (username, group, inviter, req, res) { return await addInvitationToUser(userToInvite, group, inviter, res); } -module.exports = { +export { inviteByUUID, inviteByEmail, inviteByUserName, diff --git a/website/server/libs/logger.js b/website/server/libs/logger.js index 7da144a7cf..caf7661fed 100644 --- a/website/server/libs/logger.js +++ b/website/server/libs/logger.js @@ -89,4 +89,4 @@ process.on('unhandledRejection', function handlePromiseRejection (reason, p) { loggerInterface.error(reason, 'unhandledPromiseRejection at', p); }); -module.exports = loggerInterface; +export default loggerInterface; diff --git a/website/server/libs/payments/amazon.js b/website/server/libs/payments/amazon.js index 60c9ac5ab9..215b2dc1bb 100644 --- a/website/server/libs/payments/amazon.js +++ b/website/server/libs/payments/amazon.js @@ -344,4 +344,4 @@ api.chargeForAdditionalGroupMember = async function chargeForAdditionalGroupMemb }); }; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/apple.js b/website/server/libs/payments/apple.js index 34241a1881..3c85d512d7 100644 --- a/website/server/libs/payments/apple.js +++ b/website/server/libs/payments/apple.js @@ -269,4 +269,4 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) { }; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/gems.js b/website/server/libs/payments/gems.js index 35d18cc706..1751effcba 100644 --- a/website/server/libs/payments/gems.js +++ b/website/server/libs/payments/gems.js @@ -94,4 +94,4 @@ async function buyGems (data) { await data.user.save(); } -module.exports = { buyGems }; +export { buyGems }; diff --git a/website/server/libs/payments/google.js b/website/server/libs/payments/google.js index 4ded8d034c..eac9b123fc 100644 --- a/website/server/libs/payments/google.js +++ b/website/server/libs/payments/google.js @@ -248,4 +248,4 @@ api.cancelSubscribe = async function cancelSubscribe (user, headers) { }; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js index ff4c9abf97..1bf8398f9a 100644 --- a/website/server/libs/payments/groupPayments.js +++ b/website/server/libs/payments/groupPayments.js @@ -235,7 +235,7 @@ async function cancelGroupSubscriptionForUser (user, group, userWasRemoved = fal } } -module.exports = { +export { addSubscriptionToGroupUsers, addSubToGroupUser, cancelGroupUsersSubscription, diff --git a/website/server/libs/payments/payments.js b/website/server/libs/payments/payments.js index da3e189d70..70f1f109d3 100644 --- a/website/server/libs/payments/payments.js +++ b/website/server/libs/payments/payments.js @@ -36,4 +36,4 @@ api.cancelSubscription = cancelSubscription; api.buyGems = buyGems; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/paypal.js b/website/server/libs/payments/paypal.js index c1a376de1b..d1a445cdc4 100644 --- a/website/server/libs/payments/paypal.js +++ b/website/server/libs/payments/paypal.js @@ -288,4 +288,4 @@ api.ipn = async function ipnApi (options = {}) { } }; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/stripe.js b/website/server/libs/payments/stripe.js index b104a838c5..c8a2684f7c 100644 --- a/website/server/libs/payments/stripe.js +++ b/website/server/libs/payments/stripe.js @@ -235,4 +235,4 @@ api.handleWebhooks = async function handleWebhooks (options, stripeInc) { }; -module.exports = api; +export default api; diff --git a/website/server/libs/payments/stripe/api.js b/website/server/libs/payments/stripe/api.js index 43a99402b1..9b3ff5fc01 100644 --- a/website/server/libs/payments/stripe/api.js +++ b/website/server/libs/payments/stripe/api.js @@ -11,4 +11,4 @@ function getStripeApi () { return stripe; } -module.exports = { getStripeApi, setStripeApi }; +export { getStripeApi, setStripeApi }; diff --git a/website/server/libs/payments/stripe/checkout.js b/website/server/libs/payments/stripe/checkout.js index 8dafa3536c..36851507aa 100644 --- a/website/server/libs/payments/stripe/checkout.js +++ b/website/server/libs/payments/stripe/checkout.js @@ -143,4 +143,4 @@ async function checkout (options, stripeInc) { await applyGemPayment(user, response, gift); } -module.exports = { checkout }; +export { checkout }; diff --git a/website/server/libs/payments/stripe/constants.js b/website/server/libs/payments/stripe/constants.js index 00bddb1e87..9c5afc05b5 100644 --- a/website/server/libs/payments/stripe/constants.js +++ b/website/server/libs/payments/stripe/constants.js @@ -1,4 +1,4 @@ -module.exports = { +export default { // CURRENCY_CODE: 'USD', // SELLER_NOTE: 'Habitica Payment', // SELLER_NOTE_SUBSCRIPTION: 'Habitica Subscription', diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js index ba7305da8b..b209e6b0b6 100644 --- a/website/server/libs/payments/subscriptions.js +++ b/website/server/libs/payments/subscriptions.js @@ -316,7 +316,7 @@ async function cancelSubscription (data) { }); } -module.exports = { +export { createSubscription, cancelSubscription, }; diff --git a/website/server/libs/pushNotifications.js b/website/server/libs/pushNotifications.js index dd15e470b8..16d95678d0 100644 --- a/website/server/libs/pushNotifications.js +++ b/website/server/libs/pushNotifications.js @@ -80,6 +80,6 @@ function sendNotification (user, details = {}) { }); } -module.exports = { +export { sendNotification, }; diff --git a/website/server/libs/routes.js b/website/server/libs/routes.js index 85a7141300..857a9c4244 100644 --- a/website/server/libs/routes.js +++ b/website/server/libs/routes.js @@ -9,7 +9,7 @@ import { let _wrapAsyncFn = fn => (...args) => fn(...args).catch(args[2]); let noop = (req, res, next) => next(); -module.exports.readController = function readController (router, controller, overrides = []) { +export function readController (router, controller, overrides = []) { _.each(controller, (action) => { let {method, url, middlewares = [], handler} = action; @@ -45,17 +45,17 @@ module.exports.readController = function readController (router, controller, ove router[method](url, ...middlewares, fn); }); -}; +} -module.exports.walkControllers = function walkControllers (router, filePath, overrides) { +export function walkControllers (router, filePath, overrides) { fs .readdirSync(filePath) .forEach(fileName => { if (!fs.statSync(filePath + fileName).isFile()) { walkControllers(router, `${filePath}${fileName}/`, overrides); } else if (fileName.match(/\.js$/)) { - let controller = require(filePath + fileName); // eslint-disable-line global-require - module.exports.readController(router, controller, overrides); + let controller = require(filePath + fileName).default; // eslint-disable-line global-require + readController(router, controller, overrides); } }); -}; +} diff --git a/website/server/libs/setupNconf.js b/website/server/libs/setupNconf.js index 3a34681729..d0ff1b04ef 100644 --- a/website/server/libs/setupNconf.js +++ b/website/server/libs/setupNconf.js @@ -4,7 +4,7 @@ const { join, resolve } = require('path'); const PATH_TO_CONFIG = join(resolve(__dirname, '../../../config.json')); -module.exports = function setupNconf (file) { +export default function setupNconf (file) { let configFile = file || PATH_TO_CONFIG; nconf @@ -15,4 +15,4 @@ module.exports = function setupNconf (file) { nconf.set('IS_PROD', nconf.get('NODE_ENV') === 'production'); nconf.set('IS_DEV', nconf.get('NODE_ENV') === 'development'); nconf.set('IS_TEST', nconf.get('NODE_ENV') === 'test'); -}; +} diff --git a/website/server/libs/slack.js b/website/server/libs/slack.js index cfc838b420..2ed4c2c6e9 100644 --- a/website/server/libs/slack.js +++ b/website/server/libs/slack.js @@ -282,7 +282,7 @@ function sendSlurNotification ({ }); } -module.exports = { +export { sendFlagNotification, sendInboxFlagNotification, sendSubscriptionNotification, diff --git a/website/server/middlewares/analytics.js b/website/server/middlewares/analytics.js index 2ab8b1fd7d..f493f0ac3d 100644 --- a/website/server/middlewares/analytics.js +++ b/website/server/middlewares/analytics.js @@ -16,8 +16,8 @@ if (nconf.get('IS_PROD')) { service = mockAnalyticsService; } -module.exports = function attachAnalytics (req, res, next) { +export default function attachAnalytics (req, res, next) { res.analytics = service; next(); -}; +} diff --git a/website/server/middlewares/appRoutes.js b/website/server/middlewares/appRoutes.js index 5819c7231d..9e63ca9641 100644 --- a/website/server/middlewares/appRoutes.js +++ b/website/server/middlewares/appRoutes.js @@ -2,7 +2,7 @@ import express from 'express'; import expressValidator from 'express-validator'; import analytics from './analytics'; import setupBody from './setupBody'; -import routes from '../libs/routes'; +import * as routes from '../libs/routes'; import path from 'path'; const API_V3_CONTROLLERS_PATH = path.join(__dirname, '/../controllers/api-v3/'); @@ -51,4 +51,4 @@ routes.walkControllers(v4Router, API_V3_CONTROLLERS_PATH, v4RouterOverrides); routes.walkControllers(v4Router, API_V4_CONTROLLERS_PATH); app.use('/api/v4', v4Router); -module.exports = app; +export default app; diff --git a/website/server/middlewares/cors.js b/website/server/middlewares/cors.js index 3c0452c62c..82845f201d 100644 --- a/website/server/middlewares/cors.js +++ b/website/server/middlewares/cors.js @@ -1,4 +1,4 @@ -module.exports = function corsMiddleware (req, res, next) { +export default function corsMiddleware (req, res, next) { res.set({ 'Access-Control-Allow-Origin': req.header('origin') || '*', 'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE', @@ -6,4 +6,4 @@ module.exports = function corsMiddleware (req, res, next) { }); if (req.method === 'OPTIONS') return res.sendStatus(200); return next(); -}; +} diff --git a/website/server/middlewares/cron.js b/website/server/middlewares/cron.js index 47368dc8fd..1c85af0464 100644 --- a/website/server/middlewares/cron.js +++ b/website/server/middlewares/cron.js @@ -160,10 +160,10 @@ async function cronAsync (req, res) { } } -module.exports = function cronMiddleware (req, res, next) { +export default function cronMiddleware (req, res, next) { cronAsync(req, res) .then(() => { next(); }) .catch(next); -}; +} diff --git a/website/server/middlewares/domain.js b/website/server/middlewares/domain.js index fb5e28d352..83e79588a0 100644 --- a/website/server/middlewares/domain.js +++ b/website/server/middlewares/domain.js @@ -1,6 +1,6 @@ import domainMiddleware from 'domain-middleware'; -module.exports = function implementDomainMiddleware (server, mongoose) { +export default function implementDomainMiddleware (server, mongoose) { return domainMiddleware({ server: { close () { @@ -10,4 +10,4 @@ module.exports = function implementDomainMiddleware (server, mongoose) { }, killTimeout: 10000, }); -}; +} diff --git a/website/server/middlewares/ensureDevelpmentMode.js b/website/server/middlewares/ensureDevelpmentMode.js index c15dde0ea0..30b269d4b3 100644 --- a/website/server/middlewares/ensureDevelpmentMode.js +++ b/website/server/middlewares/ensureDevelpmentMode.js @@ -3,10 +3,10 @@ import { NotFound, } from '../libs/errors'; -module.exports = function ensureDevelpmentMode (req, res, next) { +export default function ensureDevelpmentMode (req, res, next) { if (nconf.get('IS_PROD')) { next(new NotFound()); } else { next(); } -}; +} diff --git a/website/server/middlewares/errorHandler.js b/website/server/middlewares/errorHandler.js index 5b3cdb7390..2b631dfc03 100644 --- a/website/server/middlewares/errorHandler.js +++ b/website/server/middlewares/errorHandler.js @@ -11,7 +11,7 @@ import { omit, } from 'lodash'; -module.exports = function errorHandler (err, req, res, next) { // eslint-disable-line no-unused-vars +export default function errorHandler (err, req, res, next) { // eslint-disable-line no-unused-vars // In case of a CustomError class, use it's data // Otherwise try to identify the type of error (mongoose validation, mongodb unique, ...) // If we can't identify it, respond with a generic 500 error @@ -91,4 +91,4 @@ module.exports = function errorHandler (err, req, res, next) { // eslint-disable // In some occasions like when invalid JSON is supplied `res.respond` might be not yet avalaible, // in this case we use the standard res.status(...).json(...) return res.status(responseErr.httpCode).json(jsonRes); -}; +} diff --git a/website/server/middlewares/index.js b/website/server/middlewares/index.js index 1c5894e469..fbea1f69ba 100644 --- a/website/server/middlewares/index.js +++ b/website/server/middlewares/index.js @@ -37,7 +37,7 @@ const ENABLE_HTTP_AUTH = nconf.get('SITE_HTTP_AUTH_ENABLED') === 'true'; const SESSION_SECRET = nconf.get('SESSION_SECRET'); const TEN_YEARS = 1000 * 60 * 60 * 24 * 365 * 10; -module.exports = function attachMiddlewares (app, server) { +export default function attachMiddlewares (app, server) { app.set('view engine', 'pug'); app.set('views', `${__dirname}/../../views`); @@ -104,4 +104,4 @@ module.exports = function attachMiddlewares (app, server) { // Error handler middleware, define as the last one. app.use(errorHandler); -}; +} diff --git a/website/server/middlewares/maintenanceMode.js b/website/server/middlewares/maintenanceMode.js index d6f314a02e..a26191f99c 100644 --- a/website/server/middlewares/maintenanceMode.js +++ b/website/server/middlewares/maintenanceMode.js @@ -3,7 +3,7 @@ import nconf from 'nconf'; const MAINTENANCE_MODE = nconf.get('MAINTENANCE_MODE'); -module.exports = function maintenanceMode (req, res, next) { +export default function maintenanceMode (req, res, next) { if (MAINTENANCE_MODE !== 'true') return next(); getUserLanguage(req, res, (err) => { @@ -28,4 +28,4 @@ module.exports = function maintenanceMode (req, res, next) { }); } }); -}; +} diff --git a/website/server/middlewares/notFound.js b/website/server/middlewares/notFound.js index adf74bcbd1..6337748817 100644 --- a/website/server/middlewares/notFound.js +++ b/website/server/middlewares/notFound.js @@ -18,7 +18,7 @@ const TOP_LEVEL_ROUTES = [ // handler because they don't have any child route ]; -module.exports = function NotFoundMiddleware (req, res, next) { +export default function NotFoundMiddleware (req, res, next) { const reqUrl = req.originalUrl; const isExistingRoute = TOP_LEVEL_ROUTES.find(routeRoot => { @@ -31,4 +31,4 @@ module.exports = function NotFoundMiddleware (req, res, next) { } else { serveClient(res); } -}; +} diff --git a/website/server/middlewares/response.js b/website/server/middlewares/response.js index 420ba9e529..51d7dc5418 100644 --- a/website/server/middlewares/response.js +++ b/website/server/middlewares/response.js @@ -3,7 +3,7 @@ import { model as UserNotification, } from '../models/userNotification'; -module.exports = function responseHandler (req, res, next) { +export default function responseHandler (req, res, next) { // Only used for successful responses res.respond = function respond (status = 200, data = {}, message) { let user = res.locals && res.locals.user; @@ -26,4 +26,4 @@ module.exports = function responseHandler (req, res, next) { }; next(); -}; +} diff --git a/website/server/middlewares/setupBody.js b/website/server/middlewares/setupBody.js index b3309fb2da..c3a4a17d3c 100644 --- a/website/server/middlewares/setupBody.js +++ b/website/server/middlewares/setupBody.js @@ -1,5 +1,5 @@ // TODO test this middleware -module.exports = function setupBodyMiddleware (req, res, next) { +export default function setupBodyMiddleware (req, res, next) { req.body = req.body || {}; next(); -}; +} diff --git a/website/server/middlewares/static.js b/website/server/middlewares/static.js index 81d391d9a5..dd48a4ff38 100644 --- a/website/server/middlewares/static.js +++ b/website/server/middlewares/static.js @@ -6,7 +6,7 @@ const IS_PROD = nconf.get('IS_PROD'); const MAX_AGE = IS_PROD ? 31536000000 : 0; const BASE_DIR = path.join(__dirname, '/../../..'); -module.exports = function staticMiddleware (expressApp) { +export default function staticMiddleware (expressApp) { // Expose static files for new client expressApp.use('/static/js', express.static(`${BASE_DIR}/dist-client/static/js`, { maxAge: MAX_AGE })); expressApp.use('/static/css', express.static(`${BASE_DIR}/dist-client/static/css`, { maxAge: MAX_AGE })); @@ -20,4 +20,4 @@ module.exports = function staticMiddleware (expressApp) { // Apidoc expressApp.use('/apidoc', express.static(`${BASE_DIR}/apidoc_build`)); -}; +} diff --git a/website/server/middlewares/v1.js b/website/server/middlewares/v1.js index 72371af36c..32b1ea30d0 100644 --- a/website/server/middlewares/v1.js +++ b/website/server/middlewares/v1.js @@ -16,4 +16,4 @@ router.all('*', function deprecatedV1 (req, res, next) { return next(error); }); -module.exports = router; +export default router; diff --git a/website/server/middlewares/v2.js b/website/server/middlewares/v2.js index 3cfbef292a..1b0cde86fb 100644 --- a/website/server/middlewares/v2.js +++ b/website/server/middlewares/v2.js @@ -16,4 +16,4 @@ router.all('*', function deprecatedV2 (req, res, next) { return next(error); }); -module.exports = router; +export default router; diff --git a/website/server/models/coupon.js b/website/server/models/coupon.js index f08a8135eb..1505835a31 100644 --- a/website/server/models/coupon.js +++ b/website/server/models/coupon.js @@ -56,5 +56,4 @@ schema.statics.apply = async function applyCoupon (user, req, code) { await coupon.save(); }; -module.exports.schema = schema; export let model = mongoose.model('Coupon', schema); diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 0445606126..7d36bec72c 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -19,7 +19,7 @@ const Schema = mongoose.Schema; const RESTRICTED_EMAIL_DOMAINS = Object.freeze(['habitica.com', 'habitrpg.com']); // User schema definition -let schema = new Schema({ +export default new Schema({ apiToken: { $type: String, default: shared.uuid, @@ -613,6 +613,4 @@ let schema = new Schema({ strict: true, minimize: false, // So empty objects are returned typeKey: '$type', // So that we can use fields named `type` -}); - -module.exports = schema; +}); \ No newline at end of file diff --git a/website/server/server.js b/website/server/server.js index 6f717f7116..72bcf4ffee 100644 --- a/website/server/server.js +++ b/website/server/server.js @@ -30,4 +30,4 @@ server.listen(app.get('port'), () => { logger.info(`Express server listening on port ${app.get('port')}`); }); -module.exports = server; +export default server;