toror33

user_phone 추가 및 코드 정리

...@@ -39,7 +39,7 @@ app.use(cookieParser()); ...@@ -39,7 +39,7 @@ app.use(cookieParser());
39 app.use(express.static(path.join(__dirname, 'public'))); 39 app.use(express.static(path.join(__dirname, 'public')));
40 40
41 app.use(session({ 41 app.use(session({
42 - secret: 'secrettexthere', 42 + secret: 'mykey',
43 saveUninitialized: true, 43 saveUninitialized: true,
44 resave: true 44 resave: true
45 })); 45 }));
......
...@@ -2,9 +2,9 @@ var express = require('express'); ...@@ -2,9 +2,9 @@ var express = require('express');
2 var router = express.Router(); 2 var router = express.Router();
3 3
4 /* GET home page. */ 4 /* GET home page. */
5 -router.get('/', function(req, res, next) { 5 +// router.get('/', function(req, res, next) {
6 - res.render('index', { title: 'Express' }); 6 +// res.render('index', { title: 'Express' });
7 -}); 7 +// });
8 8
9 router.get('/logout',function (req,res) { 9 router.get('/logout',function (req,res) {
10 req.logout(); 10 req.logout();
......
...@@ -12,14 +12,14 @@ router.post('/', function(req, res, next) { ...@@ -12,14 +12,14 @@ router.post('/', function(req, res, next) {
12 var user_id=req.body.user_id; 12 var user_id=req.body.user_id;
13 var user_pw=req.body.user_pw; 13 var user_pw=req.body.user_pw;
14 var sqlquery = "SELECT * FROM users WHERE user_id = ?"; 14 var sqlquery = "SELECT * FROM users WHERE user_id = ?";
15 - connection.query(sqlquery, user_id,function (err, rows) { 15 + connection.query(sqlquery, user_id,function (err, result) {
16 if (err) { 16 if (err) {
17 console.log("no match"); 17 console.log("no match");
18 } else { 18 } else {
19 - var bytes =cryptoM.decrypt(rows[0].user_pw); 19 + var bytes =cryptoM.decrypt(result[0].user_pw);
20 if(bytes===user_pw) { 20 if(bytes===user_pw) {
21 console.log("user login successfully"); 21 console.log("user login successfully");
22 - req.session.user_id=rows[0].user_id; 22 + req.session.user_id=result[0].user_id;
23 res.redirect('/main'); 23 res.redirect('/main');
24 }else{ 24 }else{
25 console.log("wrong password!"); 25 console.log("wrong password!");
...@@ -29,4 +29,6 @@ router.post('/', function(req, res, next) { ...@@ -29,4 +29,6 @@ router.post('/', function(req, res, next) {
29 }); 29 });
30 }); 30 });
31 31
32 +
33 +
32 module.exports = router; 34 module.exports = router;
......
...@@ -18,15 +18,15 @@ router.post('/', function(req, res, next) { ...@@ -18,15 +18,15 @@ router.post('/', function(req, res, next) {
18 var user_pw=req.body.user_pw; 18 var user_pw=req.body.user_pw;
19 var user_email=req.body.user_email; 19 var user_email=req.body.user_email;
20 var user_name=req.body.user_name; 20 var user_name=req.body.user_name;
21 - // var user_phone=req.body.user_phone; 21 + var user_phone=req.body.user_phone;
22 22
23 var sqlquery = "SELECT * FROM users WHERE user_id = ?"; 23 var sqlquery = "SELECT * FROM users WHERE user_id = ?";
24 - connection.query(sqlquery, [user_id], function (err, rows) { 24 + connection.query(sqlquery, [user_id], function (err, result) {
25 if (rows.length == 0) { 25 if (rows.length == 0) {
26 user_pw=cryptoM.encrypt(user_pw); 26 user_pw=cryptoM.encrypt(user_pw);
27 console.log(user_pw); 27 console.log(user_pw);
28 - var sql = 'INSERT INTO users(user_id,user_pw, user_email, user_name) values (?,?,?,?)'; 28 + var sql = 'INSERT INTO users(user_id,user_pw, user_email, user_phone, user_name) values (?,?,?,?,?)';
29 - var values = [user_id, user_pw, user_email, user_name]; 29 + var values = [user_id, user_pw, user_email, user_phone,user_name];
30 connection.query(sql, values, function (err) { 30 connection.query(sql, values, function (err) {
31 if (err) { 31 if (err) {
32 console.log("inserting user failed"); 32 console.log("inserting user failed");
......
...@@ -4,62 +4,21 @@ var async = require('async'); ...@@ -4,62 +4,21 @@ var async = require('async');
4 var router = express.Router(); 4 var router = express.Router();
5 var CryptoJS = require("crypto-js"); 5 var CryptoJS = require("crypto-js");
6 6
7 -function get_my_info(id,cb){
8 - console.log("get_my_info");
9 - console.log(id);
10 - var sqlquery = "SELECT * FROM users WHERE user_id = ?";
11 - var myinfo= new Array();
12 - connection.query(sqlquery,id,function(err,rows){
13 - if(!err){
14 - myinfo=rows;
15 - console.log(myinfo);
16 - cb(myinfo);
17 - } else {
18 - console.log("내 정보를 가져오는데 실패했습니다!");
19 - res.send({result: false});
20 - //throw err;
21 - }
22 - });
23 -}
24 -
25 -router.get('/', function(req, res, next) {
26 - console.log(req.session.user_id);
27 - async.series(
28 - [
29 - function (callback) {
30 - get_my_info(req.session.user_id, function (myinfo_list) {
31 - callback(null, myinfo_list);
32 - });
33 - }
34 - ],
35 - function (err, results) {
36 - res.render('dropbox/user', {
37 - myinfo: results[0]
38 - });
39 - }
40 - );
41 - //}
42 -});
43 -
44 -
45 router.post('/update', function(req, res, next) { 7 router.post('/update', function(req, res, next) {
46 var user_id=req.body.user_id; 8 var user_id=req.body.user_id;
47 var user_pw=req.body.user_pw; 9 var user_pw=req.body.user_pw;
48 var user_pw2=req.body.user_pw2; 10 var user_pw2=req.body.user_pw2;
49 var user_email=req.body.user_email; 11 var user_email=req.body.user_email;
50 - // var user_phone=req.body.user_phone; 12 + var user_phone=req.body.user_phone;
51 13
52 if(user_pw===user_pw2) { 14 if(user_pw===user_pw2) {
53 - console.log(user_pw2);
54 - // user_pw=CryptoJS.AES.encrypt(user_pw, 'secret key 123');
55 user_pw=cryptoM.encrypt(user_pw); 15 user_pw=cryptoM.encrypt(user_pw);
56 - var sql='UPDATE users SET user_pw = ?, user_email= ? WHERE user_id = ?'; 16 + var sql='UPDATE users SET user_pw = ?, user_email= ?,user_phone = ? WHERE user_id = ?';
57 - var values=[user_pw, user_email, user_id]; 17 + var values=[user_pw, user_email,user_phone, user_id];
58 - connection.query(sql, values , function (err) { 18 + connection.query(sql, values, function (err) {
59 if (err) { 19 if (err) {
60 console.log("updating user failed"); 20 console.log("updating user failed");
61 - //res.send({result:false}); 21 + next(err);
62 - //throw err;
63 } else { 22 } else {
64 console.log("user updated successfully"); 23 console.log("user updated successfully");
65 res.redirect('back'); 24 res.redirect('back');
...@@ -68,8 +27,7 @@ router.post('/update', function(req, res, next) { ...@@ -68,8 +27,7 @@ router.post('/update', function(req, res, next) {
68 } 27 }
69 else 28 else
70 { 29 {
71 - console.log("비밀번호가 일치하지 않습니다."); 30 + console.log("password not match");
72 - res.send({result:false});
73 res.redirect('back'); 31 res.redirect('back');
74 } 32 }
75 }); 33 });
......