Bumped version number

Patched a potential crash
Added the TokenProvider as a useful tool
2022-01-15 02:29:46 +00:00 · 2022-01-15 02:28:55 +00:00 · 2021-12-23 14:24:13 +00:00 · 2021-12-23 13:33:58 +00:00 · 2021-12-21 19:37:57 +00:00 · 2021-12-19 16:07:44 +00:00
43 changed files with 1188 additions and 522 deletions
@@ -0,0 +1,10 @@
 .git*
 tools*
 mysql*
 letsencrypt*
 test*
 .env*
 .github*
 LICENSE*
@@ -1,20 +1,32 @@
 WEB_PROTOCOL=http
 WEB_ADDRESS=localhost
 WEB_RESET_ADDRESS=localhost/reset
 WEB_PORT=3200
 DB_HOSTNAME=database
 DB_DATABASE=auth
 DB_USERNAME=auth
-DB_PASSWORD=venusaur
+DB_PASSWORD=charizard
 DB_TIMEZONE=Australia/Sydney
 MAIL_SMTP=smtp.example.com
 MAIL_USERNAME=foobar@example.com
 MAIL_PASSWORD=examplepassword
 MAIL_PHYSICAL=42 Placeholder Ave, Placeholder, 0000, USA
 # Give this a value to generate the default admin account
 ADMIN_DEFAULT_USERNAME=admin
 # Give this a value to generate the default admin account (must be at least 8 characters)
 ADMIN_DEFAULT_PASSWORD=password
 # Select a "TZ database name" that suits your needs: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 DB_TIMEZONE=Australia/Sydney
 # Give this any value to enable database logging (such as "true")
 DB_LOGGING=
 # Make sure this value matches the system that you connect to
 SECRET_ACCESS=access
-SECRET_REFRESH=refresh
+
 # Make sure this value is kept secret
 SECRET_REFRESH=refresh
@@ -26,7 +26,7 @@ jobs:
          docker_image: krgamestudios/auth-server
      - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
@@ -1,5 +1,5 @@
-FROM node:15
+FROM node:16
 WORKDIR "/app"
 COPY package*.json ./
 RUN npm install --production
@@ -2,9 +2,11 @@
 An API centric auth server. Uses Sequelize and mariaDB by default.
 This server is available via docker hub at krgamestudios/auth-server.
 # Setup
-There are multiple ways to run this app - it can run on it's own via `npm start` (for production) or `npm run dev` (for development). it can also run inside docker using `docker-compose up --build` - run `node configure-script.js` to generate docker-compose.yml.
+There are multiple ways to run this app - it can run on it's own via `npm start` (for production) or `npm run dev` (for development). it can also run inside docker using `docker-compose up --build` - run `node configure-script.js` to generate docker-compose.yml and startup.sql.
 # API
@@ -19,9 +21,19 @@ Content-Type: application/json
 	"password": "helloworld"
 }
-//DOCS: Used for validating the email address above
+
 ###
 //DOCS: Used for validating the email address specified above
 GET /auth/validation?username=example&token=12345678
 //DOCS: If the environment variable HOOK_POST_VALIDATION is set to a URL, then the server will send a GET message to that URL with the newly created account's index
 GET https://{HOOK_POST_VALIDATION}?accountIndex={index}
 ###
 //DOCS: Login after validation
 POST /auth/login
 Content-Type: application/json
@@ -31,15 +43,33 @@ Content-Type: application/json
 	"password": "helloworld"
 }
-//Result (access token's value is your authorization key below)
+//DOCS: Result (access token's value is your authorization key below)
 {
 	"accessToken": "abcde",
 	"refreshToken": "fghij"
 }
-//DOCS: Retreives the private account data, results vary
+
-GET /auth/account
+###
-Authorization: Bearer accessToken
+
 //DOCS: Replace an expired authToken pair with new values
 POST /auth/token
 Content-Type: application/json
 {
 	"token": "refreshToken"
 }
 //DOCS: Result
 {
 	"accessToken": "abcde",
 	"refreshToken": "fghij"
 }
 ###
 //DOCS: After this is called, the refresh route will no longer work
 DELETE /auth/logout
@@ -49,27 +79,34 @@ Authorization: Bearer accessToken
 	"token": "refreshToken"
 }
 //Replace an expired authToken pair with these values
 POST /auth/token
 Content-Type: application/json
-{
+###
 	"token": "refreshToken"
 }
 //Result
 {
 	"accessToken": "abcde",
 	"refreshToken": "fghij"
 }
-//DOCS: Update account data, input varies, but is always JSON
+//DOCS: Retreives the private account data, results vary
-PATCH /auth/update
+GET /auth/account
 Authorization: Bearer accessToken
 ###
 //DOCS: Update account data
 PATCH /auth/account
 Content-Type: application/json
 Authorization: Bearer accessToken
 {
 	"password": "helloworld",
 	"contact": true
 }
 ###
 //DOCS: Sets the timer, account will be deleted after 2 days
-DELETE /auth/deletion
+DELETE /auth/account
 Authorization: Bearer accessToken
 Content-Type: application/json
@@ -77,13 +114,39 @@ Content-Type: application/json
 	"password": "helloworld"
 }
