Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
XYZ-Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sindre Eiklid
XYZ-Project
Commits
4cccfa38
Commit
4cccfa38
authored
4 years ago
by
Jan Olaf Storeng
Browse files
Options
Downloads
Patches
Plain Diff
server.js - but no bs(?)
parent
b4738b70
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/server.js
+1
-49
1 addition, 49 deletions
server/server.js
with
1 addition
and
49 deletions
server/server.js
+
1
−
49
View file @
4cccfa38
...
...
@@ -7,13 +7,10 @@ import parse from 'querystring';
import
session
from
'
express-session
'
;
import
bodyParser
from
'
body-parser
'
;
import
cookieParser
from
'
cookie-parser
'
;
//import mongoose from 'mongoose';
const
router
=
express
.
Router
();
const
app
=
express
();
const
PORT
=
process
.
env
.
port
||
8081
;
//const bcrypt = require('bcrypt'); //<-- npm i bcrypt
//$ npm i passport passport-local express-session express-flash
app
.
listen
(
PORT
,
()
=>
{
console
.
log
(
'
Running...
'
);
...
...
@@ -43,11 +40,8 @@ app.use(cookieParser());
app
.
use
(
express
.
static
(
path
.
resolve
()
+
'
/server
'
));
app
.
use
(
express
.
urlencoded
());
app
.
use
(
express
.
json
());
//app.use(express.static(__dirname + '/views'));
app
.
use
(
bodyParser
.
json
());
//app.use(session({secret: 'ssshhhh',saveUninitialized: true,resave: true}));
//app.use(passport.initialize())
//app.use(passport.session());
const
TWO_HOURS
=
1000
*
60
*
60
*
2
;
...
...
@@ -62,13 +56,6 @@ app.use(session({
}
}))
/*app.use(cookieSession({
name: 'session',
keys: 'key1',
secret: 'secret',
}))
*/
const
redirectLogin
=
(
req
,
res
,
next
)
=>
{
const
{
cookies
}
=
req
;
if
(
!
req
.
session
.
userId
){
...
...
@@ -121,41 +108,6 @@ app.get('/getUser/:uid', function (req, res){ //TODO: send user-information base
*
*/
app
.
post
(
'
/createUser
'
,
redirectHome
,
function
(
req
,
res
){
/* //const crypPassword = await bcrypt.hash(req.body.password, 10); //<-- krypterer passord
var rows;
console.log("Connected!");
let sql = `SELECT email FROM users WHERE email = '${req.body.email}'`;
db.query(sql, function(err, res){
console.log(res[0].email);
console.log(req.body.email);
if(res[0].email == res.body.email){
console.log('Email already exist');
//res.redirect('http://localhost:8080');
}else{
console.log('Email is unique');
db.query("SELECT COUNT(*) AS count FROM users", function(err, res){
console.log(res[0].count);
if(err) throw err;
rows = (res[0].count);
rows++;
console.log(rows);
});
console.log(rows);
var values = [[rows, req.body.email, req.body.password, "user", req.body.picture]];
let sql = "INSERT INTO users (uid, email, password, userType, picture) VALUES ?";
db.query(sql, [values], function (err, result) {
if(err){
res.redirect('http://localhost:8080/login');
throw err;
}
console.log("1 record in 'users' inserted");
req.session.userId = rows;
res.redirect('http://localhost:8080'); //<-- går til index etter /createUser er ferdig
});
}
})*/
console
.
log
(
req
.
body
.
email
);
var
rows
;
let
sql
=
`SELECT email FROM users WHERE email = '
${
req
.
body
.
email
}
'`
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment