diff --git a/.env.example b/.env.example
index 84d2912..2098fed 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,13 @@
NODE_ENV=dev
APP="Your App"
PORT=3000
+BASE_URI=http://localhost:3000
MONGOURI=mongodb://localhost:27017/yourapp
MONGOTESTURI=mongodb://localhost:27017/test-app
APP_SECRET=somekey
TRANSPORTER_SERVICE=example-gmail
TRANSPORTER_EMAIL=example@email.com
-TRANSPORTER_PASSWORD=gmail-application_password
\ No newline at end of file
+TRANSPORTER_PASSWORD=gmail-application_password
+DEFAULT_ADMIN_NAME=admin
+DEFAULT_ADMIN_EMAIL=example@email.com
+DEFAULT_ADMIN_PASSWORD=password
\ No newline at end of file
diff --git a/README.md b/README.md
index 09a4442..f5c782a 100644
--- a/README.md
+++ b/README.md
@@ -17,16 +17,14 @@
- TRANSPORTER_PASSWORD is password to above email
- if gmail you need to generate special app-password, see for further support: https://support.google.com/mail/answer/185833?hl=en)
-## Changes from original project
+## Changelog
- Fixed deprecation warnings with mongoose usage.
- Updated dependencies to fix vulnerabilities.
- Added email confirmation after registration.
+- Distinguish admin and user.
## TODO
-- Split users and admins to two collections:
- - Rename auth.controller.js to user.controller.js
- - create user.route.js and refactor auth.route.js to contain only this demonstration "/secret" routes
- Integrate Swagger UI documentation
- Write unit tests
\ No newline at end of file
diff --git a/src/config/index.js b/src/config/index.js
index 481b9a8..370aa39 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -2,6 +2,7 @@ require('dotenv').config() // load .env file
module.exports = {
port: process.env.PORT,
+ baseURI: process.env.BASE_URI,
app: process.env.APP,
env: process.env.NODE_ENV,
secret: process.env.APP_SECRET,
@@ -13,5 +14,10 @@ module.exports = {
service: process.env.TRANSPORTER_SERVICE,
email: process.env.TRANSPORTER_EMAIL,
password: process.env.TRANSPORTER_PASSWORD
+ },
+ admin: {
+ name: process.env.DEFAULT_ADMIN_NAME,
+ email: process.env.DEFAULT_ADMIN_EMAIL,
+ password: process.env.DEFAULT_ADMIN_PASSWORD
}
}
diff --git a/src/controllers/admin.controller.js b/src/controllers/admin.controller.js
new file mode 100644
index 0000000..f2fc717
--- /dev/null
+++ b/src/controllers/admin.controller.js
@@ -0,0 +1,29 @@
+'use strict'
+
+const Admin = require('../models/admin.model')
+const jwt = require('jsonwebtoken')
+const config = require('../config')
+const httpStatus = require('http-status')
+const generateToken = require('../models/utils/findAndGenerateToken')
+
+exports.register = async (req, res, next) => {
+ try {
+ const admin = new Admin(req.body)
+ const savedAdmin = await admin.save()
+ res.status(httpStatus.CREATED)
+ res.send(savedAdmin.transform())
+ } catch (error) {
+ return next(Admin.checkDuplicateEmailError(error))
+ }
+}
+
+exports.login = async (req, res, next) => {
+ try {
+ const admin = await generateToken(req.body, 'admin')
+ const payload = { sub: admin.id }
+ const token = jwt.sign(payload, config.secret)
+ return res.json({ message: 'OK', token: token })
+ } catch (error) {
+ next(error)
+ }
+}
diff --git a/src/controllers/auth.controller.js b/src/controllers/auth.controller.js
deleted file mode 100644
index 401cd2d..0000000
--- a/src/controllers/auth.controller.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict'
-
-const User = require('../models/user.model')
-const jwt = require('jsonwebtoken')
-const config = require('../config')
-const httpStatus = require('http-status')
-const uuidv1 = require('uuid/v1')
-
-exports.register = async (req, res, next) => {
- try {
- const activationKey = uuidv1()
- const body = req.body
- body.activationKey = activationKey
- const user = new User(body)
- const savedUser = await user.save()
- res.status(httpStatus.CREATED)
- res.send(savedUser.transform())
- } catch (error) {
- return next(User.checkDuplicateEmailError(error))
- }
-}
-
-exports.login = async (req, res, next) => {
- try {
- const user = await User.findAndGenerateToken(req.body)
- const payload = {sub: user.id}
- const token = jwt.sign(payload, config.secret)
- return res.json({ message: 'OK', token: token })
- } catch (error) {
- next(error)
- }
-}
-
-exports.confirm = async (req, res, next) => {
- try {
- await User.findOneAndUpdate(
- { 'activationKey': req.query.key },
- { 'active': true }
- )
- return res.json({ message: 'OK' })
- } catch (error) {
- next(error)
- }
-}
\ No newline at end of file
diff --git a/src/controllers/user.controller.js b/src/controllers/user.controller.js
new file mode 100644
index 0000000..a7e0298
--- /dev/null
+++ b/src/controllers/user.controller.js
@@ -0,0 +1,115 @@
+'use strict'
+
+const User = require('../models/user.model')
+const jwt = require('jsonwebtoken')
+const config = require('../config')
+const httpStatus = require('http-status')
+const uuidv1 = require('uuid/v1')
+const generateToken = require('../models/utils/findAndGenerateToken')
+const passport = require('../services/passport')
+const bcrypt = require('bcrypt-nodejs')
+const transporter = require('../services/transporter')
+const APIError = require('../utils/APIError')
+
+exports.register = async (req, res, next) => {
+ try {
+ const activationKey = uuidv1()
+ const body = req.body
+ body.activationKey = activationKey
+ const user = new User(body)
+ const savedUser = await user.save()
+ res.status(httpStatus.CREATED)
+ res.send(savedUser.transform())
+ } catch (error) {
+ return next(User.checkDuplicateEmailError(error))
+ }
+}
+
+exports.login = async (req, res, next) => {
+ try {
+ const user = await generateToken(req.body, 'user')
+ const payload = {sub: user.id}
+ const token = jwt.sign(payload, config.secret)
+ return res.json({ message: 'OK', token: token })
+ } catch (error) {
+ next(error)
+ }
+}
+
+exports.update = async (req, res, next) => {
+ try {
+ if (!passport.user || !req.body.password) {
+ res.status(httpStatus.UNAUTHORIZED)
+ return res.send(new APIError(`Password mismatch`, httpStatus.UNAUTHORIZED))
+ }
+
+ const user = await User.findOne({ 'email': passport.user.email }).exec()
+ if (!user.passwordMatches(req.body.password)) {
+ res.status(httpStatus.UNAUTHORIZED)
+ return res.send(new APIError(`Password mismatch`, httpStatus.UNAUTHORIZED))
+ }
+
+ if (req.body.newPassword) req.body.password = bcrypt.hashSync(req.body.newPassword)
+ await User.findOneAndUpdate(
+ { '_id': passport.user._id },
+ { $set: req.body }
+ )
+ return res.json({ message: 'OK' })
+ } catch (error) {
+ next(error)
+ }
+}
+
+exports.confirm = async (req, res, next) => {
+ try {
+ await User.findOneAndUpdate(
+ { 'activationKey': req.query.key },
+ { 'active': true }
+ )
+ return res.json({ message: 'OK' })
+ } catch (error) {
+ next(error)
+ }
+}
+
+exports.reset = {
+ async sendMail (req, res, next) {
+ try {
+ const resetPasswordKey = uuidv1()
+ await User.findOneAndUpdate(
+ { '_id': passport.user._id },
+ { 'resetPasswordKey': resetPasswordKey }
+ )
+ const mailOptions = {
+ from: 'noreply',
+ to: passport.user.email,
+ subject: 'Reset password',
+ html: `Hello user!
Click link to reset your password.
Hello developer!
Feel free to change this template ;).
Hello new user!
Click link to activate your new account.
Hello developer!
Feel free to change this template ;).
Hello new user!
Click link to activate your new account.
Hello developer!
Feel free to change this template ;).