-//DOCS: Sets the privilege of the specified user; usable only by admins
+
-DELETE /auth/deletion
+###
-Authorization: Bearer accessToken
+
 //DOCS: Send the link to recover a forgotten password
 POST /auth/recover
 Content-Type: application/json
 {
-	"username": "example",
+	"email": "kayneruse@gmail.com"
 	"privilege: "administrator"
 }
 ###
 //DOCS: Redirect the link to recover a password to the front-end
 GET /auth/reset?token=<token>
 //DOCS: Result
 301 -> ${WEB_RESET_ADDRESS}?email=<email>&token=<token>
 ###
 //DOCS: Resets a password for the given email, correct token is required
 PATCH /auth/reset?email=<email>&token=<token>
 {
 	"password": "password"
 }
 ###
 ```
@@ -30,10 +30,12 @@ const question = (prompt, def = null) => {
 	//project configuration
 	const appName = await question('App Name', 'auth');
 	const appWebAddress = await question('Web Addr', `${appName}.example.com`);
 	const postValidationHook = await question('Post Validation Hook', '');
 	const resetAddress = await question('Reset Addr', `example.com/reset`);
 	const appPort = await question('App Port', '3200');
 	const appDBUser = await question('DB User', appName);
-	const appDBPass = await question('DB Pass', uuid());
+	const appDBPass = await question('DB Pass', 'charizard');
 	const dbRootPass = await question('DB Root Pass');
 	const appMailSMTP = await question('Mail SMTP', 'smtp.example.com');
@@ -69,6 +71,8 @@ services:
    environment:
      - WEB_PROTOCOL=https
      - WEB_ADDRESS=${appWebAddress}
      - HOOK_POST_VALIDATION=${postValidationHook}
      - WEB_RESET_ADDRESS=${resetAddress}
      - WEB_PORT=${appPort}
      - DB_HOSTNAME=database
      - DB_DATABASE=${appName}
@@ -83,7 +87,7 @@ services:
      - ADMIN_DEFAULT_PASSWORD=${appDefaultPass}
      - SECRET_ACCESS=${appSecretAccess}
      - SECRET_REFRESH=${appSecretRefresh}
-    networks: 
+    networks:
      - app-network
    depends_on:
      - database
@@ -94,7 +98,7 @@ services:
      MYSQL_USER: ${appDBUser}
      MYSQL_PASSWORD: ${appDBPass}
      MYSQL_ROOT_PASSWORD: ${dbRootPass}
-    networks: 
+    networks:
      - app-network
    volumes:
      - ./mysql:/var/lib/mysql
@@ -126,7 +130,7 @@ networks:
 `;
 	const dockerfile = `
-FROM node:15
+FROM node:16
 WORKDIR "/app"
 COPY package*.json ./
 RUN npm install --production
@@ -1,26 +1,27 @@
 {
  "name": "auth-server",
-  "version": "1.0.0",
+  "version": "1.4.10",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "version": "1.0.0",
+      "name": "auth-server",
      "version": "1.4.10",
      "license": "ISC",
      "dependencies": {
        "bcryptjs": "^2.4.3",
        "body-parser": "^1.19.0",
        "cors": "^2.8.5",
-        "dotenv": "^8.2.0",
+        "dotenv": "^8.6.0",
        "express": "^4.17.1",
        "jsonwebtoken": "^8.5.1",
-        "mariadb": "^2.5.2",
+        "mariadb": "^2.5.4",
        "node-cron": "^2.0.3",
-        "nodemailer": "^6.5.0",
+        "node-fetch": "^2.6.6",
-        "sequelize": "^6.5.0"
+        "nodemailer": "^6.6.3",
        "sequelize": "^6.6.5"
      },
      "devDependencies": {
-        "nodemon": "^2.0.7"
+        "nodemon": "^2.0.12"
      }
    },
    "node_modules/@sindresorhus/is": {
@@ -45,14 +46,14 @@
      }
    },
    "node_modules/@types/geojson": {
-      "version": "7946.0.7",
+      "version": "7946.0.8",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
-      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ=="
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
    },
    "node_modules/@types/node": {
-      "version": "14.14.31",
+      "version": "14.17.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="
+      "integrity": "sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA=="
    },
    "node_modules/abbrev": {
      "version": "1.1.1",
@@ -73,68 +74,18 @@
      }
    },
    "node_modules/ansi-align": {
-      "version": "3.0.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
      "dev": true,
      "dependencies": {
-        "string-width": "^3.0.0"
+        "string-width": "^4.1.0"
      }
    },
    "node_modules/ansi-align/node_modules/ansi-regex": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
      "dev": true,
      "engines": {
        "node": ">=6"
      }
    },
    "node_modules/ansi-align/node_modules/emoji-regex": {
      "version": "7.0.3",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
      "dev": true
    },
    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
      "dev": true,
      "engines": {
        "node": ">=4"
      }
    },
    "node_modules/ansi-align/node_modules/string-width": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
      "dev": true,
      "dependencies": {
        "emoji-regex": "^7.0.1",
        "is-fullwidth-code-point": "^2.0.0",
        "strip-ansi": "^5.1.0"
      },
      "engines": {
        "node": ">=6"
      }
    },
    "node_modules/ansi-align/node_modules/strip-ansi": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
      "dev": true,
      "dependencies": {
        "ansi-regex": "^4.1.0"
      },
      "engines": {
        "node": ">=6"
      }
    },
    "node_modules/ansi-regex": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
      "dev": true,
      "engines": {
        "node": ">=8"
@@ -161,9 +112,9 @@
      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
    },
    "node_modules/anymatch": {
-      "version": "3.1.1",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
      "dev": true,
      "dependencies": {
        "normalize-path": "^3.0.0",
@@ -179,9 +130,9 @@
      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
    },
    "node_modules/balanced-match": {
-      "version": "1.0.0",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
      "dev": true
    },
    "node_modules/bcryptjs": {
@@ -361,25 +312,24 @@
      }
    },
    "node_modules/chokidar": {
-      "version": "3.5.1",
+      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
      "dev": true,
      "dependencies": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
        "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
+        "glob-parent": "~5.1.2",
        "glob-parent": "~5.1.0",
        "is-binary-path": "~2.1.0",
        "is-glob": "~4.0.1",
        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
      },
      "engines": {
        "node": ">= 8.10.0"
      },
      "optionalDependencies": {
-        "fsevents": "~2.3.1"
+        "fsevents": "~2.3.2"
      }
    },
    "node_modules/ci-info": {
@@ -572,11 +522,11 @@
      }
    },
    "node_modules/dotenv": {
-      "version": "8.2.0",
+      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
      "engines": {
-        "node": ">=8"
+        "node": ">=10"
      }
    },
    "node_modules/dottie": {
@@ -718,9 +668,9 @@
      }
    },
    "node_modules/forwarded": {
-      "version": "0.1.2",
+      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
      "engines": {
        "node": ">= 0.6"
      }
@@ -733,20 +683,6 @@
        "node": ">= 0.6"
      }
    },
    "node_modules/fsevents": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
      "hasInstallScript": true,
      "optional": true,
      "os": [
        "darwin"
      ],
      "engines": {
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
    "node_modules/get-stream": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -760,9 +696,9 @@
      }
    },
    "node_modules/glob-parent": {
-      "version": "5.1.1",
+      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
      "dev": true,
      "dependencies": {
        "is-glob": "^4.0.1"
@@ -889,9 +825,9 @@
      }
    },
    "node_modules/inflection": {
-      "version": "1.12.0",
+      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz",
-      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
+      "integrity": "sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA==",
      "engines": [
        "node >= 0.4.0"
      ]
@@ -1013,9 +949,9 @@
      }
    },
    "node_modules/is-path-inside": {
-      "version": "3.0.2",
+      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
      "dev": true,
      "engines": {
        "node": ">=8"
@@ -1195,14 +1131,14 @@
      }
    },
    "node_modules/mariadb": {
-      "version": "2.5.3",
+      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.5.4.tgz",
-      "integrity": "sha512-9ZbQ1zLqasLCQy6KDcPHtX7EUIMBlQ8p64gNR61+yfpCIWjPDji3aR56LvwbOz1QnQbVgYBOJ4J/pHoFN5MR+w==",
+      "integrity": "sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA==",
      "dependencies": {
        "@types/geojson": "^7946.0.7",
        "@types/node": "^14.14.28",
-        "denque": "^1.4.1",
+        "denque": "^1.5.0",
-        "iconv-lite": "^0.6.2",
+        "iconv-lite": "^0.6.3",
        "long": "^4.0.0",
        "moment-timezone": "^0.5.33",
        "please-upgrade-node": "^3.2.0"
@@ -1212,9 +1148,9 @@
      }
    },
    "node_modules/mariadb/node_modules/iconv-lite": {
-      "version": "0.6.2",
+      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3.0.0"
      },
@@ -1255,19 +1191,19 @@
      }
    },
    "node_modules/mime-db": {
-      "version": "1.46.0",
+      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/mime-types": {
-      "version": "2.1.29",
+      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
      "dependencies": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.48.0"
      },
      "engines": {
        "node": ">= 0.6"
@@ -1345,18 +1281,29 @@
        "node": ">=6.0.0"
      }
    },
    "node_modules/node-fetch": {
      "version": "2.6.6",
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
      "engines": {
        "node": "4.x || >=6.0.0"
      }
    },
    "node_modules/nodemailer": {
-      "version": "6.5.0",
+      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.3.tgz",
-      "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==",
+      "integrity": "sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew==",
      "engines": {
        "node": ">=6.0.0"
      }
    },
    "node_modules/nodemon": {
-      "version": "2.0.7",
+      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz",
-      "integrity": "sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==",
+      "integrity": "sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==",
      "dev": true,
      "hasInstallScript": true,
      "dependencies": {
@@ -1422,9 +1369,9 @@
      }
    },
    "node_modules/normalize-url": {
-      "version": "4.5.0",
+      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
      "dev": true,
      "engines": {
        "node": ">=8"
@@ -1513,9 +1460,9 @@
      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
    },
    "node_modules/picomatch": {
-      "version": "2.2.2",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true,
      "engines": {
        "node": ">=8.6"
@@ -1542,11 +1489,11 @@
      }
    },
    "node_modules/proxy-addr": {
-      "version": "2.0.6",
+      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
      "dependencies": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
        "ipaddr.js": "1.9.1"
      },
      "engines": {
@@ -1627,9 +1574,9 @@
      }
    },
    "node_modules/readdirp": {
-      "version": "3.5.0",
+      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
      "dev": true,
      "dependencies": {
        "picomatch": "^2.2.1"
@@ -1752,13 +1699,13 @@
      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
    },
    "node_modules/sequelize": {
-      "version": "6.5.0",
+      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.6.5.tgz",
-      "integrity": "sha512-owBt8fnzVy8E1OvyCyfCdVk7OOLyPVrBCMEf+CvRReC5oCyo+UqeXCtwaex9L6LM9ifZ1i3TG3sFeM5MgLK0CQ==",
+      "integrity": "sha512-QyRrJrDRiwuiILqTMHUA1yWOPIL12KlfmgZ3hnzQwbMvp2vJ6fzu9bYJQB+qPMosck4mBUggY4Cjoc6Et8FBIQ==",
      "dependencies": {
        "debug": "^4.1.1",
        "dottie": "^2.0.0",
-        "inflection": "1.12.0",
+        "inflection": "1.13.1",
        "lodash": "^4.17.20",
        "moment": "^2.26.0",
        "moment-timezone": "^0.5.31",
@@ -1767,7 +1714,7 @@
        "sequelize-pool": "^6.0.0",
        "toposort-class": "^1.0.1",
        "uuid": "^8.1.0",
-        "validator": "^10.11.0",
+        "validator": "^13.6.0",
        "wkx": "^0.5.0"
      },
      "engines": {
@@ -1803,9 +1750,9 @@
      }
    },
    "node_modules/sequelize/node_modules/debug": {
-      "version": "4.3.1",
+      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
      "dependencies": {
        "ms": "2.1.2"
      },
@@ -1824,9 +1771,9 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
    "node_modules/sequelize/node_modules/semver": {
-      "version": "7.3.4",
+      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
      "dependencies": {
        "lru-cache": "^6.0.0"
      },
@@ -1975,6 +1922,11 @@
        "nodetouch": "bin/nodetouch.js"
      }
    },
    "node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
    },
    "node_modules/type-fest": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -2095,9 +2047,9 @@
      }
    },
    "node_modules/validator": {
-      "version": "10.11.0",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
      "engines": {
        "node": ">= 0.10"
      }
@@ -2110,6 +2062,20 @@
        "node": ">= 0.8"
      }
    },
    "node_modules/webidl-conversions": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
    },
    "node_modules/whatwg-url": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
      "dependencies": {
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
      }
    },
    "node_modules/widest-line": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -2180,14 +2146,14 @@
      }
    },
    "@types/geojson": {
-      "version": "7946.0.7",
+      "version": "7946.0.8",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
-      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ=="
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
    },
    "@types/node": {
-      "version": "14.14.31",
+      "version": "14.17.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.5.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="
+      "integrity": "sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA=="
    },
    "abbrev": {
      "version": "1.1.1",
@@ -2205,58 +2171,18 @@
      }
    },
    "ansi-align": {
-      "version": "3.0.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
      "dev": true,
      "requires": {
-        "string-width": "^3.0.0"
+        "string-width": "^4.1.0"
      },
      "dependencies": {
        "ansi-regex": {
          "version": "4.1.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
          "dev": true
        },
        "emoji-regex": {
          "version": "7.0.3",
          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
          "dev": true
        },
        "is-fullwidth-code-point": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
          "dev": true
        },
        "string-width": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
          "dev": true,
          "requires": {
            "emoji-regex": "^7.0.1",
            "is-fullwidth-code-point": "^2.0.0",
            "strip-ansi": "^5.1.0"
          }
        },
        "strip-ansi": {
          "version": "5.2.0",
          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
          "dev": true,
          "requires": {
            "ansi-regex": "^4.1.0"
          }
        }
      }
    },
    "ansi-regex": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
      "dev": true
    },
    "ansi-styles": {
@@ -2274,9 +2200,9 @@
      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
    },
    "anymatch": {
-      "version": "3.1.1",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
      "dev": true,
      "requires": {
        "normalize-path": "^3.0.0",
@@ -2289,9 +2215,9 @@
      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
    },
    "balanced-match": {
-      "version": "1.0.0",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
      "dev": true
    },
    "bcryptjs": {
@@ -2433,19 +2359,19 @@
      }
    },
    "chokidar": {
-      "version": "3.5.1",
+      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
      "dev": true,
      "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
        "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
+        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.0",
+        "glob-parent": "~5.1.2",
        "is-binary-path": "~2.1.0",
        "is-glob": "~4.0.1",
        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
      }
    },
    "ci-info": {
@@ -2596,9 +2522,9 @@
      }
    },
    "dotenv": {
-      "version": "8.2.0",
+      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
    },
    "dottie": {
      "version": "2.0.2",
@@ -2721,22 +2647,15 @@
      }
    },
    "forwarded": {
-      "version": "0.1.2",
+      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
    },
    "fresh": {
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
    },
    "fsevents": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
      "optional": true
    },
    "get-stream": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -2747,9 +2666,9 @@
      }
    },
    "glob-parent": {
-      "version": "5.1.1",
+      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
      "dev": true,
      "requires": {
        "is-glob": "^4.0.1"
@@ -2846,9 +2765,9 @@
      "dev": true
    },
    "inflection": {
-      "version": "1.12.0",
+      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz",
-      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
+      "integrity": "sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA=="
    },
    "inherits": {
      "version": "2.0.3",
@@ -2934,9 +2853,9 @@
      "dev": true
    },
    "is-path-inside": {
-      "version": "3.0.2",
+      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
      "dev": true
    },
    "is-typedarray": {
@@ -3095,23 +3014,23 @@
      }
    },
    "mariadb": {
-      "version": "2.5.3",
+      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.5.4.tgz",
-      "integrity": "sha512-9ZbQ1zLqasLCQy6KDcPHtX7EUIMBlQ8p64gNR61+yfpCIWjPDji3aR56LvwbOz1QnQbVgYBOJ4J/pHoFN5MR+w==",
+      "integrity": "sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA==",
      "requires": {
        "@types/geojson": "^7946.0.7",
        "@types/node": "^14.14.28",
-        "denque": "^1.4.1",
+        "denque": "^1.5.0",
-        "iconv-lite": "^0.6.2",
+        "iconv-lite": "^0.6.3",
        "long": "^4.0.0",
        "moment-timezone": "^0.5.33",
        "please-upgrade-node": "^3.2.0"
      },
      "dependencies": {
        "iconv-lite": {
-          "version": "0.6.2",
+          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
          "requires": {
            "safer-buffer": ">= 2.1.2 < 3.0.0"
          }
@@ -3139,16 +3058,16 @@
      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
    },
    "mime-db": {
-      "version": "1.46.0",
+      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
    },
    "mime-types": {
-      "version": "2.1.29",
+      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
      "requires": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.48.0"
      }
    },
    "mimic-response": {
@@ -3204,15 +3123,23 @@
        "tz-offset": "0.0.1"
      }
    },
    "node-fetch": {
      "version": "2.6.6",
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
      "requires": {
        "whatwg-url": "^5.0.0"
      }
    },
    "nodemailer": {
-      "version": "6.5.0",
+      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.3.tgz",
-      "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw=="
+      "integrity": "sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew=="
    },
    "nodemon": {
-      "version": "2.0.7",
+      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz",
-      "integrity": "sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA==",
+      "integrity": "sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==",
      "dev": true,
      "requires": {
        "chokidar": "^3.2.2",
@@ -3260,9 +3187,9 @@
      "dev": true
    },
    "normalize-url": {
-      "version": "4.5.0",
+      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
      "dev": true
    },
    "object-assign": {
@@ -3329,9 +3256,9 @@
      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
    },
    "picomatch": {
-      "version": "2.2.2",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true
    },
    "please-upgrade-node": {
@@ -3349,11 +3276,11 @@
      "dev": true
    },
    "proxy-addr": {
-      "version": "2.0.6",
+      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
      "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
        "ipaddr.js": "1.9.1"
      }
    },
@@ -3416,9 +3343,9 @@
      }
    },
    "readdirp": {
-      "version": "3.5.0",
+      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
      "dev": true,
      "requires": {
        "picomatch": "^2.2.1"
@@ -3524,13 +3451,13 @@
      }
    },
    "sequelize": {
-      "version": "6.5.0",
+      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.6.5.tgz",
-      "integrity": "sha512-owBt8fnzVy8E1OvyCyfCdVk7OOLyPVrBCMEf+CvRReC5oCyo+UqeXCtwaex9L6LM9ifZ1i3TG3sFeM5MgLK0CQ==",
+      "integrity": "sha512-QyRrJrDRiwuiILqTMHUA1yWOPIL12KlfmgZ3hnzQwbMvp2vJ6fzu9bYJQB+qPMosck4mBUggY4Cjoc6Et8FBIQ==",
      "requires": {
        "debug": "^4.1.1",
        "dottie": "^2.0.0",
-        "inflection": "1.12.0",
+        "inflection": "1.13.1",
        "lodash": "^4.17.20",
        "moment": "^2.26.0",
        "moment-timezone": "^0.5.31",
@@ -3539,14 +3466,14 @@
        "sequelize-pool": "^6.0.0",
        "toposort-class": "^1.0.1",
        "uuid": "^8.1.0",
-        "validator": "^10.11.0",
+        "validator": "^13.6.0",
        "wkx": "^0.5.0"
      },
      "dependencies": {
        "debug": {
-          "version": "4.3.1",
+          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
          "requires": {
            "ms": "2.1.2"
          }
@@ -3557,9 +3484,9 @@
          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
        },
        "semver": {
-          "version": "7.3.4",
+          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
          "requires": {
            "lru-cache": "^6.0.0"
          }
@@ -3673,6 +3600,11 @@
        "nopt": "~1.0.10"
      }
    },
    "tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
    },
    "type-fest": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -3766,15 +3698,29 @@
      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
    },
    "validator": {
-      "version": "10.11.0",
+      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="
    },
    "vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
    },
    "webidl-conversions": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
    },
    "whatwg-url": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
      "requires": {
        "tr46": "~0.0.3",
        "webidl-conversions": "^3.0.0"
      }
    },
    "widest-line": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -1,36 +1,36 @@
-{
+{
-  "name": "auth-server",
+  "name": "auth-server",
-  "version": "1.0.0",
+  "version": "1.4.10",
-  "description": "An API centric auth server. Uses Sequelize and mariaDB by default.",
+  "description": "An API centric auth server. Uses Sequelize and mariaDB by default.",
-  "main": "server/server.js",
+  "main": "server/server.js",
-  "scripts": {
+  "scripts": {
-    "start": "node server/server.js",
+    "start": "node server/server.js",
-    "dev": "npm run watch:server",
+    "dev": "npm run watch:server",
-    "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'"
+    "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'"
-  },
+  },
-  "repository": {
+  "repository": {
-    "type": "git",
+    "type": "git",
-    "url": "git+https://github.com/krgamestudios/auth-server.git"
+    "url": "git+https://github.com/krgamestudios/auth-server.git"
-  },
+  },
-  "author": "Kayne Ruse",
+  "author": "Kayne Ruse",
-  "license": "ISC",
+  "license": "ISC",
-  "bugs": {
+  "bugs": {
-    "url": "https://github.com/krgamestudios/auth-server/issues"
+    "url": "https://github.com/krgamestudios/auth-server/issues"
-  },
+  },
-  "homepage": "https://github.com/krgamestudios/auth-server#readme",
+  "homepage": "https://github.com/krgamestudios/auth-server#readme",
-  "dependencies": {
+  "dependencies": {
-    "bcryptjs": "^2.4.3",
+    "bcryptjs": "^2.4.3",
-    "body-parser": "^1.19.0",
+    "cors": "^2.8.5",
-    "cors": "^2.8.5",
+    "dotenv": "^8.6.0",
-    "dotenv": "^8.2.0",
+    "express": "^4.17.1",
-    "express": "^4.17.1",
+    "jsonwebtoken": "^8.5.1",
-    "jsonwebtoken": "^8.5.1",
+    "mariadb": "^2.5.4",
-    "mariadb": "^2.5.2",
+    "node-cron": "^2.0.3",
-    "node-cron": "^2.0.3",
+    "node-fetch": "^2.6.6",
-    "nodemailer": "^6.5.0",
+    "nodemailer": "^6.6.3",
-    "sequelize": "^6.5.0"
+    "sequelize": "^6.6.5"
-  },
+  },
-  "devDependencies": {
+  "devDependencies": {
-    "nodemon": "^2.0.7"
+    "nodemon": "^2.0.12"
-  }
+  }
-}
+}
@@ -0,0 +1,37 @@
 const { accounts, tokens } = require('../database/models');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 //admin/banuser
 const route = async (req, res) => {
 	const updated = await accounts.update({
 		banned: true
 	}, {
 		where: {
 			username: {
 				[Op.eq]: req.body.username || ''
 			},
 			admin: {
 				[Op.not]: true
 			},
 			mod: {
 				[Op.not]: true
 			}
 		}
 	});
 	if (!updated[0]) {
 		return res.status(500).send('Failed to set banned status');
 	}
 	//forcibly logout
 	tokens.destroy({
 		where: {
 			email: req.body.email || ''
 		}
 	});
 	res.status(200).end();
 };
 module.exports = route;
@@ -20,18 +20,21 @@ module.exports = async () => {
 	//check for an existing admin account
 	const adminRecord = await accounts.findOne({
 		where: {
-			privilege: 'administrator'
+			admin: true
 		}
 	});
 	if (adminRecord == null) {
 		const webAddress = process.env.WEB_ADDRESS == 'localhost' ? 'example.com' : process.env.WEB_ADDRESS; //can't log in as "localhost"
 		await accounts.create({
-			privilege: 'administrator',
+			email: `${process.env.ADMIN_DEFAULT_USERNAME}@${webAddress}`,
 			email: `${process.env.ADMIN_DEFAULT_USERNAME}@${process.env.WEB_ADDRESS}`,
 			username: `${process.env.ADMIN_DEFAULT_USERNAME}`,
-			hash: await bcrypt.hash(`${process.env.ADMIN_DEFAULT_PASSWORD}`, await bcrypt.genSalt(11))
+			hash: await bcrypt.hash(`${process.env.ADMIN_DEFAULT_PASSWORD}`, await bcrypt.genSalt(11)),
 			type: 'normal',
 			admin: true,
 			mod: true
 		});
-		console.warn(`Created default admin account (email: ${process.env.ADMIN_DEFAULT_USERNAME}@${process.env.WEB_ADDRESS}; password: ${process.env.ADMIN_DEFAULT_PASSWORD})`);
+		console.warn(`Created default admin account (email: ${process.env.ADMIN_DEFAULT_USERNAME}@${webAddress}; password: ${process.env.ADMIN_DEFAULT_PASSWORD})`);
 	}
 };
@@ -0,0 +1,25 @@
 const { accounts } = require('../database/models');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 //admin/admin
 const route = async (req, res) => {
 	const updated = await accounts.update({
 		admin: true,
 		mod: true
 	}, {
 		where: {
 			username: {
 				[Op.eq]: req.body.username || ''
 			}
 		}
 	});
 	if (!updated[0]) {
 		return res.status(500).send('Failed to set admin status');
 	}
 	res.status(200).end();
 };
 module.exports = route;
@@ -0,0 +1,24 @@
 const { accounts } = require('../database/models');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 //admin/mod
 const route = async (req, res) => {
 	const updated = await accounts.update({
 		mod: true
 	}, {
 		where: {
 			username: {
 				[Op.eq]: req.body.username || ''
 			}
 		}
 	});
 	if (!updated[0]) {
 		return res.status(500).send('Failed to set mod status');
 	}
 	res.status(200).end();
 };
 module.exports = route;
@@ -1,3 +1,61 @@
-module.exports = {
+const express = require('express');
-	defaultAccount: require('./default-account')
+const router = express.Router();
-};
+
 const { accounts } = require('../database/models');
 //middleware
 const tokenAuth = require('../utilities/token-auth');
 router.use(tokenAuth);
 //handle ban stuff
 router.use(async (req, res, next) => {
 	const record = await accounts.findOne({
 		where: {
 			email: req.user.email || ''
 		}
 	});
 	if (!record) {
 		return res.status(500).send('Account not found in banning middleware');
 	}
 	if (record.banned) {
 		return res.status(403).send('This account has been banned');
 	}
 	next();
 });
 //handle mod stuff
 router.use((req, res, next) => {
 	//check the user's mod status
 	if (!req.user.mod) {
 		return res.status(401).send('Mods only');
 	}
 	next();
 });
 //routes
 router.post('/banuser', require('./ban-user'));
 //handle admin stuff
 router.use((req, res, next) => {
 	//check the user's admin status
 	if (!req.user.admin) {
 		return res.status(401).send('Admin only');
 	}
 	next();
 });
 require('./default-account')(); //generate the default accouunt
 //basic route management
 router.post('/admin', require('./grant-admin'));
 router.delete('/admin', require('./remove-admin'));
 router.post('/mod', require('./grant-mod'));
 router.delete('/mod', require('./remove-mod'));
 module.exports = router;
@@ -0,0 +1,24 @@
 const { accounts } = require('../database/models');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 //admin/admin
 const route = async (req, res) => {
 	const updated = await accounts.update({
 		admin: false
 	}, {
 		where: {
 			username: {
 				[Op.eq]: req.body.username || ''
 			}
 		}
 	});
 	if (!updated[0]) {
 		return res.status(500).send('Failed to set admin status');
 	}
 	res.status(200).end();
 };
 module.exports = route;
@@ -0,0 +1,25 @@
 const { accounts } = require('../database/models');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 //admin/admin
 const route = async (req, res) => {
 	const updated = await accounts.update({
 		admin: false,
 		mod: false
 	}, {
 		where: {
 			username: {
 				[Op.eq]: req.body.username || ''
 			}
 		}
 	});
 	if (!updated[0]) {
 		return res.status(500).send('Failed to set mod status');
 	}
 	res.status(200).end();
 };
 module.exports = route;
@@ -9,18 +9,26 @@ const { accounts } = require('../database/models');
 //auth/deletion
 const route = async (req, res) => {
 	if (!req.body.password) {
 		return res.status(401).end('Missing password');
 	}
 	const account = await accounts.findOne({
 		where: {
-			id: req.user.id
+			index: req.user.index || ''
 		}
 	});
 	if (!account) {
 		return res.status(401).end('Missing account');
 	}
 	//compare the user's password
 	const compare = utils.promisify(bcrypt.compare);
-	const match = await compare(req.body.password || '', account.hash);
+	const match = await compare(req.body.password, account.hash);
 	if (!match) {
-		return res.status(401).send('incorrect password');
+		return res.status(401).send('Incorrect password');
 	}
 	//set the deletion time (2 days from now)
@@ -30,7 +38,7 @@ const route = async (req, res) => {
 	},
 	{
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
@@ -1,25 +0,0 @@
 const { accounts } = require('../database/models');
 //auth/account/privilege
 const route = async (req, res) => {
 	//check the user's privilege
 	if (req.user.privilege != 'administrator') {
 		return res.status(401).send('Only admins can change privilege');
 	}
 	const updated = await accounts.update({
 		privilege: req.body.privilege
 	}, {
 		where: {
 			username: req.body.username
 		}
 	});
 	if (updated < 1) {
 		return res.status(403).send(`Unknown account`);
 	}
 	return res.status(200).end();
 };
 module.exports = route;
@@ -4,12 +4,12 @@ const { accounts } = require('../database/models');
 const route = async (req, res) => {
 	const account = await accounts.findOne({
 		where: {
-			id: req.user.id
+			index: req.user.index || ''
 		}
 	});
 	if (!account) {
-		return res.status(401).send('Unknown account');
+		return res.status(401).end('Unknown account');
 	}
 	//respond with the private-facing data
@@ -3,20 +3,20 @@ const { accounts } = require('../database/models');
 //auth/update
 const route = async (req, res) => {
-	//generate the password hash
+	if (!req.body.password) {
-	let hash;
+		return res.status(401).end('Missing password');
 	if (req.body.password) {
 		hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
 	}
 	//generate the password hash
 	let hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
 	//update the account
 	await accounts.update({
 		contact: req.body.contact,
 		hash: hash
 	}, {
 		where: {
-			id: req.user.id
+			index: req.user.index
 		}
 	});
@@ -1,6 +1,8 @@
 const express = require('express');
 const router = express.Router();
 const { accounts } = require('../database/models');
 //middleware
 const tokenAuth = require('../utilities/token-auth');
@@ -12,15 +14,38 @@ router.post('/login', require('./login'));
 //refresh token
 router.post('/token', require('./token'));
 //password recover and reset
 router.post('/recover', require('./password-recover'));
 router.get('/reset', require('./password-redirect'));
 router.patch('/reset', require('./password-reset'));
 //logouts allowed when banned, and when the token itself is invalid
 router.delete('/logout', require('./logout'));
 //middleware
 router.use(tokenAuth);
-//basic account management (needs a token)
+router.use(async (req, res, next) => {
-router.delete('/logout', require('./logout'));
+	const record = await accounts.findOne({
-router.get('/account', require('./account'));
+		where: {
-router.patch('/update', require('./update'));
+			email: req.user.email || ''
-router.delete('/deletion', require('./deletion'));
+		}
 	});
-router.patch('/account/privilege', require('./account-privilege'));
+	if (!record) {
 		return res.status(500).send('Account not found in banning middleware');
 	}
 	if (record.banned) {
 		return res.status(403).send('This account has been banned');
 	}
 	next();
 });
 //basic account management (needs a token)
 router.get('/account', require('./account-query'));
 router.patch('/account', require('./account-update'));
 router.delete('/account', require('./account-delete'));
 module.exports = router;
@@ -3,7 +3,7 @@ const utils = require('util');
 const bcrypt = require('bcryptjs');
 const { accounts } = require('../database/models');
-const generate = require('../utilities/token-generate');
+const tokenGenerate = require('../utilities/token-generate');
 //utilities
 const validateEmail = require('../utilities/validate-email');
@@ -13,13 +13,13 @@ const route = async (req, res) => {
 	//validate the given details
 	const validateErr = await validateDetails(req.body);
 	if (validateErr) {
-		return res.status(401).send(validateErr);
+		return res.status(401).end(validateErr);
 	}
 	//get the existing account
 	const account = await accounts.findOne({
 		where: {
-			email: req.body.email
+			email: req.body.email || ''
 		}
 	});
@@ -38,25 +38,35 @@ const route = async (req, res) => {
 	//cancel deletion if any
 	await accounts.update({ deletion: null }, {
 		where: {
-			id: account.id
+			index: account.index
 		}
 	});
 	//reject on banned
 	if (account.banned) {
 		return res.status(403).send('this account has been banned');
 	}
 	//generate the JWT
-	const tokens = generate(account.id, account.username, account.privilege);
+	const token = tokenGenerate(account.index, account.email, account.username, account.type, account.admin, account.mod);
 	//finally
-	res.status(200).json(tokens);
+	res.status(200).json(token);
 };
 const validateDetails = async (body) => {
-	//basic formatting (with an exception for the default admin account)
+	if (!body.email) {
-	if (!validateEmail(body.email) && body.email != `${process.env.ADMIN_DEFAULT_USERNAME}@${process.env.WEB_ADDRESS}`) {
+		return 'Missing email';
 		return 'invalid email';
 	}
-	//check for existing (banned)
+	if (!body.password) {
-	//TODO: restore banning
+		return 'Missing password';
 	}
 	//basic formatting (with an exception for the default admin account)
 	if (!validateEmail(body.email) && body.email != `${process.env.ADMIN_DEFAULT_USERNAME}@${process.env.WEB_ADDRESS}`) {
 		return 'Invalid email';
 	}
 	return null;
 }
@@ -1,8 +1,8 @@
-const destroy = require('../utilities/token-destroy');
+const tokenDestroy = require('../utilities/token-destroy');
 //auth/logout
 const route = (req, res) => {
-	destroy(req.body.token);
+	tokenDestroy(req.body.token);
 	return res.status(200).end();
 };
@@ -0,0 +1,106 @@
 //libraries
 const nodemailer = require('nodemailer');
 const { accounts, recovery } = require('../database/models');
 //utilities
 const uuid = require('../utilities/uuid');
 const validateEmail = require('../utilities/validate-email');
 //auth/recover
 const route = async (req, res) => {
 	//validate details
 	const validateErr = await validateDetails(req.body);
 	if (validateErr) {
 		return res.status(401).end(validateErr);
 	}
 	//recovery token
 	const token = uuid(32);
 	//send the recovery email
 	const emailErr = await sendRecoveryEmail(req.body.email, token);
 	if (emailErr) {
 		return res.status(500).send(emailErr);
 	}
 	//save the token
 	await recovery.upsert({
 		email: req.body.email,
 		token: token
 	});
 	//finally
 	res.status(200).send("Recovery email sent!");
 	return null;
 };
 const validateDetails = async (body) => {
 	//basic formatting
 	if (!validateEmail(body.email)) {
 		return 'Invalid email';
 	}
 	//check for existing email
 	const emailRecord = await accounts.findOne({
 		where: {
 			email: body.email
 		}
 	});
 	if (!emailRecord) {
 		return 'Invalid email';
 	}
 	//OK
 	return null;
 };
 const sendRecoveryEmail = async (email, token) => {
 	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/reset?token=${token}`;
 	const msg = `Hello,
 Please visit the following link to reset your password: ${addr}
 If you did not request a password reset, you can safely ignore this message.
 `;
 	let transporter, info;
 	//what exactly is a transport?
 	try {
 		transporter = nodemailer.createTransport({
 			host: process.env.MAIL_SMTP,
 			port: 465,
 			secure: true,
 			auth: {
 			  user: process.env.MAIL_USERNAME,
 			  pass: process.env.MAIL_PASSWORD
 			},
 		});
 	}
 	catch(e) {
 		return `failed to create a mail transport: ${e}`;
 	}
 	// send mail with defined transport object
 	try {
 		info = await transporter.sendMail({
 			from: `recovery@${process.env.WEB_ADDRESS}`, //WARNING: google overwrites this
 			to: email,
 			subject: 'Password Recovery',
 			text: msg
 		});
 	}
 	catch(e) {
 		return `failed to send validation mail: ${e}`;
 	}
 	if (info.accepted[0] != email) {
 		return 'recovery email failed to send';
 	}
 	return null;
 };
 module.exports = route;
