diff --git a/package-lock.json b/package-lock.json index 02ffde5..4725a45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "auth-server", - "version": "1.8.0", + "version": "1.8.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "auth-server", - "version": "1.8.0", + "version": "1.8.1", "license": "ISC", "dependencies": { "bcryptjs": "^2.4.3", diff --git a/package.json b/package.json index 6c3755b..44bb5f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "auth-server", - "version": "1.8.0", + "version": "1.8.1", "description": "An API centric auth server. Uses Sequelize and mariaDB by default.", "main": "server/server.js", "scripts": { diff --git a/server/auth/index.js b/server/auth/index.js index f9e9610..9fd6224 100644 --- a/server/auth/index.js +++ b/server/auth/index.js @@ -11,9 +11,6 @@ router.post('/signup', require('./signup')); router.get('/validation', require('./validation')); 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')); @@ -23,8 +20,6 @@ router.patch('/reset', require('./password-reset')); router.delete('/logout', require('./logout')); //middleware -router.use(tokenAuth); - router.use(async (req, res, next) => { const record = await accounts.findOne({ where: { @@ -43,6 +38,12 @@ router.use(async (req, res, next) => { next(); }); +//refresh token +router.post('/token', require('./token')); + +//authenticate token +router.use(tokenAuth); + //basic account management (needs a token) router.get('/account', require('./account-query')); router.patch('/account', require('./account-update'));