Drop account creation and password reset

Author: Christian Schmidt

.env.example

@@ -1,8 +1,6 @@
 PORT=3000
 HOST=http://localhost:3000
-API_URL=https://api.test.faforever.com
-OAUTH_URL=https://hydra.test.faforever.com
-WP_URL=https://direct.faforever.com
+BASE_DOMAIN=faforever.com
 CALLBACK=auth
 OAUTH_M2M_CLIENT_ID=faf-website-public
 OAUTH_M2M_CLIENT_SECRET=banana

src/backend/AppKernel.js

@@ -45,8 +45,9 @@ class AppKernel {
 
     bootstrapExpress() {
         this.expressApp = express()
-        this.expressApp.locals.discordUrl = 'https://discord.gg/mXahVSKGVb'
-        this.expressApp.locals.forumUrl = 'https://forum.faforever.com/'
+        this.expressApp.locals.discordUrl = appConfig.discordUrl
+        this.expressApp.locals.forumUrl = appConfig.forumUrl
+        this.expressApp.locals.userServiceUrl = appConfig.userServiceUrl
         this.expressApp.locals.clanInvitations = {}
         this.expressApp.use((req, res, next) => {
             res.locals.navLinks = []

src/backend/config/app.js

@@ -1,6 +1,7 @@
 require('dotenv').config()
 
-const oauthUrl = process.env.OAUTH_URL || 'https://hydra.faforever.com'
+const oauthUrl =
+    process.env.OAUTH_URL || `https://hydra.${process.env.BASE_DOMAIN}`
 
 const appConfig = {
     nodeEnv: process.env.NODE_ENV || 'production',
@@ -23,8 +24,15 @@ const appConfig = {
         clientSecret: process.env.OAUTH_M2M_CLIENT_SECRET || 'banana',
         url: oauthUrl,
     },
-    apiUrl: process.env.API_URL || 'https://api.faforever.com',
-    wordpressUrl: process.env.WP_URL || 'https://direct.faforever.com',
+    userServiceUrl:
+        process.env.USER_SERVICE_URL ||
+        `https://user.${process.env.BASE_DOMAIN}`,
+    apiUrl: process.env.API_URL || `https://api.${process.env.BASE_DOMAIN}`,
+    forumUrl:
+        process.env.FORUM_URL || `https://forum.${process.env.BASE_DOMAIN}`,
+    wordpressUrl:
+        process.env.WP_URL || `https://direct.${process.env.BASE_DOMAIN}`,
+    discordUrl: process.env.DISCORD_URL || 'https://discord.gg/mXahVSKGVb',
     extractorInterval: process.env.EXTRACTOR_INTERVAL || 5,
     playerCountInterval: process.env.PLAYER_COUNT_INTERVAL || 15,
     recaptchaKey: process.env.RECAPTCHA_SITE_KEY || 'test',

src/backend/routes/views/account/get/confirmPasswordReset.js

@@ -1,9 +1,6 @@
 const express = require('../../ExpressApp')
 const router = express.Router()
-
-const { query } = require('express-validator')
 const middlewares = require('../middleware')
-const url = require('url')
 
 router.get(
     '/linkGog',
@@ -60,54 +57,12 @@ router.post(
     require('./account/post/changeUsername')
 )
 
-router.get(
-    '/password/confirmReset',
-    [
-        query('token').notEmpty().withMessage('Missing token'),
-        query('username').notEmpty().withMessage('Missing username'),
-    ],
-    require('./account/get/confirmPasswordReset')
-)
-router.post(
-    '/password/confirmReset',
-    require('./account/post/confirmPasswordReset')
-)
-
-router.get(
-    '/requestPasswordReset',
-    require('./account/get/requestPasswordReset')
-)
-router.post(
-    '/requestPasswordReset',
-    require('./account/post/requestPasswordReset')
-)
-
-// still used in other applications (user-service, game-client etc.)
-router.get('/password/reset', (req, res) =>
-    res.redirect('/account/requestPasswordReset')
-)
-router.get('/confirmPasswordReset', (req, res) => {
-    res.redirect(
-        url.format({
-            pathname: '/account/password/confirmReset',
-            query: req.query,
-        })
-    )
-})
-
-router.get('/register', require('./account/get/register'))
-router.post('/register', require('./account/post/register'))
-
-router.get('/activate', require('./account/get/activate'))
-router.post('/activate', require('./account/post/activate'))
-
 router.get('/checkUsername', require('./checkUsername'))
 router.get(
     '/resync',
     middlewares.isAuthenticated(),
     require('./account/get/resync')
 )
-router.get('/create', require('./account/get/createAccount'))
 router.get(
     '/link',
     middlewares.isAuthenticated(),

src/backend/routes/views/account/get/createAccount.js

@@ -149,7 +149,7 @@ html(lang='en')
                             li.navList LOGIN
                 .navContainer.navEnd
                     ul.navItem
-                        a(href='/account/register')
+                        a(href=`${userServiceUrl}/register`)
                             li.navList REGISTER
 
             if appGlobals.loggedInUser