@@ -0,0 +1,21 @@
 const { accounts, recovery } = require('../database/models');
 //auth/reset
 const route = async (req, res) => {
 	//verify the recovery record exists
 	const record = await recovery.findOne({
 		where: {
 			token: req.query.token || ''
 		}
 	});
 	if (!record) {
 		return res.status(401).end('Failed to recover a password');
 	}
 	//redirect to the front-end
 	res.redirect(`${process.env.WEB_PROTOCOL}://${process.env.WEB_RESET_ADDRESS}?email=${record.email}&token=${record.token}`);
 	return null;
 };
 module.exports = route;
@@ -0,0 +1,62 @@
 //libraries
 const bcrypt = require('bcryptjs');
 const { accounts, recovery } = require('../database/models');
 //auth/reset
 const route = async (req, res) => {
 	//validate the given details
 	const validateErr = await validateDetails(req.query, req.body);
 	if (validateErr) {
 		return res.status(401).send(validateErr);
 	}
 	//generate the password hash
 	const hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
 	//update the account data
 	await accounts.update({
 		hash: hash
 	}, {
 		where: {
 			email: req.query.email
 		}
 	})
 	//delete from the recovery table
 	await recovery.destroy({
 		where: {
 			email: req.query.email
 		}
 	});
 	res.status(200).end();
 	return null;
 };
 const validateDetails = async (query, body) => {
 	//verify the recovery record exists
 	const record = await recovery.findOne({
 		where: {
 			email: query.email,
 			token: query.token
 		}
 	});
 	if (!record) {
 		return 'Failed to recover a password';
 	}
 	//validate password
 	if (!body.password) {
 		return 'Missing password';
 	}
 	if (body.password.length < 8) {
 		return 'Password too short';
 	}
 	return null;
 };
 module.exports = route;
