Skip to content

Commit

Permalink
multiuser 'send message', 'room add' and responses complete
Browse files Browse the repository at this point in the history
  • Loading branch information
tameeshB committed Dec 17, 2017
1 parent 3d77861 commit 71b7a2b
Show file tree
Hide file tree
Showing 14 changed files with 570 additions and 154 deletions.
Binary file modified .DS_Store
Binary file not shown.
68 changes: 68 additions & 0 deletions config/init.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
var mongojs = require('mongojs');
var db = mongojs('sockchat', ['messages','users','rooms']);
var http = require('http');
var querystring = require('querystring');

var confirm = require('confirm-cli');
/**
* testing script for dev.
* run using "node config/init.js"
**/

// confirm('Confirm remove all data?',
// function () {
// db.users.remove({}, (err, dat) => { db.rooms.remove({}, (err, dat) => { db.messages.remove({},(err,dat)=>{
// console.log('removed');

// });});});

db.users.remove({});
db.messages.remove({});
db.rooms.remove({});

// createNewUser('Test Boi', 'testBoi', '[email protected]');
// createNewUser('Test More', 'testBitMore', '[email protected]');
// createNewUser('Cool Boi', 'coolboi', '[email protected]');
// createNewUser('Cool Boi', 'coolboi', '[email protected]', 1);
// }, function () {
// process.exit();
// });

createNewUser('Tameesh Biswas', 'tameeshb', '[email protected]');
createNewUser('Test More', 'testBitMore', '[email protected]');
createNewUser('Cool Boi', 'coolboi', '[email protected]');
createNewUser('Cooler Boi', 'coolerboi', '[email protected]', 1);

function createNewUser(name, uname, email,last){
var post_data = querystring.stringify({
'name': name,
'uname': uname,
'email': email,
'password': 'tam',
'password_': 'tam'
});
var post_options = {
host: 'localhost',
port: '3000',
path: '/api/register/web',
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'Content-Length': Buffer.byteLength(post_data)
}
};

// Set up the request
var post_req = http.request(post_options, function (res) {
res.setEncoding('utf8');
res.on('data', function (chunk) {
console.log('Response: ' + chunk);
});
});

// post the data
post_req.write(post_data);
post_req.end();
// if (last == 1)
// process.exit();
}
22 changes: 11 additions & 11 deletions config/passport.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//dependencies
var LocalStrategy = require('passport-local').Strategy;
var FacebookStrategy = require('passport-facebook').Strategy;

require('../globals');
var User = require('../models/user');
var configAuth = require('./auth');

Expand All @@ -25,8 +25,8 @@ module.exports = function (passport, app) {
process.nextTick(function () {
User.findOne({
$or: [
{ 'local.email': email },
{ 'username': req.body.uname }
{ 'local.email': email },
{ 'username': req.body.uname }
]
}, function (err, user) {
if (err)
Expand All @@ -42,6 +42,7 @@ module.exports = function (passport, app) {
newUser.hash = newUser.generateAccessHash(req.body.uname, password);
newUser.username = req.body.uname;
newUser.name = req.body.name;
// newUser.rooms.push({id:null,roomname:null});

// save the user
newUser.save(function (err) {
Expand All @@ -59,6 +60,7 @@ module.exports = function (passport, app) {
}
req.flash('emailMsg', 'Email Sent');
});

req.flash('loginMessage', 'You are registered! Login here to continue!');

return done(null, newUser);
Expand All @@ -85,20 +87,18 @@ module.exports = function (passport, app) {
if (err)
return done(err);
if (!user)
return done(null, false, req.flash('loginMessage', 'No user found.'));
return done(null, false, req.flash('loginMessage', 'Invalid credentials.'));
if (!user.validPassword(password))
return done(null, false, req.flash('loginMessage', 'Wrong password.'));
return done(null, false, req.flash('loginMessage', 'Invalid credentials.'));
var ssn = req.session;
if (user.rooms){
ssn.rooms = user.rooms;
roomsGL_id = user.rooms;
userGL = user;
}
else{
roomsGL = user.rooms;
} else {
ssn.rooms = [];
roomsGL_id = {};
userGL = user;
roomsGL = [];
}
userGL = user;
req.user = user;
ssn.user = user;
return done(null, user);
Expand Down
181 changes: 181 additions & 0 deletions dep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
# Dependencies
- accepts
addressparser
after
array-flatten
arraybuffer.slice
async
async-limiter
aws-sdk
aws-sdk-apis
backo2
base64-arraybuffer
base64id
basic-auth
bcrypt-nodejs
bcryptjs
better-assert
blob
bluebird
body-parser
bson
buffer-shims
bytes
callsite
colorful
component-bind
component-emitter
component-inherit
confirm-cli
connect-flash
content-disposition
content-type
cookie
cookie-parser
cookie-signature
core-util-is
crc
debug
depd
destroy
directmail
dkim-signer
each-series
ee-first
ejs
encodeurl
encoding
engine.io
engine.io-client
engine.io-parser
es6-promise
escape-html
etag
express
express-mailer
express-messages
express-session
express-validator
fibers
finalhandler
follow-redirects
forwarded
fresh
has-binary2
has-cors
he
hooks-fixed
http-errors
iconv-lite
indexof
inherits
ipaddr.js
isarray
jquery-ripple
kareem
keypress
lodash
lodash.get
mailcomposer
media-typer
merge-descriptors
method-override
methods
mime
mime-db
mime-types
mimelib
mongodb
mongodb-core
mongojs
mongoose
morgan
mpath
mpromise
mquery
ms
multiple
muri
negotiator
nodemailer
oauth
object-component
on-finished
on-headers
once
openid
parse-mongo-url
parseqs
parseuri
parseurl
passport
passport-facebook
passport-google
passport-http
passport-local
passport-oauth1
passport-oauth2
passport-openid
passport-strategy
passport-twitter
path
path-to-regexp
pause
pkginfo
process
process-nextick-args
proxy-addr
public-address
punycode
qs
querystring
rai
random-bytes
range-parser
raw-body
readable-stream
regexp-clone
require_optional
resolve-from
safe-buffer
sax
semver
send
serve-favicon
serve-static
setprototypeof
simplesmtp
sliced
socket.io
socket.io-adapter
socket.io-client
socket.io-parser
statuses
string_decoder
stringbitlength
thunky
to-array
to-mongodb-core
type-is
uid-safe
uid2
ultron
underscore
unpipe
util
util-deprecate
utils-merge
uws
validator
vary
wait.for
wrappy
ws
xml2js
xmlbuilder
xmldom
xmlhttprequest-ssl
xoauth2
xtend
xtraverse
yeast
7 changes: 4 additions & 3 deletions globals.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
global.roomsGL_id = {};
global.roomsGL_name = {};
global.userGL = {};
global.roomsGL = [];
global.roomsGL = [];
global.userGL = {};
//updating roomsGL and usersGL.rooms
2 changes: 1 addition & 1 deletion models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var userSchema = mongoose.Schema({
username: String,
name : String,
hash: String,
rooms: [Number],
rooms: [{id : Number,roomname: String}],
local : {
email : String,
password : String,
Expand Down
Loading

0 comments on commit 71b7a2b

Please sign in to comment.