Implement Discord-based registration with Minecraft backed auth and user profiles.

.env.example

@@ -0,0 +1,16 @@
+PORT=8080
+siteAddress=http://localhost:8080
+TZ=Australia/Sydney
+
+discordAPIKey=APIKEY
+discordClientId=CLIENTID
+discordClientSecret=CLIENTSECRET
+apiKey=KEY
+
+sessionCookieSecret=THISISNOTVERYSECRETANDITHINKYOUSHOULDCHANGEIT
+
+databaseHost=database.example.com
+databasePort=3306
+databaseUser=root
+databasePassword=root
+databaseName=zander

.gitignore

@@ -4,6 +4,5 @@ package-lock.json
 sslCert.cert
 sslPrivate.key
 config.json
-package-lock.json
 google.json
 features.json

api/common.js

@@ -1,3 +1,5 @@
+import dotenv from "dotenv";
+dotenv.config();
 import config from "../config.json" assert { type: "json" };
 import fetch from "node-fetch";
 import { readdirSync } from "fs";
@@ -129,7 +131,7 @@ export async function hasPermission(permissionNode, req, res, features) {
     }
 
     if (!hasSpecificPerm(permissionNode, userPermissions)) {
-      res.view("session/noPermission", {
+      return res.view("session/noPermission", {
         pageTitle: `Access Restricted`,
         config: config,
         req: req,
@@ -138,7 +140,6 @@ export async function hasPermission(permissionNode, req, res, features) {
         globalImage: await getGlobalImage(),
         announcementWeb: await getWebAnnouncement(),
       });
-      return false;
     }
     return true;
   }
@@ -170,6 +171,7 @@ export async function postAPIRequest(
       "x-access-token": process.env.apiKey,
     },
   });
+
   const data = await response.json();
 
   console.log(data);
