![](/images/userspics/" + response.content + ".png)
"
+ }
+
+
+
+ }
+
+ }
+
+ if(accountname != null) {
+
+
+ fetch('/get', {
+ method: 'POST',
+ redirect: 'follow',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({"request":"fullname", "name": ""})
+ })
+ .then(response => response.json())
+ .then(response => load(response))
+
+ function load(response) {
+ if(response.result == "failed") {
+ content.innerHTML = ' Paramètres du compte
+ +
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/templates/users.html b/public/templates/users.html
new file mode 100644
index 0000000..063511c
--- /dev/null
+++ b/public/templates/users.html
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+Mes informations
+
+
+ Photo de profil :
+ + + +Nom complet (max 18 caractères) :
+Actuel :
+ + +Mot de passe :
+
+
+
+
+
+
+ Mot de passe actuel :
+ +Nouveau mot de passe :
+ + +
+
+
+
+
+
\ No newline at end of file
diff --git a/routes/get.js b/routes/get.js
new file mode 100644
index 0000000..d57be0f
--- /dev/null
+++ b/routes/get.js
@@ -0,0 +1,95 @@
+var express = require('express');
+var router = express.Router();
+var ntr = require("../neutral-functions.js");
+var fs = require("fs")
+var path = require("path")
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+
+ var check = ntr.checkToken(req, res)
+
+
+ if(check == false) {
+
+ res.redirect(302, "/login")
+
+ } else {
+
+
+ res.redirect(302, "/")
+ }
+
+
+});
+
+router.post("/", function(req, res, next) {
+
+ var check = ntr.checkToken(req, res)
+
+ if(check == false) {
+
+ res.send({"result":"failed", "content":"ERROR_TOKEN_NOT_VALID"})
+
+
+ } else {
+
+ if(req.body.request == null | req.body.name == null) {
+
+ if(req.body.request == null) {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_MISSING_FIELDS", "additional": "REQUEST_MISSING"})
+ } else {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_MISSING_FIELDS", "additional": "NAME_MISSING"})
+ }
+
+
+
+ } else {
+ console.log("[Get] - GET[" + req.body.request + '-' + req.body.name + "]")
+ if(req.body.request == "page") {
+
+ try {
+ const file = fs.readFileSync(__dirname.replace("routes", "public" + path.sep + "templates" + path.sep) + path.sep + req.body.name, 'utf-8') ;
+ res.send({"result":"success", "content":file})
+ } catch(error) {
+
+ res.send({"result":"failed", "content":"ERROR_FILE_NOT_EXIST"})
+ }
+
+ } else if(req.body.request == "accountpic") {
+ try {
+ const file = fs.readFileSync(__dirname.replace("routes", "images" + path.sep + "userspics" + path.sep) + path.sep + req.body.name + ".png", 'utf-8') ;
+ res.send({"result":"success", "content":file})
+ } catch(error) {
+
+ res.send({"result":"failed", "content":"ERROR_FILE_NOT_EXIST"})
+ }
+
+ } else if(req.body.request == "username") {
+
+ res.send({"result":"success", "content": ntr.checkToken(req, res)})
+
+
+ } else if(req.body.request == "fullname") {
+
+ res.send({"result":"success", "content": ntr.getFullName(ntr.checkToken(req, res))})
+
+
+ } else {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_NOT_VALID"})
+
+ }
+
+ }
+
+
+
+ }
+
+
+})
+
+module.exports = router;
diff --git a/routes/index.js b/routes/index.js
index ab10364..e85228a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -15,7 +15,7 @@ router.get('/', function(req, res, next) {
} else {
- res.render('index', { title: check });
+ res.render('index', { title: ntr.getFullName(check), username: ntr.getFullName(check), accountpic: 'Gestion des utilisateurs
+ +
+
+
+
+
+
+
+
+
+
+
+ Utilisateurs
+ + +
' });
}
diff --git a/routes/login.js b/routes/login.js
index 37839be..389a614 100644
--- a/routes/login.js
+++ b/routes/login.js
@@ -21,9 +21,6 @@ router.get('/', function(req, res, next) {
res.render('login', {error: ""});
}
-
-
-
});
@@ -51,12 +48,13 @@ router.post("/", function(req, res, next) {
const tokenID = ntr.generateTokenID(bod.username, userData, req, users)
- res.cookie('tokenID' , tokenID)
+ res.cookie('tokenID' , tokenID, { maxAge: 900000000, httpOnly: true })
res.status(202).send({"token":"auth_success"})
} else {
userpassword = null;
res.status(202).send({"token":"auth_failed"})
+
}
diff --git a/routes/set.js b/routes/set.js
new file mode 100644
index 0000000..0835524
--- /dev/null
+++ b/routes/set.js
@@ -0,0 +1,88 @@
+var express = require('express');
+var router = express.Router();
+var path = require("path")
+var fs = require("fs")
+var CryptoJS = require("crypto-js");
+var uuid = require("uuid")
+var ntr = require("../neutral-functions.js")
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+
+
+ var check = ntr.checkToken(req, res)
+
+ if(check != false) {
+
+ res.redirect(302, "/")
+
+ } else {
+
+ res.render('login', {error: ""});
+ }
+
+});
+
+router.post("/", function(req, res, next) {
+
+ var check = ntr.checkToken(req, res)
+
+ if(check == false) {
+
+ res.send({"result":"failed", "content":"ERROR_TOKEN_NOT_VALID"})
+
+
+ } else {
+
+ if(req.body.request == null | req.body.value == null | req.body.additional == null) {
+
+ if(req.body.request == null) {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_MISSING_FIELDS", "additional": "REQUEST_MISSING"})
+ } else if(req.body.value == null){
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_MISSING_FIELDS", "additional": "VALUE_MISSING"})
+ } else {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_MISSING_FIELDS", "additional": "ADDITIONAL_MISSING"})
+
+ }
+
+
+
+ } else {
+ console.log("[Set] - SET[" + req.body.request + '-' + req.body.value + "-" + req.body.additional+ "]")
+
+ if(req.body.request == "password") {
+
+ ntr.changePassword(req, res);
+
+
+
+
+ } else if(req.body.request == "fullname") {
+
+
+
+ ntr.changeFullName(req.body.value, req, res);
+ res.send({"result":"success", "content": "Le nom complet a été changé avec succès.", "additional": req.body.value})
+
+
+ } else {
+
+ res.send({"result":"failed", "content":"ERROR_REQUEST_NOT_VALID"})
+
+ }
+
+ }
+
+
+
+ }
+
+
+})
+
+module.exports = router;
+
+
diff --git a/routes/signout.js b/routes/signout.js
index 25148de..806dd6a 100644
--- a/routes/signout.js
+++ b/routes/signout.js
@@ -1,7 +1,12 @@
var express = require('express');
var router = express.Router();
+var path = require("path")
+var fs = require("fs")
+var CryptoJS = require("crypto-js");
+var uuid = require("uuid")
var ntr = require("../neutral-functions.js")
+
/* GET home page. */
router.get('/', function(req, res, next) {
@@ -15,7 +20,8 @@ router.get('/', function(req, res, next) {
} else {
res.clearCookie('tokenID')
- res.send({"success":true})
+ res.redirect(302, "/login")
+
}
diff --git a/routes/upload.js b/routes/upload.js
new file mode 100644
index 0000000..1126fb8
--- /dev/null
+++ b/routes/upload.js
@@ -0,0 +1,139 @@
+var express = require('express');
+var router = express.Router();
+var path = require("path")
+var fs = require("fs")
+var CryptoJS = require("crypto-js");
+var uuid = require("uuid")
+var ntr = require("../neutral-functions.js");
+const Jimp = require("jimp");
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+
+
+ var check = ntr.checkToken(req, res)
+
+ if(check != false) {
+
+ res.redirect(302, "/")
+
+ } else {
+
+ res.render('login', {error: ""});
+ }
+
+});
+
+router.post("/", function(req, res, next) {
+
+ var check = ntr.checkToken(req, res)
+
+ if(check == false) {
+
+ res.send({"result":"failed", "content":"ERROR_TOKEN_NOT_VALID"})
+
+
+ } else {
+
+ const image = req.files.apic
+
+ if(req.files.apic.mimetype == "image/png" | req.files.apic.mimetype == "image/jpeg" ) {
+
+ var uploadPath = "";
+ var uploadDir = __dirname.replace("routes","public" + path.sep + "images" + path.sep + "userspics" + path.sep)
+
+ if(req.files.apic.mimetype == "image/png") {
+
+ uploadPath = ntr.checkToken(req, res) + ".png"
+ }
+
+ if(req.files.apic.mimetype == "image/jpeg") {
+
+ uploadPath = ntr.checkToken(req, res) + ".jpg"
+ }
+
+ image.mv(uploadPath, function(err) {
+ if(err) {
+ res.send({"result":"success", "content": "La photo de profil n'a pas pu être chargé."})
+ console.log(err)
+ } else {
+
+
+
+ if(fs.existsSync(uploadDir + ntr.checkToken(req, res) + ".png") | fs.existsSync(uploadDir + ntr.checkToken(req, res) + ".jpg")) {
+
+ if(fs.existsSync(uploadDir + ntr.checkToken(req, res) + ".png")) {
+
+ fs.rmSync(uploadDir + ntr.checkToken(req, res) + ".png")
+ }
+
+ fs.renameSync(__dirname.replace("routes", "") + uploadPath , uploadDir + uploadPath)
+
+ if(req.files.apic.mimetype == "image/jpeg") {
+ Jimp.read(uploadDir + uploadPath, function (err, image) {
+ image.resize(200,200, function(err){
+ if (err) throw err;
+ }).write(uploadDir + uploadPath.replace("jpg", "png"))
+ fs.rmSync(uploadDir + ntr.checkToken(req, res) + ".jpg")
+
+ res.send({"result":"success", "content": "La photo de profil a été changé avec succès.",})
+
+ })
+
+
+
+
+
+ } else if(req.files.apic.mimetype == "image/png") {
+ Jimp.read(uploadDir + uploadPath, function (err, image) {
+ image.resize(200,200, function(err){
+ if (err) throw err;
+ }).write(uploadDir + uploadPath)
+
+ res.send({"result":"success", "content": "La photo de profil a été changé avec succès.",})
+
+ })
+
+
+
+ } else {
+
+ res.send({"result":"success", "content": "La photo de profil a été changé avec succès.",})
+
+
+ }
+
+
+
+
+
+ } else {
+
+ console.log(uploadDir + uploadPath)
+ res.send({"result":"success", "content": "La photo de profil n'a pas pu être chargé."})
+ console.log("ERROR - UPLOAD NOT WORK CORRECYLT")
+
+ }
+
+
+
+ }
+
+ })
+
+
+ } else {
+ res.send({"result":"success", "content": "Seul les images (JPEG et PNG) sont acceptés."})
+
+ }
+
+
+
+ }
+
+
+})
+
+module.exports = router;
+
+
diff --git a/src/scss/styles.scss b/src/js/scss/styles.scss
similarity index 100%
rename from src/scss/styles.scss
rename to src/js/scss/styles.scss
diff --git a/users/24a17fe1-32c3-4269-b83b-88b6bcd66cef.json b/users/24a17fe1-32c3-4269-b83b-88b6bcd66cef.json
new file mode 100644
index 0000000..cd45b78
--- /dev/null
+++ b/users/24a17fe1-32c3-4269-b83b-88b6bcd66cef.json
@@ -0,0 +1,11 @@
+{
+ "username": "root",
+ "password": "U2FsdGVkX183RDwFR0hVxkFizv9rTwppNiaWkUVowis=",
+ "uuid": "24a17fe1-32c3-4269-b83b-88b6bcd66cef",
+ "fullname": "Admin",
+ "token": {
+ "tokenID": "5aefa3fc-1e35-4195-89ab-b1603e867a51",
+ "livableToken": true,
+ "createdAt": 1676914169253
+ }
+}
\ No newline at end of file
diff --git a/users/9ace80e0-1ee3-4eed-924f-8a55fc55822b.json b/users/9ace80e0-1ee3-4eed-924f-8a55fc55822b.json
index 7c0476f..b3ecd6a 100644
--- a/users/9ace80e0-1ee3-4eed-924f-8a55fc55822b.json
+++ b/users/9ace80e0-1ee3-4eed-924f-8a55fc55822b.json
@@ -1,10 +1,11 @@
{
"username": "raphix",
- "password": "U2FsdGVkX18qYuDgnMfjve6jokb1mqH1f7wuktw9YO8=",
+ "password": "U2FsdGVkX195kOSeYbWRWFD3ys/5ubkaNSm9XacK0OE=",
"uuid": "9ace80e0-1ee3-4eed-924f-8a55fc55822b",
+ "fullname": "Raphael PICOT",
"token": {
- "tokenID": "23e2178e-3ad0-400b-ae42-c8efa35de27c",
- "livableToken": false,
- "createdAt": 1676754468956
+ "tokenID": "1679485c-2139-4939-a429-56480bba0336",
+ "livableToken": true,
+ "createdAt": 1676925451610
}
}
\ No newline at end of file
diff --git a/views/error.ejs b/views/error.ejs
index 7cf94ed..ccb9421 100644
--- a/views/error.ejs
+++ b/views/error.ejs
@@ -1,3 +1,49 @@
-<%= message %>
-<%= error.status %>
-<%= error.stack %>+ + + +
+ <%= message %> - <%= error.status %>
+
+ Erreur
+<%= message %> - <%= error.status %>
+ <%= error.stack %>
+
+
+ + + + diff --git a/views/index.ejs b/views/index.ejs index eb93f75..ef7ce91 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,13 +1,67 @@ -
<%= title %>
-Welcome to <%= title %>
- +
+ 
+
+
+
+
+
+
+
+
+
+
+
+