Util.js

TeamFreeHugs · Dec 18, 2015 · 38fc357 · 38fc357
1 parent 0d03e1d
commit 38fc357
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/app.js b/app.js
@@ -19,9 +19,9 @@ var instagram = require('./routes/instagram');
 var chat = require('./routes/chat');
 var users = require('./routes/users');
 var dev = require('./routes/dev');
+var util = require('./routes/util');
+
 
-function noop() {
-}
 
 mongo.connect('mongodb://localhost:27017/TFHWebSite', {}, function (err, db) {
     dbcs.db = db;
@@ -51,7 +51,7 @@ mongo.connect('mongodb://localhost:27017/TFHWebSite', {}, function (err, db) {
             if (!unibot) {
                 var keys = '0123456789abcdefghijklmnopqurstuvwxyzABCDEFGHIJKLMNOPQURSTUVWXYZ!@#$%^&8()[]{}\\|;:\'",./<>?-_=+';
                 var salt = '';
-                for (var i = 0; i < 100; i++) {
+                for (var i = 0; i < 1000; i++) {
                     var p = Math.floor(Math.random() * keys.length);
                     salt += keys[p];
                 }
@@ -92,6 +92,10 @@ mongo.connect('mongodb://localhost:27017/TFHWebSite', {}, function (err, db) {
         if (err) throw err;
         dbcs.dev = collection;
     });
+    db.createCollection('calendarEvents', function (err, collection) {
+        if (err) throw err;
+        dbcs.calendar = collection;
+    });
 });
 
 app.use(function (req, res, next) {
@@ -125,6 +129,7 @@ app.use('/instagram', instagram);
 app.use('/chat', chat);
 app.use('/users', users);
 app.use('/dev', dev);
+app.use('/util', util);
 
 
 // catch 404 and forward to error handler
@@ -139,7 +144,7 @@ app.use(function (req, res, next) {
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-    app.use(function (err, req, res, next) {
+    app.use(function (err, req, res) {
         var status = err.status || 500;
         res.status(status);
         res.render((res.userAgent.indexOf('mobile') === -1 ? 'computer' : 'mobile') + '/errors/error' + status, {
@@ -153,7 +158,7 @@ if (app.get('env') === 'development') {
 
 // production error handler
 // no stacktraces leaked to user
-app.use(function (err, req, res, next) {
+app.use(function (err, req, res) {
     var status = err.status || 500;
     res.status(status);
     res.render((res.userAgent.indexOf('mobile') === -1 ? 'computer' : 'mobile') + '/errors/error' + status, {

diff --git a/modules/account-manager.js b/modules/account-manager.js
@@ -2,19 +2,15 @@ var crypto = require('crypto');
 var mongo = require('mongodb').MongoClient;
 var moment = require('moment');
 
-var dbPort = 27017;
-var dbHost = 'localhost';
-var dbName = 'TFHWebSite';
-
 /* establish the database connection */
 
 var db,
     users,
     chatUsers;
 
 mongo.connect('mongodb://localhost:27017/TFHWebSite', {}, function (err, db1) {
+    if (err) throw err;
     db = db1;
-
     users = db1.collection('users');
     chatUsers = db1.collection('chatUsers');
 });
@@ -61,13 +57,14 @@ exports.addNewAccount = function (newData, callback) {
                         newData.confirmed = false;
                         newData.confirmToken = generateSalt();
                         newData.tokenExpire = nextWeek;
-                        users.insert(newData, {safe: true}, callback);
+                        newData.calendarToken = require('md5')(new Date().toString() + newData.email + newData.date + generateSalt() + generateSalt() + +new Date + Math.random()) + generateSalt();
+                            users.insert(newData, {safe: true}, callback);
                         chatUsers.insert({
                             name: newData.user,
                             email: newData.email,
                             emailHash: newData.emailHash,
                             imgURL: newData.imgURL,
-                            key: require('md5')(newData.email + newData.date + generateSalt()),
+                            key: require('md5')(new Date().toString() + newData.email + newData.date + generateSalt() + generateSalt() + +new Date + Math.random()) + generateSalt(),
                             rooms: [],
                             confirmed: false
                         }, {safe: true});

diff --git a/routes/util.js b/routes/util.js
@@ -0,0 +1,12 @@
+var express = require('express');
+var router = express.Router();
+
+router.post('/ip', function (req, res) {
+    res.status(200);
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.send(req.connection.remoteAddress ||
+        req.socket.remoteAddress ||
+        req.connection.socket.remoteAddress);
+});
+
+module.exports = router;