Compare commits

...

34 Commits

Author SHA1 Message Date
Kayne Ruse 39ddd8158a Updated dependencies 2022-07-23 11:48:36 +01:00
Kayne Ruse 50f0996fb7 Updated configure-script.js 2022-06-15 23:38:56 +01:00
Kayne Ruse 89b2b6ed7b Patched a security hole in the validation hooks 2022-06-15 23:33:06 +01:00
Kayne Ruse 8a5957d6b4 Integration test in place 2022-06-11 01:06:48 +01:00
Kayne Ruse 423a4652c1 Chipping away at writing the tests 2022-06-11 00:32:51 +01:00
Kayne Ruse 7f9274eb3f Bumped patch version 2022-06-10 17:25:07 +01:00
Kayne Ruse 4043507e01 Updated dependencies 2022-06-10 17:09:26 +01:00
Kayne Ruse 12fb02484a Fixed usage of fetch API 2022-06-10 17:01:20 +01:00
Kayne Ruse 49179de73b Updated dependencies 2022-05-30 06:49:23 +01:00
Kayne Ruse 89ea67456d Wrote a couple simple tests 2022-03-02 15:35:14 +00:00
Kayne Ruse 46152032bb Added FUNDING.yml 2022-02-13 07:49:06 +11:00
Kayne Ruse 2d92b31272 Dependancy patch 2022-01-27 09:35:06 +11:00
Kayne Ruse f93564931a Updated libraries 2022-01-20 13:45:40 +11:00
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
29 changed files with 7976 additions and 1672 deletions
+4 -1
View File
@@ -29,4 +29,7 @@ DB_LOGGING=
SECRET_ACCESS=access SECRET_ACCESS=access
# Make sure this value is kept secret # Make sure this value is kept secret
SECRET_REFRESH=refresh SECRET_REFRESH=refresh
# Post-signup hook JSON array (MUST include http:// or https://)
HOOK_POST_VALIDATION_ARRAY=
+5
View File
@@ -0,0 +1,5 @@
# These are supported funding model platforms
patreon: krgamestudios
ko_fi: krgamestudios
custom: ["https://www.paypal.com/donate/?hosted_button_id=73Q82T2ZHV8AA"]
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
docker_image: krgamestudios/auth-server docker_image: krgamestudios/auth-server
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
+23
View File
@@ -0,0 +1,23 @@
name: Node.js CI
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
jobs:
build:
name: Run test suites
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- run: npm test
+2 -2
View File
@@ -1,9 +1,9 @@
FROM node:15 FROM node:16
WORKDIR "/app" WORKDIR "/app"
COPY package*.json ./ COPY package*.json ./
COPY . /app
RUN npm install --production RUN npm install --production
COPY . /app
EXPOSE 3200 EXPOSE 3200
USER node USER node
ENTRYPOINT ["bash", "-c"] ENTRYPOINT ["bash", "-c"]
+55 -11
View File
@@ -2,6 +2,8 @@
An API centric auth server. Uses Sequelize and mariaDB by default. An API centric auth server. Uses Sequelize and mariaDB by default.
This server is available via docker hub at krgamestudios/auth-server.
# Setup # 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 and startup.sql. 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.
@@ -20,9 +22,19 @@ Content-Type: application/json
} }
//DOCS: Used for validating the email address above ###
//DOCS: Used for validating the email address specified above
GET /auth/validation?username=example&token=12345678 GET /auth/validation?username=example&token=12345678
//DOCS: If the environment variable HOOK_POST_VALIDATION_ARRAY is set to a JSON array of valid URLs, then the server will send a GET message to each URL with the newly created account's index
//DOCS: The GET requests will have a JWT authorization header
HOOK_POST_VALIDATION_ARRAY=["http://example.com", "http://example2.com"]
GET {HOOK_POST_VALIDATION_ARRAY[i]}?accountIndex={index}
###
//DOCS: Login after validation //DOCS: Login after validation
POST /auth/login POST /auth/login
@@ -33,14 +45,17 @@ Content-Type: application/json
"password": "helloworld" "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", "accessToken": "abcde",
"refreshToken": "fghij" "refreshToken": "fghij"
} }
//DOCS: Replace an expired authToken pair with these values ###
//DOCS: Replace an expired authToken pair with new values
POST /auth/token POST /auth/token
Content-Type: application/json Content-Type: application/json
@@ -48,6 +63,15 @@ Content-Type: application/json
"token": "refreshToken" "token": "refreshToken"
} }
//DOCS: Result
{
"accessToken": "abcde",
"refreshToken": "fghij"
}
###
//DOCS: After this is called, the refresh route will no longer work //DOCS: After this is called, the refresh route will no longer work
DELETE /auth/logout DELETE /auth/logout
@@ -58,22 +82,30 @@ Authorization: Bearer accessToken
} }
###
//DOCS: Retreives the private account data, results vary //DOCS: Retreives the private account data, results vary
GET /auth/account GET /auth/account
Authorization: Bearer accessToken Authorization: Bearer accessToken
//Result
{ ###
"accessToken": "abcde",
"refreshToken": "fghij"
}
//DOCS: Update account data, input varies, but is always JSON //DOCS: Update account data
PATCH /auth/account PATCH /auth/account
Content-Type: application/json Content-Type: application/json
Authorization: Bearer accessToken Authorization: Bearer accessToken
{
"password": "helloworld",
"contact": true
}
###
//DOCS: Sets the timer, account will be deleted after 2 days //DOCS: Sets the timer, account will be deleted after 2 days
DELETE /auth/account DELETE /auth/account
@@ -85,26 +117,38 @@ Content-Type: application/json
} }
###
//DOCS: Send the link to recover a forgotten password //DOCS: Send the link to recover a forgotten password
POST /auth/recover POST /auth/recover
Content-Type: application/json Content-Type: application/json
{ {
"email": "kayneruse@gmail.com" "email": "example@example.com"
} }
###
//DOCS: Redirect the link to recover a password to the front-end //DOCS: Redirect the link to recover a password to the front-end
GET /auth/reset?token=<token> GET /auth/reset?token=<token>
//Result //DOCS: Result
301 -> ${WEB_RESET_ADDRESS}?email=<email>&token=<token> 301 -> ${WEB_RESET_ADDRESS}?email=<email>&token=<token>
###
//DOCS: Resets a password for the given email, correct token is required //DOCS: Resets a password for the given email, correct token is required
PATCH /auth/reset?email=<email>&token=<token> PATCH /auth/reset?email=<email>&token=<token>
{ {
"password": "password" "password": "password"
} }
###
``` ```
+6 -4
View File
@@ -30,11 +30,12 @@ const question = (prompt, def = null) => {
//project configuration //project configuration
const appName = await question('App Name', 'auth'); const appName = await question('App Name', 'auth');
const appWebAddress = await question('Web Addr', `${appName}.example.com`); const appWebAddress = await question('Web Addr', `${appName}.example.com`);
const postValidationHookArray = await question('Post Validation Hook Array', '');
const resetAddress = await question('Reset Addr', `example.com/reset`); const resetAddress = await question('Reset Addr', `example.com/reset`);
const appPort = await question('App Port', '3200'); const appPort = await question('App Port', '3200');
const appDBUser = await question('DB User', appName); 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 dbRootPass = await question('DB Root Pass');
const appMailSMTP = await question('Mail SMTP', 'smtp.example.com'); const appMailSMTP = await question('Mail SMTP', 'smtp.example.com');
@@ -70,6 +71,7 @@ services:
environment: environment:
- WEB_PROTOCOL=https - WEB_PROTOCOL=https
- WEB_ADDRESS=${appWebAddress} - WEB_ADDRESS=${appWebAddress}
- HOOK_POST_VALIDATION_ARRAY=${postValidationHookArray}
- WEB_RESET_ADDRESS=${resetAddress} - WEB_RESET_ADDRESS=${resetAddress}
- WEB_PORT=${appPort} - WEB_PORT=${appPort}
- DB_HOSTNAME=database - DB_HOSTNAME=database
@@ -85,7 +87,7 @@ services:
- ADMIN_DEFAULT_PASSWORD=${appDefaultPass} - ADMIN_DEFAULT_PASSWORD=${appDefaultPass}
- SECRET_ACCESS=${appSecretAccess} - SECRET_ACCESS=${appSecretAccess}
- SECRET_REFRESH=${appSecretRefresh} - SECRET_REFRESH=${appSecretRefresh}
networks: networks:
- app-network - app-network
depends_on: depends_on:
- database - database
@@ -96,7 +98,7 @@ services:
MYSQL_USER: ${appDBUser} MYSQL_USER: ${appDBUser}
MYSQL_PASSWORD: ${appDBPass} MYSQL_PASSWORD: ${appDBPass}
MYSQL_ROOT_PASSWORD: ${dbRootPass} MYSQL_ROOT_PASSWORD: ${dbRootPass}
networks: networks:
- app-network - app-network
volumes: volumes:
- ./mysql:/var/lib/mysql - ./mysql:/var/lib/mysql
@@ -128,7 +130,7 @@ networks:
`; `;
const dockerfile = ` const dockerfile = `
FROM node:15 FROM node:16
WORKDIR "/app" WORKDIR "/app"
COPY package*.json ./ COPY package*.json ./
RUN npm install --production RUN npm install --production
+7192 -1554
View File
File diff suppressed because it is too large Load Diff
+5 -3
View File
@@ -1,12 +1,13 @@
{ {
"name": "auth-server", "name": "auth-server",
"version": "1.4.1", "version": "1.4.14",
"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/*'",
"test": "jest --coverage --collectCoverageFrom=server/**/*.{js,jsx}"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@@ -20,17 +21,18 @@
"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.6.0",
"express": "^4.17.1", "express": "^4.17.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"mariadb": "^2.5.4", "mariadb": "^2.5.4",
"node-cron": "^2.0.3", "node-cron": "^2.0.3",
"node-fetch": "^2.6.6",
"nodemailer": "^6.6.3", "nodemailer": "^6.6.3",
"sequelize": "^6.6.5" "sequelize": "^6.6.5"
}, },
"devDependencies": { "devDependencies": {
"jest": "^27.5.1",
"nodemon": "^2.0.12" "nodemon": "^2.0.12"
} }
} }
+3 -3
View File
@@ -19,12 +19,12 @@ router.post('/recover', require('./password-recover'));
router.get('/reset', require('./password-redirect')); router.get('/reset', require('./password-redirect'));
router.patch('/reset', require('./password-reset')); router.patch('/reset', require('./password-reset'));
//logouts allowed when banned, and when the token itself is invalid
router.delete('/logout', require('./logout'));
//middleware //middleware
router.use(tokenAuth); router.use(tokenAuth);
//logouts allowed when banned, still needs tokens
router.delete('/logout', require('./logout'));
router.use(async (req, res, next) => { router.use(async (req, res, next) => {
const record = await accounts.findOne({ const record = await accounts.findOne({
where: { where: {
+6 -4
View File
@@ -13,7 +13,7 @@ const route = async (req, res) => {
//validate the given details //validate the given details
const validateErr = await validateDetails(req.body); const validateErr = await validateDetails(req.body);
if (validateErr) { if (validateErr) {
return res.status(401).end(validateErr); return res.status(401).send(validateErr);
} }
//get the existing account //get the existing account
@@ -29,6 +29,7 @@ const route = async (req, res) => {
//compare passwords //compare passwords
const compare = utils.promisify(bcrypt.compare); 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) { if (!match) {
@@ -47,11 +48,12 @@ const route = async (req, res) => {
return res.status(403).send('this account has been banned'); return res.status(403).send('this account has been banned');
} }
//generate the JWT //generate the JWTs
const token = tokenGenerate(account.index, account.email, account.username, account.type, account.admin, account.mod); const tokens = tokenGenerate(account.index, account.email, account.username, account.type, account.admin, account.mod);
//finally //finally
res.status(200).json(token); res.status(200).json(tokens);
return null;
}; };
const validateDetails = async (body) => { const validateDetails = async (body) => {
+1 -1
View File
@@ -5,7 +5,7 @@ const route = async (req, res) => {
//verify the recovery record exists //verify the recovery record exists
const record = await recovery.findOne({ const record = await recovery.findOne({
where: { where: {
token: req.query.token token: req.query.token || ''
} }
}); });
+6 -9
View File
@@ -52,9 +52,6 @@ const validateDetails = async (body) => {
return 'Invalid username'; return 'Invalid username';
} }
//check for existing (banned)
//TODO: re-add banned email checks
//check for existing email //check for existing email
const emailRecord = await accounts.findOne({ const emailRecord = await accounts.findOne({
where: { where: {
@@ -107,12 +104,12 @@ const registerPendingSignup = async (body, hash, token) => {
const sendValidationEmail = async (email, username, token) => { const sendValidationEmail = async (email, username, token) => {
const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/validation?username=${username}&token=${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; let transporter, info;
+43 -2
View File
@@ -1,4 +1,6 @@
const { pendingSignups, accounts } = require('../database/models'); const { pendingSignups, accounts } = require('../database/models');
const fetch = require('node-fetch');
const jwt = require('jsonwebtoken');
//auth/validation //auth/validation
const route = async (req, res) => { const route = async (req, res) => {
@@ -19,7 +21,7 @@ const route = async (req, res) => {
} }
//move data to the accounts table //move data to the accounts table
accounts.create({ const account = await accounts.create({
email: info.email, email: info.email,
username: info.username, username: info.username,
hash: info.hash, hash: info.hash,
@@ -29,12 +31,51 @@ const route = async (req, res) => {
//delete the pending signup //delete the pending signup
pendingSignups.destroy({ pendingSignups.destroy({
where: { where: {
username: req.query.username || '' username: info.username || ''
} }
}); });
//finally //finally
res.status(200).send('Validation succeeded!'); res.status(200).send('Validation succeeded!');
//post-validation hook
if (process.env.HOOK_POST_VALIDATION_ARRAY) {
try {
hooks = JSON.parse(process.env.HOOK_POST_VALIDATION_ARRAY);
if (!Array.isArray(hooks)) {
throw 'isArray() check failed';
}
//authenticate the hooks
const bearer = jwt.sign({ type: 'hook authentication' }, process.env.SECRET_ACCESS, { expiresIn: '5m', issuer: 'auth' });
//promise for each given hook
const promises = hooks.map(async hook => {
if (typeof hook != 'string') {
throw 'hook is not a string';
}
const probe = await fetch(`${hook}?accountIndex=${account.index}`, {
method: 'GET',
headers: {
'Authorization': `Bearer ${bearer}`
}
});
if (!probe.ok) {
throw `Could not probe the post validation hook: ${hook}`;
}
//discard the result
});
Promise.all(promises);
}
catch(e) {
console.error('HOOK_POST_VALIDATION_ARRAY is not a valid array of strings in JSON format: ' + e);
}
}
}; };
module.exports = route; module.exports = route;
+1 -1
View File
@@ -3,7 +3,7 @@ const jwt = require('jsonwebtoken');
//middleware to authenticate the JWT token //middleware to authenticate the JWT token
module.exports = (req, res, next) => { module.exports = (req, res, next) => {
const authHeader = req.headers['authorization']; const authHeader = req.headers['authorization'];
const token = authHeader?.split (' ')[1]; //'Bearer token' const token = authHeader?.split(' ')[1]; //'Bearer token'
if (!token) { if (!token) {
return res.status(401).send('No token found'); return res.status(401).send('No token found');
+3 -2
View File
@@ -12,8 +12,9 @@ module.exports = (index, email, username, type, admin, mod) => {
mod, mod,
}; };
const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m' }); //these are strings
const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d' }); const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m', issuer: 'auth' });
const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d', issuer: 'auth' });
tokens.create({ token: refreshToken, email: email }); tokens.create({ token: refreshToken, email: email });
+2 -2
View File
@@ -4,12 +4,12 @@ const { tokens } = require('../database/models');
const generate = require('./token-generate'); const generate = require('./token-generate');
const destroy = require('./token-destroy'); const destroy = require('./token-destroy');
module.exports = (token, callback) => { module.exports = async (token, callback) => {
if (!token) { if (!token) {
return callback(401); return callback(401);
} }
const tokenRecord = tokens.findOne({ const tokenRecord = await tokens.findOne({
where: { where: {
token: token || '' token: token || ''
} }
+117
View File
@@ -0,0 +1,117 @@
describe('POST /auth/login', () => {
beforeEach(() => {
jest.resetModules();
//fix util with jest (used by bcrypt's compare)
jest.doMock('util', () => ({
promisify: f => async () => f()
}));
//mock out bcrypt
jest.doMock('bcryptjs', () => ({
genSalt: async amount => {
expect(amount).toBe(11);
return 'salt';
},
hash: async (password, salt) => {
expect(password).toBe('password');
return 'hashed-password';
},
compare: (lhs, rhs) => {
return lhs === rhs;
}
}));
//mock out jsonwebtoken
jest.doMock('jsonwebtoken', () => ({
sign: (content, secretAccess, opts) => {
return JSON.stringify(content);
},
verify: (token, secretAccess, callback) => {
return callback(null, JSON.parse(token));
},
}));
//mock out the sequelize library
jest.doMock('sequelize', () => {
return {
Op: {
//
}
}
});
//mock out the database object
jest.doMock('../../server/database', () => {
const mSequelize = {
authenticate: jest.fn(),
define: jest.fn(),
};
const actualSequelize = jest.requireActual('sequelize');
return { Sequelize: jest.fn(() => mSequelize), DataTypes: actualSequelize.DataTypes };
});
//mock out the database models
jest.doMock('../../server/database/models', () => ({
accounts: {
findOne: async (config) => { //can't find any (signup state)
expect(config?.where?.email).toBe('email@example.com');
return {
index: 0,
email: config?.where?.email,
username: 'username',
type: 'alpha',
admin: false,
mod: false,
};
},
update: async (values, config) => {
//Do nothing
}
},
tokens: {
create: async (record) => {
//Do nothing
}
}
}));
});
test('Basic valid login attempt', async () => {
//arguments
const req = {
body: {
email: 'email@example.com',
password: 'password',
}
};
const res = {
status: code => {
expect(code).toBe(200);
return {
json: tokens => {
//decode and analyze the JWT payload
const accessToken = JSON.parse(tokens.accessToken);
expect(accessToken.email).toBe('email@example.com');
expect(accessToken.username).toBe('username');
},
send: msg => { throw msg; },
end: () => null
}
}
}
//test
const route = require('../../server/auth/login');
const result = await route(req, res);
expect(result).toBe(null);
});
});
+98
View File
@@ -0,0 +1,98 @@
describe('POST /auth/signup', () => {
beforeEach(() => {
jest.resetModules();
//mock out bcrypt
jest.doMock('bcryptjs', () => ({
genSalt: async amount => {
expect(amount).toBe(11);
return 'salt';
},
hash: async (password, salt) => {
expect(password).toBe('password');
return 'hashed-password';
}
}));
//mock out nodemailer
jest.doMock('nodemailer', () => ({
createTransport: jest.fn(config => {
//TODO: test config?
return { //return a fake transport object
sendMail: async email => {
expect(email.to).toBe('email@example.com');
return { //return a fake info object
accepted: [ email.to ]
}
}
};
}),
}));
//mock out the sequelize library
jest.doMock('sequelize', () => {
return {
Op: {
//
}
}
});
//mock out the database object
jest.doMock('../../server/database', () => {
const mSequelize = {
authenticate: jest.fn(),
define: jest.fn(),
};
const actualSequelize = jest.requireActual('sequelize');
return { Sequelize: jest.fn(() => mSequelize), DataTypes: actualSequelize.DataTypes };
});
//mock out the database models
jest.doMock('../../server/database/models', () => ({
accounts: {
findOne: () => null //can't find any (signup state)
},
pendingSignups: {
upsert: jest.fn(async record => {
expect(record.email).toBe('email@example.com');
expect(record.username).toBe('username');
expect(record.hash).toBe('hashed-password');
expect(record.contact).toBe(true);
//token is a random UUID
})
}
}));
});
test('Basic valid signup attempt', async () => {
//arguments
const req = {
body: {
email: 'email@example.com',
username: 'username',
password: 'password',
contact: true
}
};
const res = {
status: code => {
expect(code).toBe(200);
return {
send: msg => expect(msg).toBe('Validation email sent!'),
end: () => null
}
}
}
//test
const route = require('../../server/auth/signup');
const result = await route(req, res);
expect(result).toBe(null);
});
});
-68
View File
@@ -1,68 +0,0 @@
#Signup
POST https://dev-auth.eggtrainer.com/auth/signup HTTP/1.1
Content-Type: application/json
{
"email": "kayneruse@gmail.com",
"username": "Ratstail91",
"password": "helloworld"
}
###
#Login
POST https://dev-auth.eggtrainer.com/auth/login HTTP/1.1
Content-Type: application/json
{
"email": "kayneruse@gmail.com",
"password": "helloworld"
}
###
#Query data
GET https://dev-auth.eggtrainer.com/auth/account HTTP/1.1
Authorization: Bearer
###
#Logout
DELETE https://dev-auth.eggtrainer.com/auth/logout HTTP/1.1
Authorization: Bearer
{
"token": ""
}
###
#Refresh
POST https://dev-auth.eggtrainer.com/auth/token HTTP/1.1
Content-Type: application/json
{
"token": ""
}
###
#Update account data
PATCH https://dev-auth.eggtrainer.com/auth/update HTTP/1.1
Content-Type: application/json
Authorization: Bearer
{
"contact": "true"
}
###
#Delete account
DELETE https://dev-auth.eggtrainer.com/auth/deletion HTTP/1.1
Authorization: Bearer
Content-Type: application/json
{
"password": "helloworld"
}
+65
View File
@@ -0,0 +1,65 @@
describe('Integration Test Suite', () => {
beforeEach(() => {
jest.resetModules();
//mock dotenv
jest.doMock('dotenv', () => ({
config: () => null
}));
//mock express
jest.doMock('express', () => {
const express = () => ({
identity: 'app',
use: () => null,
get: () => null,
});
express.Router = () => ({
identity: 'Router',
use: () => null,
get: () => null,
post: () => null,
patch: () => null,
delete: () => null,
});
express.json = () => 'json';
return express;
});
//mock http
jest.doMock('http', () => ({
Server: app => {
expect(app.identity).toBe('app');
return {
listen: (port, cb) => cb()
}
}
}));
//mock sequelize
class Seq {
sync() {}
define() {}
static INTEGER() {}
};
jest.doMock('sequelize', () => {
return Seq;
});
//mock node-cron
jest.doMock('node-cron', () => {
return {
schedule: () => null
}
});
});
test('Start The Server', () => {
const serv = require('../server/server');
});
});
+87
View File
@@ -0,0 +1,87 @@
describe('token-auth', () => {
beforeEach(() => {
jest.resetModules();
//mock out jsonwebtoken
jest.doMock('jsonwebtoken', () => ({
verify: (token, secretAccess, callback) => {
if (token != 'invalid') {
expect(token).toBe('testtoken');
return callback(null, { username: 'username' });
} else {
expect(token).toBe('invalid');
return callback('Misc. error');
}
},
}));
});
test('Required Functionality', () => {
const tokenAuth = require('../../server/utilities/token-auth');
const req = {
headers: {
authorization: 'Bearer testtoken'
}
};
const res = {
status: code => {
expect(code).toBe(null);
return msg => { throw msg; };
}
};
tokenAuth(req, res, () => null);
expect(req.user.username).toBe('username');
});
test('Missing Token', () => {
const tokenAuth = require('../../server/utilities/token-auth');
const req = {
headers: {
//
}
};
const res = {
status: code => {
expect(code).toBe(401);
return {
send: msg => {
expect(msg).toBe('No token found');
return null;
}
};
}
};
tokenAuth(req, res, () => null);
});
test('Invalid Token', () => {
const tokenAuth = require('../../server/utilities/token-auth');
const req = {
headers: {
authorization: 'Bearer invalid'
}
};
const res = {
status: code => {
expect(code).toBe(403);
return {
send: msg => {
expect(msg).toBe('Misc. error');
return null;
}
};
}
};
tokenAuth(req, res, () => null);
});
});
@@ -1,4 +1,4 @@
#use this while debugging #use this while debugging
CREATE DATABASE IF NOT EXISTS auth; 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'@'%'; GRANT ALL PRIVILEGES ON auth.* TO 'auth'@'%';
+68
View File
@@ -0,0 +1,68 @@
#Signup
POST https://dev-auth.krgamestudios.com/auth/signup HTTP/1.1
Content-Type: application/json
{
"email": "example@example.com",
"username": "Example",
"password": "helloworld"
}
###
#Login
POST https://dev-auth.krgamestudios.com/auth/login HTTP/1.1
Content-Type: application/json
{
"email": "example@example.com",
"password": "helloworld"
}
###
#Query data
GET https://dev-auth.krgamestudios.com/auth/account HTTP/1.1
Authorization: Bearer
###
#Logout
DELETE https://dev-auth.krgamestudios.com/auth/logout HTTP/1.1
Authorization: Bearer
{
"token": ""
}
###
#Refresh
POST https://dev-auth.krgamestudios.com/auth/token HTTP/1.1
Content-Type: application/json
{
"token": ""
}
###
#Update account data
PATCH https://dev-auth.krgamestudios.com/auth/update HTTP/1.1
Content-Type: application/json
Authorization: Bearer
{
"contact": "true"
}
###
#Delete account
DELETE https://dev-auth.krgamestudios.com/auth/deletion HTTP/1.1
Authorization: Bearer
Content-Type: application/json
{
"password": "helloworld"
}
@@ -3,8 +3,8 @@ POST http://127.0.0.1:3200/auth/signup HTTP/1.1
Content-Type: application/json Content-Type: application/json
{ {
"email": "kayneruse@gmail.com", "email": "example@example.com",
"username": "Ratstail91", "username": "Example",
"password": "helloworld" "password": "helloworld"
} }
@@ -15,7 +15,7 @@ POST http://127.0.0.1:3200/auth/login HTTP/1.1
Content-Type: application/json Content-Type: application/json
{ {
"email": "kayneruse@gmail.com", "email": "example@example.com",
"password": "helloworld" "password": "helloworld"
} }
@@ -66,3 +66,5 @@ Content-Type: application/json
{ {
"password": "helloworld" "password": "helloworld"
} }
###
+53
View File
@@ -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
+124
View File
@@ -0,0 +1,124 @@
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',
'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'
},
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'
},
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;