The profainWords list is also now injected into createaccount.js befo…

…re visiting that page, so no more needing to request that data after loading the page!

src/client/scripts/createaccount.js

@@ -1,6 +1,6 @@
-
-// THIS LINE WILL BE INJECTED by HTMLScriptInjector!
+// THESE LINES WILL BE INJECTED by the HTMLScriptInjector!
 // const reservedUsernames = [...];
+// const profainWords = [...];
 
 const element_usernameInput = document.getElementById('username');
 const element_emailInput = document.getElementById('email');
@@ -249,8 +249,8 @@ function onlyLettersAndNumbers(string) {
 
 // Returns true if bad word is found
 function checkProfanity(string) {
-    for (let i = 0; i < data.profainWords.length; i++) {
-        profanity = data.profainWords[i];
+    for (let i = 0; i < profainWords.length; i++) {
+        profanity = profainWords[i];
         if (string.toLowerCase().includes(profanity)) return true;
     }
     return false;

src/server/controllers/createaccountController.js

@@ -80,6 +80,14 @@ function getReservedUsernames() {
     return reservedUsernames;
 }
 
+/**
+ * Returns the server list of profain words, that aren't allowed to be in usernames.
+ * @returns {string[]} The list of profain words
+ */
+function getProfainWords() {
+    return profainWords;
+}
+
 // Called when create account form submitted
 const createNewMember = async (req, res) => {
     if (!req.body) {
@@ -268,5 +276,6 @@ module.exports = {
     checkUsernameAssociated,
     generateID,
     generateAccount,
-    getReservedUsernames
+    getReservedUsernames,
+    getProfainWords
 };

src/server/utility/HTMLScriptInjector.js

@@ -14,7 +14,7 @@
 const fs = require('fs');
 const path = require('path');
 const glob = require('glob');
-const { getReservedUsernames } = require('../controllers/createaccountController');
+const { getReservedUsernames, getProfainWords } = require('../controllers/createaccountController');
 
 /**
  * A cache object that has file paths for the keys, and for the values-
@@ -145,12 +145,14 @@ function getCachedHTML(htmlFilePath) {
     prepareAndCacheHTML(htmlFilePath, jsFilePath, {string: HTML_callGame_JS_string, injectafter: injectafter_string});
 }
 
-// Inject the reserved usernames into createaccount.html, then SAVE it in /dist!
-// Does using synchronious read and write methods slow down startup?
+// Inject the reserved usernames, and profain words, into createaccount.html, then SAVE it in /dist!
+// Does using synchronious read and write methods slow down startup???? Should asynchronious be used????
 {
     // Retrieve the reserved usernames
     const reservedUsernames = getReservedUsernames();
     const reservedUsernamesJS = `const reservedUsernames = ${JSON.stringify(reservedUsernames)};`
+    const profainWords = getProfainWords();
+    const profainWordsJS = `const profainWords = ${JSON.stringify(profainWords)};`
 
     // Read the HTML file and inject the script tag
     const createAccountScriptFilePath = path.join(__dirname, '..', '..', '..', 'dist', 'scripts', 'createaccount.js');
@@ -162,7 +164,7 @@ function getCachedHTML(htmlFilePath) {
         return;
     }
 
-    const modifiedScript = `// Injected by HTMLScriptInjector\n${reservedUsernamesJS}\n\n${createAccountScript}`;
+    const modifiedScript = `// Injected by HTMLScriptInjector\n${reservedUsernamesJS}\n${profainWordsJS}\n\n${createAccountScript}`;
 
     // Write new script to /dist
     fs.writeFileSync(createAccountScriptFilePath, modifiedScript);