@@ -6,7 +6,6 @@ const Op = Sequelize.Op;
 const { accounts, pendingSignups } = require('../database/models');
 //utilities
 const uuid = require('../utilities/uuid');
 const validateEmail = require('../utilities/validate-email');
@@ -46,16 +45,13 @@ const route = async (req, res) => {
 const validateDetails = async (body) => {
 	//basic formatting
 	if (!validateEmail(body.email)) {
-		return 'invalid email';
+		return 'Invalid email';
 	}
 	if (!validateUsername(body.username)) {
-		return 'invalid username';
+		return 'Invalid username';
 	}
 	//check for existing (banned)
 	//TODO: re-add banned email checks
 	//check for existing email
 	const emailRecord = await accounts.findOne({
 		where: {
@@ -64,7 +60,11 @@ const validateDetails = async (body) => {
 	});
 	if (emailRecord) {
-		return 'email already exists';
+		return 'Email already exists';
 	}
 	if (!body.username) {
 		return 'Missing username';
 	}
 	//check for existing username
@@ -75,12 +75,16 @@ const validateDetails = async (body) => {
 	});
 	if (usernameRecord) {
-		return 'username already exists';
+		return 'Username already exists';
 	}
 	//validate password
 	if (!body.password) {
 		return 'Missing password';
 	}
 	if (body.password.length < 8) {
-		return 'password too short';
+		return 'Password too short';
 	}
 	return null;
@@ -100,12 +104,12 @@ const registerPendingSignup = async (body, hash, token) => {
 const sendValidationEmail = async (email, username, token) => {
 	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/validation?username=${username}&token=${token}`;
-	const msg = `Hello ${username}!
+	const msg =
-
+  `Hello ${username}!\n\n` +
-Please visit the following link to validate your account: ${addr}
+  `Please visit the following link to validate your account: ${addr}\n` +
-
+  (process.env.MAIL_PHYSICAL
-You can contact us directly at our physical mailing address here: ${process.env.MAIL_PHYSICAL}
+    ? `\nYou can contact us directly at our physical mailing address here: ${process.env.MAIL_PHYSICAL}\n`
-`;
+    : ``);
 	let transporter, info;
@@ -1,16 +1,16 @@
 const jwt = require('jsonwebtoken');
-const refresh = require('../utilities/token-refresh');
+const tokenRefresh = require('../utilities/token-refresh');
 //auth/token
 module.exports = async (req, res) => {
 	const refreshToken = req.body.token;
-	return refresh(refreshToken, (err, tokens) => {
+	return tokenRefresh(refreshToken, (err, token) => {
 		if (err) {
 			return res.status(err).end();
 		}
-		return res.status(200).send(tokens);
+		return res.status(200).send(token);
 	});
 };
@@ -1,25 +1,26 @@
 const { pendingSignups, accounts } = require('../database/models');
 const fetch = require('node-fetch');
 //auth/validation
 const route = async (req, res) => {
 	//get the existing pending signup
 	const info = await pendingSignups.findOne({
 		where: {
-			username: req.query.username
+			username: req.query.username || ''
 		}
 	});
 	//check the given info
 	if (!info) {
-		return res.status(401).send('validation failed');
+		return res.status(401).send('Validation failed');
 	}
 	if (info.token != req.query.token) {
-		return res.status(401).send('tokens do not match');
+		return res.status(401).send('Tokens do not match');
 	}
 	//move data to the accounts table
-	accounts.create({
+	const account = await accounts.create({
 		email: info.email,
 		username: info.username,
 		hash: info.hash,
@@ -29,12 +30,23 @@ const route = async (req, res) => {
 	//delete the pending signup
 	pendingSignups.destroy({
 		where: {
-			username: req.query.username
+			username: info.username || ''
 		}
 	});
 	//finally
 	res.status(200).send('Validation succeeded!');
 	//post-validation hook
 	if (process.env.HOOK_POST_VALIDATION) {
 		const probe = await fetch(`https://${process.env.HOOK_POST_VALIDATION}?accountIndex=${account.index}`);
 		if (!probe.ok) {
 			console.error('Could not probe the post validation hook');
 		}
 		//discard the result
 	}
 };
 module.exports = route;
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize');
 const sequelize = require('..');
 module.exports = sequelize.define('accounts', {
-	id: {
+	index: {
 		type: Sequelize.INTEGER(11),
 		allowNull: false,
 		autoIncrement: true,
@@ -10,12 +10,6 @@ module.exports = sequelize.define('accounts', {
 		unique: true
 	},
 	privilege: {
 		type: Sequelize.ENUM,
 		values: ['administrator', 'moderator', 'alpha', 'beta', 'gamma', 'normal'],
 		defaultValue: 'normal'
 	},
 	email: {
 		type: 'varchar(320)',
 		unique: true
@@ -28,6 +22,30 @@ module.exports = sequelize.define('accounts', {
 	hash: 'varchar(100)', //for passwords
 	type: {
 		type: Sequelize.ENUM,
 		values: ['normal', 'alpha', 'beta', 'gamma'],
 		defaultValue: 'normal'
 	},
 	admin: {
 		type: Sequelize.BOOLEAN,
 		allowNull: false,
 		defaultValue: false
 	},
 	mod: {
 		type: Sequelize.BOOLEAN,
 		allowNull: false,
 		defaultValue: false
 	},
 	banned: {
 		type: Sequelize.BOOLEAN,
 		allowNull: false,
 		defaultValue: false
 	},
 	contact: {
 		type: Sequelize.BOOLEAN,
 		allowNull: false,
@@ -1,5 +1,6 @@
 module.exports = {
 	tokens: require('./tokens'),
 	accounts: require('./accounts'),
-	pendingSignups: require('./pending-signups')
+	pendingSignups: require('./pending-signups'),
 	recovery: require('./recovery')
 };
@@ -0,0 +1,6 @@
 const sequelize = require('..');
 module.exports = sequelize.define('recovery', {
 	token: 'varchar(320)',
 	email: 'varchar(320)'
 });
@@ -3,4 +3,5 @@ const sequelize = require('..');
 module.exports = sequelize.define('tokens', {
 	token: 'varchar(320)',
 	email: 'varchar(320)'
 });
@@ -1,33 +1,32 @@
-//environment variables
+//environment variables
-require('dotenv').config();
+require('dotenv').config();
-
+
-//create the server
+//create the server
-const express = require('express');
+const express = require('express');
-const app = express();
+const app = express();
-const server = require('http').Server(app);
+const server = require('http').Server(app);
-const bodyParser = require('body-parser');
+const cors = require('cors');
-const cors = require('cors');
+
-
+//config
-//config
+app.use(express.json());
-app.use(bodyParser.json());
+app.use(cors());
-app.use(cors());
+
-
+//database connection
-//database connection
+const database = require('./database');
-const database = require('./database');
+
-
+//access the admin
-const admin = require('./admin');
+app.use('/admin', require('./admin'));
-admin.defaultAccount();
+
-
+//access the auth
-//access the auth
+app.use('/auth', require('./auth'));
-app.use('/auth', require('./auth'));
+
-
+//error on access
-//error on access
+app.get('*', (req, res) => {
-app.get('*', (req, res) => {
+	res.redirect('https://github.com/krgamestudios/auth-server');
-	res.redirect('https://github.com/krgamestudios/auth-server');
+});
-});
+
-
+//startup
-//startup
+server.listen(process.env.WEB_PORT || 3200, async (err) => {
-server.listen(process.env.WEB_PORT || 3200, async (err) => {
+	await database.sync();
-	await database.sync();
+	console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
-	console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
+});
 });
@@ -2,17 +2,20 @@ const jwt = require('jsonwebtoken');
 const { tokens } = require('../database/models');
 //generates a JWT token based on the given arguments
-module.exports = (id, username, privilege) => {
+module.exports = (index, email, username, type, admin, mod) => {
 	const content = {
-		id,
+		index,
 		email,
 		username,
-		privilege
+		type,
 		admin,
 		mod,
 	};
-	const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m' });
+	const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m', issuer: 'auth' });
-	const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d' });
+	const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d', issuer: 'auth' });
-	tokens.create({ token: refreshToken });
+	tokens.create({ token: refreshToken, email: email });
 	return { accessToken, refreshToken };
 };
@@ -4,12 +4,12 @@ const { tokens } = require('../database/models');
 const generate = require('./token-generate');
 const destroy = require('./token-destroy');
-module.exports = (token, callback) => {
+module.exports = async (token, callback) => {
 	if (!token) {
 		return callback(401);
 	}
-	const tokenRecord = tokens.findOne({
+	const tokenRecord = await tokens.findOne({
 		where: {
 			token: token || ''
 		}
@@ -24,7 +24,7 @@ module.exports = (token, callback) => {
 			return callback(403);
 		}
-		const result = generate(user.id, user.username, user.privilege);
+		const result = generate(user.index, user.email, user.username, user.type, user.admin, user.mod);
 		destroy(token);
@@ -6,11 +6,11 @@ module.exports = username => {
 	if (username.length < 8 && username.length > 100) {
 		return false;
 	}
-	
+
 	if (!isAlpha(username)) {
 		return false;
 	}
-	
+
 	return true;
 }
@@ -1,34 +1,34 @@
 #Signup
-POST https://dev-auth.eggtrainer.com/auth/signup HTTP/1.1
+POST https://dev-auth.krgamestudios.com/auth/signup HTTP/1.1
 Content-Type: application/json
 {
-	"email": "kayneruse@gmail.com",
+	"email": "example@example.com",
-	"username": "Ratstail91",
+	"username": "Example",
 	"password": "helloworld"
 }
 ###
 #Login
-POST https://dev-auth.eggtrainer.com/auth/login HTTP/1.1
+POST https://dev-auth.krgamestudios.com/auth/login HTTP/1.1
 Content-Type: application/json
 {
-	"email": "kayneruse@gmail.com",
+	"email": "example@example.com",
 	"password": "helloworld"
 }
 ###
 #Query data
-GET https://dev-auth.eggtrainer.com/auth/account HTTP/1.1
+GET https://dev-auth.krgamestudios.com/auth/account HTTP/1.1
 Authorization: Bearer
 ###
 #Logout
-DELETE https://dev-auth.eggtrainer.com/auth/logout HTTP/1.1
+DELETE https://dev-auth.krgamestudios.com/auth/logout HTTP/1.1
 Authorization: Bearer
 {
@@ -38,7 +38,7 @@ Authorization: Bearer
 ###
 #Refresh
-POST https://dev-auth.eggtrainer.com/auth/token HTTP/1.1
+POST https://dev-auth.krgamestudios.com/auth/token HTTP/1.1
 Content-Type: application/json
 {
@@ -48,7 +48,7 @@ Content-Type: application/json
 ###
 #Update account data
-PATCH https://dev-auth.eggtrainer.com/auth/update HTTP/1.1
+PATCH https://dev-auth.krgamestudios.com/auth/update HTTP/1.1
 Content-Type: application/json
 Authorization: Bearer
@@ -59,7 +59,7 @@ Authorization: Bearer
 ###
 #Delete account
-DELETE https://dev-auth.eggtrainer.com/auth/deletion HTTP/1.1
+DELETE https://dev-auth.krgamestudios.com/auth/deletion HTTP/1.1
 Authorization: Bearer
 Content-Type: application/json
@@ -3,8 +3,8 @@ POST http://127.0.0.1:3200/auth/signup HTTP/1.1
 Content-Type: application/json
 {
-	"email": "kayneruse@gmail.com",
+	"email": "example@example.com",
-	"username": "Ratstail91",
+	"username": "Example",
 	"password": "helloworld"
 }
@@ -15,7 +15,7 @@ POST http://127.0.0.1:3200/auth/login HTTP/1.1
 Content-Type: application/json
 {
-	"email": "kayneruse@gmail.com",
+	"email": "example@example.com",
 	"password": "helloworld"
 }
@@ -66,3 +66,5 @@ Content-Type: application/json
 {
 	"password": "helloworld"
 }
 ###
@@ -1,4 +1,4 @@
 #use this while debugging
 CREATE DATABASE IF NOT EXISTS auth;
-CREATE USER IF NOT EXISTS 'auth'@'%' IDENTIFIED BY 'venusaur';
+CREATE USER IF NOT EXISTS 'auth'@'%' IDENTIFIED BY 'charizard';
 GRANT ALL PRIVILEGES ON auth.* TO 'auth'@'%';
@@ -0,0 +1 @@
 ALTER TABLE `accounts` CHANGE `id` `index` INT( 11 ) NOT NULL AUTO_INCREMENT;
@@ -0,0 +1 @@
 DROP TABLE tokens;
@@ -0,0 +1,53 @@
 # TokenProvider
 The MERN-template utilizes React's `useContext()` hook to share the auth-server's access token, effectively globally. Here is a quick rundown of how it works.
 # Enabling TokenProvider
 To enable the TokenProvider component, wrap your App component with it, like so:
 ```jsx
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './pages/app';
 import TokenProvider from './pages/utilities/token-provider';
 ReactDOM.render(
 	<TokenProvider>
 		<App />
 	</TokenProvider>,
 	document.querySelector('#root')
 );
 ```
 # Accessing The Access Token
 To access the access token from your app, you simply use the `useContext` hook, like so:
 ```jsx
 import React, { useContext } from 'react';
 import { TokenContext } from '../utilities/token-provider';
 const Component = props => {
 	//context
 	const authTokens = useContext(TokenContext);
 	//use the access token
 	console.log(authTokens.accessToken);
 	return <div />;
 };
 export default Component;
 ```
 # Most Useful Features Provided
 The most useful features provided by TokenProvider are:
 * `tokenFetch()`, which wraps the `fetch()` API to ensure that your access token is valid
 * `tokenCallback()`, which passes the authTokens as a parameter to any function passed into it
 * `getPayload()`, which returns the payload of the accessToken (including as "email", "username", "admin", and "mod")
 * `accessToken`, this will be falsy if the user is not logged in
@@ -0,0 +1,127 @@
 import React, { useState, useEffect, createContext } from 'react';
 import decode from 'jwt-decode';
 export const TokenContext = createContext();
 //DOCS: tokenFetch() and tokenCallback() are actually closures here
 const TokenProvider = props => {
 	//state to be used
 	const [accessToken, setAccessToken] = useState('');
 	const [refreshToken, setRefreshToken] = useState('');
 	//make the access and refresh tokens persist between reloads
 	useEffect(() => {
 		setAccessToken(localStorage.getItem("accessToken") || '');
 		setRefreshToken(localStorage.getItem("refreshToken") || '');
 	}, []);
 	//update the stored copies
 	useEffect(() => {
 		localStorage.setItem("accessToken", accessToken);
 		localStorage.setItem("refreshToken", refreshToken);
 	}, [accessToken, refreshToken]);
 	//wrap the default fetch function
 	const tokenFetch = async (url, options) => {
 		//use this?
 		let bearer = accessToken;
 		//if expired (10 minutes, normally)
 		const expired = new Date(decode(accessToken).exp * 1000) < Date.now();
 		if (expired) {
 			//BUGFIX: if logging out, just skip over the refresh token
 			if (url === `${process.env.AUTH_URI}/auth/logout`) {
 				return fetch(url, {
 					method: 'DELETE',
 					headers: {
 						'Content-Type': 'application/json',
 						'Access-Control-Allow-Origin': '*',
 						'Authorization': `Bearer ${bearer}`
 					},
 					body: JSON.stringify({
 						token: refreshToken
 					})
 				});
 			}
 			//ping the auth server for a new token
 			const response = await fetch(`${process.env.AUTH_URI}/auth/token`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',
 					'Access-Control-Allow-Origin': '*'
 				},
 				body: JSON.stringify({
 					token: refreshToken
 				})
 			});
 			//any errors, throw them
 			if (!response.ok) {
 				throw `${response.status}: ${await response.text()}`;
 			}
 			//save the new auth stuff (setting bearer as well)
 			const newAuth = await response.json();
 			setAccessToken(newAuth.accessToken);
 			setRefreshToken(newAuth.refreshToken);
 			bearer = newAuth.accessToken;
 		}
 		//finally, delegate to fetch
 		return fetch(url, {
 			...(options || {}),
 			headers: {
 				...(options || { headers: {} }).headers,
 				'Authorization': `Bearer ${bearer}`
 			}
 		});
 	};
 	//access the refreshed token via callback
 	const tokenCallback = async (cb) => {
 		//if expired (10 minutes, normally)
 		const expired = new Date(decode(accessToken).exp * 1000) < Date.now();
 		if (expired) {
 			//ping the auth server for a new token
 			const response = await fetch(`${process.env.AUTH_URI}/auth/token`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',
 					'Access-Control-Allow-Origin': '*'
 				},
 				body: JSON.stringify({
 					token: refreshToken
 				})
 			});
 			//any errors, throw them
 			if (!response.ok) {
 				throw `${response.status}: ${await response.text()}`;
 			}
 			//save the new auth stuff (setting bearer as well)
 			const newAuth = await response.json();
 			setAccessToken(newAuth.accessToken);
 			setRefreshToken(newAuth.refreshToken);
 			//finally
 			return cb(newAuth.accessToken);
 		} else {
 			return cb(accessToken);
 		}
 	};
 	return (
 		<TokenContext.Provider value={{ accessToken, refreshToken, setAccessToken, setRefreshToken, tokenFetch, tokenCallback, getPayload: () => decode(accessToken) }}>
 			{props.children}
 		</TokenContext.Provider>
 	)
 };
 export default TokenProvider;
Author	SHA1	Message	Date
Kayne Ruse	2542f3f00f	Bumped version number	2022-01-15 02:29:46 +00:00
Kayne Ruse	a112e17f59	Patched a potential crash	2022-01-15 02:28:55 +00:00
Kayne Ruse	7af87824e3	Added the TokenProvider as a useful tool	2021-12-23 14:24:13 +00:00
Kayne Ruse	8b91ff8dd3	Cleaned up tools and tests	2021-12-23 13:33:58 +00:00
Kayne Ruse	0aa1e67be9	Updated README.md	2021-12-21 19:37:57 +00:00
Kayne Ruse	353be4662b	Bumped version number	2021-12-19 16:07:44 +00:00
Kayne Ruse	cc655cd988	Merge remote-tracking branch 'refs/remotes/origin/main'	2021-12-19 16:06:30 +00:00
Kayne Ruse	ec3b14e32b	Removed excess logging	2021-12-19 16:06:23 +00:00
Kayne Ruse	b188c46efd	Merge pull request #9 from MatthewEvans91/remove-address-line omit physical address line from validation email where no physical address provided	2021-12-20 03:04:03 +11:00
Matthew Evans	ece3b0253f	omit physical address line from validation email where no physical address provided	2021-12-18 18:47:44 -07:00
Kayne Ruse	062bc43f5a	BUGFIX: sending account index via post validation hook	2021-12-11 11:54:13 +00:00
Kayne Ruse	cc6b7bd7b4	Fixed an import/require problem	2021-12-11 10:11:56 +00:00
Kayne Ruse	9bdf3925a3	Implemented a post-validation hook	2021-12-11 09:59:57 +00:00
Kayne Ruse	a299bab794	Preparing for Egg Trainer merge	2021-11-18 14:59:30 +00:00
Kayne Ruse	8460d03181	Updated package-lock.json	2021-11-17 06:14:08 +00:00
Kayne Ruse	ae88f3002a	Bumped node to version 16 LTS	2021-11-17 04:43:03 +00:00
Kayne Ruse	f4745084c0	Updated package-lock.json	2021-11-15 22:39:48 +00:00
Kayne Ruse	02387914a8	Updated documentation	2021-08-21 22:45:15 +01:00
Kayne Ruse	0da150f471	Bumped version number	2021-08-13 20:59:44 +10:00
Kayne Ruse	d8e9620ad1	Fixed a logout bug when the access token changes	2021-08-13 20:58:52 +10:00
Kayne Ruse	c1155909be	Patched a refresh issue	2021-08-09 20:23:05 +10:00
Kayne Ruse	4ec55bed10	Bumped version number	2021-07-28 15:43:47 +01:00
Kayne Ruse	b51d22f1a1	SQUASH: I think I got it working	2021-07-29 00:36:20 +10:00
Kayne Ruse	6b3db67a29	Fixed whitespace	2021-07-28 23:19:08 +10:00
Kayne Ruse	81da8ca422	Working on password recovery	2021-07-28 23:02:04 +10:00
Kayne Ruse	72b3babfd8	Reworking JWT authentication	2021-07-28 21:36:04 +10:00
Kayne Ruse	c63e14ddf3	Patched some holes when poking with curl	2021-07-24 20:04:35 +10:00
Kayne Ruse	46ded91c41	Update package.json	2021-07-23 20:41:53 +10:00
Kayne Ruse	1aaa536cc6	Updated .dockerignore	2021-07-23 19:51:07 +10:00
Kayne Ruse	f35a097014	Updated packages	2021-07-23 19:33:58 +10:00
Kayne Ruse	4298486382	Merged private changes	2021-07-23 19:32:56 +10:00
Kayne Ruse	d4f9cf35a5	Updated .dockerignore	2021-07-23 19:12:39 +10:00
Kayne Ruse	9178e892d6	Updated packages	2021-07-15 09:24:37 +10:00
Kayne Ruse	f724ba0f07	Updated packages	2021-04-28 21:28:49 +10:00
Kayne Ruse	768352b804	Hopefully plugged an undefined username hole	2021-04-28 21:00:48 +10:00
Kayne Ruse	e141583f91	Renaming database primary key	2021-04-23 21:20:02 +10:00
Kayne Ruse	8ffa64a71d	Updated modules	2021-04-20 18:50:12 +10:00
Kayne Ruse	0ab5234b5b	Updated .dockerignore	2021-04-16 16:25:14 +10:00
Kayne Ruse	b0444e1517	Added .dockerignore	2021-04-16 13:24:15 +10:00
Kayne Ruse	11c2da6d7a	Tweaked package.json	2021-04-10 04:59:13 +10:00
Kayne Ruse	01d7b67665	Changed default admin account web address	2021-04-07 02:44:49 +10:00
Kayne Ruse	5510bc3f01	Ripped out unneeded stuff	2021-04-07 02:00:17 +10:00
Kayne Ruse	93c8c0f871	Funky config stuff gives me a headache	2021-04-03 03:26:48 +11:00
Kayne Ruse	e34bcb2aa8	Tweaked Dockerfile	2021-04-03 02:34:51 +11:00
Kayne Ruse	646a0293a5	Tweaked Dockerfile	2021-04-03 02:11:14 +11:00
Kayne Ruse	5a83f433b6	Formatting errors	2021-04-03 01:59:16 +11:00
Kayne Ruse	cd7bcd9d11	Working on multiplatform things	2021-04-03 01:42:30 +11:00
Kayne Ruse	b389f078a5	Added docker publishing	2021-04-03 01:07:00 +11:00
Kayne Ruse	547d5dba1c	Implemented permabans	2021-03-28 08:32:28 +11:00
Kayne Ruse	e597974581	Updated admin and mod flag system	2021-03-24 08:22:47 +11:00
Kayne Ruse	f60833ec17	Updated libraries	2021-03-24 01:52:17 +11:00
Kayne Ruse	9ffa45f09d	Each microservice has received a tweak to .envdev, read more This should make it easier to set time zones and enable database logging. Related to krgamestudios/MERN-template#16	2021-03-22 16:43:39 +11:00
Kayne Ruse	b2bf1aaf92	Altered API, read more I moved /auth/account/privilege to /admin/privilege I also fixed PATCH and DELETE on /account	2021-03-14 04:35:03 +11:00
		`@@ -0,0 +1 @@`
							ALTER TABLE `accounts` CHANGE `id` `index` INT( 11 ) NOT NULL AUTO_INCREMENT;