From 6d8f19c68cb62dd812c86cd221857266a19d687e Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Tue, 29 Dec 2020 12:54:29 +0100 Subject: [PATCH] Misc changes. --- backend/src/js/app.js | 6 +++--- backend/src/js/controller/userCtrl.js | 21 +++++++++++++++++++++ backend/src/resources/application.yml | 6 +++--- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/backend/src/js/app.js b/backend/src/js/app.js index 5b068cb..95050bc 100644 --- a/backend/src/js/app.js +++ b/backend/src/js/app.js @@ -3,14 +3,14 @@ const bodyParser = require('body-parser'); const applicationController = require('./controller/applicationCtrl'); const userController = require('./controller/userCtrl'); -const port = 3000; +const port = 8080; const app = express(); app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.json()); app.use(express.static('backend/public')); -app.use('/apps', applicationController); -app.use('/users', userController); +app.use('/api/apps', applicationController); +app.use('/api/users', userController); app.listen(port, () => console.log('Mock is listening at port ', port, '\n')); \ No newline at end of file diff --git a/backend/src/js/controller/userCtrl.js b/backend/src/js/controller/userCtrl.js index 9a2dc25..be1ac10 100644 --- a/backend/src/js/controller/userCtrl.js +++ b/backend/src/js/controller/userCtrl.js @@ -2,6 +2,11 @@ const router = require('express').Router(); const tokenService = require('../service/tokenService'); const userService = require('../service/userService'); + +const passwordService = require('../service/passwordService'); +const Repository = require('../repository/repository'); +const userRepository = new Repository('users'); + router.post('/login', (request, response) => { const loginRequest = request.body; @@ -17,4 +22,20 @@ router.post('/login', (request, response) => { } }); +router.post('/init', (request, response) => { + userRepository.insert({_id: 'takiguchi', login:'takiguchi', password:passwordService.hashPassword('azer')}, () => { + console.log('ok'); + response.status(200).send(); + }, () => { + console.error('KO'); + response.status(400).send(); + }); +}) + +router.get('/test', (request, response) => { + response.json({ + content: 'Hello world from users controller!' + }); +}); + module.exports = router; \ No newline at end of file diff --git a/backend/src/resources/application.yml b/backend/src/resources/application.yml index c9edc12..135aac4 100644 --- a/backend/src/resources/application.yml +++ b/backend/src/resources/application.yml @@ -1,9 +1,9 @@ mongodb: url: 'localhost' port: 27017 - username: 'god' - password: 'P@ssword' - database: 'admin' + username: 'application_user' + password: 'P@ssword1' + database: 'db_application' security: jwt: secret: 5ubtcCCo7hWBqjNGtzzVKnLT1KxN9uS4D6kRZowCunZAYPmxtKy6mvgoxANe4WqLVfiVI7AZSVqZCtvlSWFwIsnXGH6lxeKG0U8Wu7Kw0jwfFOGLvlO8bXaB