Use dotenv

README.md

@@ -95,10 +95,6 @@ To be a bit more specific:
 5. Lastly, you'll need a route somewhere to catch redirections and tokens from Accownt after each successful login. You set this already in your config.
 6. Optionally, you can also add a link somewhere that takes _authenticated_ users to Accownt so they can modify their account information, like their password or 2FA.
 
-## Docker
-
-Docker support is currently being added. You should use the Dockerfiles within the server and web directories to run containers using the .env files. See the docker-compose.yml for a (development environment) example.
-
 # Screenshots
 
 <img src="https://i.imgur.com/eoN4kg1.png" alt="Login screenshot" height="400px" />

package.json

@@ -1,6 +1,6 @@
 {
   "name": "accownt",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-alpha.3",
   "description": "Dead simple user account system so easy a cow could do it.",
   "main": "index.js",
   "bin": {
@@ -10,8 +10,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "accownt-server": "6.0.0-alpha.2",
-    "accownt-web": "6.0.0-alpha.2"
+    "accownt-server": "6.0.0-alpha.3",
+    "accownt-web": "6.0.0-alpha.3"
   },
   "prettier": {
     "singleQuote": true

server/app.ts

@@ -1,5 +1,8 @@
 import 'app-module-path/register';
+import { config } from 'dotenv';
+config();
 import 'enve';
+
 import { verifyRequestJWT } from 'lib/jwt/verify';
 import * as cookieParser from 'cookie-parser';
 import * as bodyParser from 'body-parser';

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accownt-server",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-alpha.3",
   "description": "Dead simple user account system so easy a cow could do it.",
   "main": "dist/app.js",
   "scripts": {
@@ -24,6 +24,7 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "cookie-parser": "^1.4.3",
+    "dotenv": "^6.2.0",
     "enve": "^1.0.0",
     "express": "^4.16.4",
     "jsonwebtoken": "^8.4.0",
@@ -35,6 +36,7 @@
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",
     "@types/cookie-parser": "^1.4.1",
+    "@types/dotenv": "^6.1.0",
     "@types/jest": "^23.3.14",
     "@types/jsonwebtoken": "^8.3.0",
     "@types/node-persist": "0.0.33",

server/tests.ts

@@ -1,4 +1,7 @@
+import { config } from 'dotenv';
+config();
 import 'enve';
+
 import { finishPasswordlessLogin } from 'lib/login/passwordless/finish';
 import { startPasswordlessLogin } from 'lib/login/passwordless/start';
 import { finishRegistration } from 'lib/register/finish';

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accownt-web",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-alpha.3",
   "description": "Dead simple user account system so easy a cow could do it.",
   "main": "",
   "scripts": {
@@ -17,6 +17,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "axios": "^0.18.0",
+    "dotenv": "^6.2.0",
     "enve": "^1.0.0",
     "react": "^16.8.1",
     "react-dom": "^16.8.1",
@@ -29,6 +30,7 @@
     "@babel/preset-env": "^7.3.1",
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.1.0",
+    "@types/dotenv": "^6.1.0",
     "@types/react": "^16.8.2",
     "@types/react-dom": "^16.8.0",
     "babel-loader": "^8.0.5",

web/webpack.config.js

@@ -1,8 +1,10 @@
+require('dotenv').config();
+require('enve');
+
 const CompressionPlugin = require('compression-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const path = require('path');
-require('enve');
 
 module.exports = {
   mode: process.enve.NODE_ENV,