@@ -311,3 +313,8 @@ export async function expandString(string, filter) {
 export function removeHtmlTags(html) {
   return html.replace(/<(?!\/?(a)\b)[^<]*?>/gi, "");
 }
+
+export async function generateVerifyCode() {
+  const code = Math.floor(Math.random() * 900000) + 100000;
+  return code;
+}

api/internal_redirect/announcement.js

@@ -6,6 +6,9 @@ export default function announcementRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/create", async function (req, res) {
     if (!hasPermission("zander.web.announcements", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/announcement/create`,
       req.body,
@@ -21,6 +24,9 @@ export default function announcementRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/edit", async function (req, res) {
     if (!hasPermission("zander.web.announcements", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/announcement/edit`,
       req.body,
@@ -36,6 +42,9 @@ export default function announcementRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/delete", async function (req, res) {
     if (!hasPermission("zander.web.announcements", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/announcement/delete`,
       req.body,

api/internal_redirect/application.js

@@ -6,6 +6,9 @@ export default function applicationRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/create", async function (req, res) {
     if (!hasPermission("zander.web.application", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/application/create`,
       req.body,
@@ -21,6 +24,9 @@ export default function applicationRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/edit", async function (req, res) {
     if (!hasPermission("zander.web.application", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/application/edit`,
       req.body,
@@ -36,6 +42,9 @@ export default function applicationRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/delete", async function (req, res) {
     if (!hasPermission("zander.web.application", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/application/delete`,
       req.body,

api/internal_redirect/server.js

@@ -6,6 +6,9 @@ export default function serverRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/create", async function (req, res) {
     if (!hasPermission("zander.web.server", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/server/create`,
       req.body,
@@ -21,6 +24,9 @@ export default function serverRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/edit", async function (req, res) {
     if (!hasPermission("zander.web.server", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/server/edit`,
       req.body,
@@ -36,6 +42,9 @@ export default function serverRedirectRoute(app, config, lang) {
   app.post(baseEndpoint + "/delete", async function (req, res) {
     if (!hasPermission("zander.web.server", req, res)) return;
 
+    // Add userId to req.body
+    req.body.actioningUser = req.session.user.userId;
+
     postAPIRequest(
       `${process.env.siteAddress}/api/server/delete`,
       req.body,

api/internal_redirect/web.js

@@ -3,15 +3,80 @@ import { postAPIRequest } from "../common";
 export default function webRedirectRoute(app, config, lang) {
   const baseEndpoint = "/redirect/web";
 
-  app.post(baseEndpoint + "/register", async function (req, res) {
-    await postAPIRequest(
-      `${process.env.siteAddress}/api/web/register/create`,
+  app.post(baseEndpoint + "/user/link", async function (req, res) {
+    postAPIRequest(
+      `${process.env.siteAddress}/api/user/link`,
       req.body,
-      `${process.env.siteAddress}/register`,
+      `${process.env.siteAddress}/unregistered`,
       res
     );
 
-    res.redirect(`${process.env.siteAddress}/register`);
+    res.redirect(`${process.env.siteAddress}/`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/user/profile/display", async function (req, res) {    
+    // Add userId to req.body
+    req.body.userId = req.session.user.userId;
+
+    // Make the API request
+    postAPIRequest(
+      `${process.env.siteAddress}/api/user/profile/display`,
+      req.body,
+      `${process.env.siteAddress}/`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/profile/${req.session.user.username}`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/user/profile/interests", async function (req, res) {
+    // Add userId to req.body
+    req.body.userId = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/user/profile/interests`,
+      req.body,
+      `${process.env.siteAddress}/`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/profile/${req.session.user.username}`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/user/profile/about", async function (req, res) {
+    // Add userId to req.body
+    req.body.userId = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/user/profile/about`,
+      req.body,
+      `${process.env.siteAddress}/`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/profile/${req.session.user.username}`);
+
+    return res;
+  });
+
+  app.post(baseEndpoint + "/user/profile/social", async function (req, res) {
+    // Add userId to req.body
+    req.body.userId = req.session.user.userId;
+
+    postAPIRequest(
+      `${process.env.siteAddress}/api/user/profile/social`,
+      req.body,
+      `${process.env.siteAddress}/`,
+      res
+    );
+
+    res.redirect(`${process.env.siteAddress}/profile/${req.session.user.username}`);
 
     return res;
   });

api/routes/announcement.js

@@ -5,7 +5,7 @@ export default function announcementApiRoute(app, config, db, features, lang) {
 
   app.get(baseEndpoint + "/get", async function (req, res) {
     isFeatureEnabled(features.announcements, res, lang);
-    const announcementId = optional(req.query, "announcementId");
+    const announcementId = optional(req.query, "id");
     const announcementType = optional(req.query, "announcementType");
     const enabled = optional(req.query, "enabled");
 

api/routes/application.js

@@ -5,7 +5,7 @@ export default function applicationApiRoute(app, config, db, features, lang) {
 
   app.get(baseEndpoint + "/get", async function (req, res) {
     isFeatureEnabled(features.applications, res, lang);
-    const applicationId = optional(req.query, "applicationId");
+    const applicationId = optional(req.query, "id");
 
     try {
       function getApplications(dbQuery) {

api/routes/discord.js

@@ -1,3 +1,4 @@
+import { updateAudit_lastMinecraftLogin, updateAudit_lastMinecraftMessage } from "../../controllers/auditController";
 import { Webhook } from "discord-webhook-node";
 import { isFeatureEnabled, required } from "../common";
 
@@ -44,6 +45,21 @@ export default function discordApiRoute(
     const server = required(req.body, "server", res);
     const content = required(req.body, "content", res);
 
+    //
+    // Update user profile for auditing
+    //
+    try {
+      updateAudit_lastMinecraftMessage(new Date(), username);
+    } catch (error) {
+      return res.send({
+        success: false,
+        message: `${error}`,
+      });
+    }
+
+    //
+    // Send Discord Message to Log
+    //
     try {
       const networkChatLogHook = new Webhook(
         config.discord.webhooks.networkChatLog
@@ -66,26 +82,44 @@ export default function discordApiRoute(
     isFeatureEnabled(features.discord, res, lang);
     const username = required(req.body, "username", res);
 
-    try {
-      const networkChatLogHook = new Webhook(
-        config.discord.webhooks.networkChatLog
-      );
+    //
+    // Send Discord Message to Log
+    //
+     try {
+       const networkChatLogHook = new Webhook(
+         config.discord.webhooks.networkChatLog
+       );
+
+       networkChatLogHook.send(
+         `:ballot_box_with_check: | \`${username}\` has joined the Network.`
+       );
+     } catch (error) {
+       return res.send({
+         success: false,
+         message: `${error}`,
+       });
+     }
+  });
 
-      networkChatLogHook.send(
-        `:ballot_box_with_check: | \`${username}\` has joined the Network.`
-      );
+  app.post(baseEndpoint + "/leave", async function (req, res) {
+    isFeatureEnabled(features.discord, res, lang);
+    const username = required(req.body, "username", res);
+
+    //
+    // Update user profile for auditing
+    //
+    try {
+      updateAudit_lastMinecraftLogin(new Date(), username);
     } catch (error) {
       return res.send({
         success: false,
         message: `${error}`,
       });
     }
-  });
-
-  app.post(baseEndpoint + "/leave", async function (req, res) {
-    isFeatureEnabled(features.discord, res, lang);
-    const username = required(req.body, "username", res);
 
+    //
+    // Send Discord Message to Log
+    //
     try {
       const networkChatLogHook = new Webhook(
         config.discord.webhooks.networkChatLog

api/routes/index.js

@@ -6,6 +6,7 @@ import sessionApiRoute from "./session";
 import userApiRoute from "./user";
 import webApiRoute from "./web";
 import filterApiRoute from "./filter";
+import rankApiRoute from "./ranks";
 
 export default (app, client, moment, config, db, features, lang) => {
   announcementApiRoute(app, config, db, features, lang);
@@ -15,6 +16,7 @@ export default (app, client, moment, config, db, features, lang) => {
   sessionApiRoute(app, config, db, features, lang);
   userApiRoute(app, config, db, features, lang);
   webApiRoute(app, config, db, features, lang);
+  rankApiRoute(app, config, db, features, lang);
   filterApiRoute(app, config, db, features, lang);
 
   app.get("/api/heartbeat", async function (req, res) {