From 376f8107bafe0dd140b2c1eb0f2002aec662f733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Fleury?= <noe.fleury@etu.hesge.ch>
Date: Tue, 17 Dec 2019 20:14:08 +0100
Subject: [PATCH] Corrected all merged things...
---
projet/hyperdrive-rest.js | 37 ++++---------------------------------
projet/package-lock.json | 10 +++++-----
2 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/projet/hyperdrive-rest.js b/projet/hyperdrive-rest.js
index dbc1c26..1c2817b 100644
--- a/projet/hyperdrive-rest.js
+++ b/projet/hyperdrive-rest.js
@@ -1,9 +1,10 @@
-<<<<<<< HEAD
const CryptoJS = require("crypto-js")
const express = require('express')
const app = express()
-const port = 3000
+const port = 8080
+const sql = require('./modules/sql-request');
+
@@ -85,16 +86,6 @@ function verify_token(token) {
///// End JWT part /////
-app.get('/', (req, res) => res.send('Welcome to our super project !'))
-
-// resCode : [ 0: User now logged in, 1: False password, 2: Invalid username, 3: Empty user or pass ]
-=======
-const express = require('express');
-const sql = require('./modules/sql-request');
-
-const app = express();
-const port = 8080;
-
app.get('/', (req, res) => {
res.sendFile(__dirname + '/front/index.html');
});
@@ -103,7 +94,7 @@ app.get('/', (req, res) => {
* param : pseudo
* param : password
*/
->>>>>>> 8d6515794b78d286e87c3d488b69381a36be096d
+// resCode : [ 0: User now logged in, 1: False password, 2: Invalid username, 3: Empty user or pass ]
app.get('/login', (req, res) => {
const user = req.query['user'];
@@ -160,7 +151,6 @@ app.get('/login', (req, res) => {
})
-<<<<<<< HEAD
// resCode : [ 0: Token is valid, 1: Token is not valid, 3: Empty token ]
app.get('/testmytoken', (req, res) => {
@@ -190,8 +180,6 @@ app.get('/testmytoken', (req, res) => {
})
// resCode : [ 0: Logout ok, 1: Already logged out, 3: Empty token ]
-=======
->>>>>>> 8d6515794b78d286e87c3d488b69381a36be096d
app.get('/logout/', (req, res) => {
token = req.query['token'];
@@ -265,22 +253,5 @@ app.get('/create-path*', (req, res) => {
res.send(`Request for a create path (${req.params['0']})`)
})
-<<<<<<< HEAD
-app.listen(port, () => console.log(`Example app listening on port ${port}!`))
-
-
-
-
-
-
-
-
-
-// my_jwt = new JWT("my_user", "my_pass");
-// console.log(my_jwt.header);
-// console.log(my_jwt.payload);
-// console.log(my_jwt.signedToken);
-=======
app.use(express.static('front'));
app.listen(port, () => console.log(`Hyperdrive listening on port ${port}!`))
->>>>>>> 8d6515794b78d286e87c3d488b69381a36be096d
diff --git a/projet/package-lock.json b/projet/package-lock.json
index 034f9f6..745535d 100644
--- a/projet/package-lock.json
+++ b/projet/package-lock.json
@@ -68,16 +68,16 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
- "crypto-js": {
- "version": "3.1.9-1",
- "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
- "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
- },
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
+ "crypto-js": {
+ "version": "3.1.9-1",
+ "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+ "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
+ },
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
--
GitLab