Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement client playlists #17

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,9 @@ async.series([function createDatabaseDirectory(next) {
}
next();
}, function setupPassport(next) {
//Configure passport
require(__dirname + '/passport_config.js')(app, passport);

passport.use(new Strategy(
function(username, password, cb) {
app.db.users.findOne({username: username}, function(err, user) {
if (err) { return cb(err); }
if (!user) { return cb(null, false, {message:"Invalid credentials"}); }
if (user.password != password) { return cb(null, false, {message:"Invalid credentials"}); }
return cb(null, user);
});
}));

// Configure Passport persistence.
passport.serializeUser(function(user, cb) {
var sessionUser = user;
cb(null, sessionUser);
});

passport.deserializeUser(function(user, cb) {
cb(null, user);
});
next();
}, function setupEverythingElse(next) {
// middleware to use in the app
Expand Down
2 changes: 1 addition & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function Config(app) {
function (cb) {
app.db.users.findOne({username:'admin'}, function (err, item) {
if(!item)
app.db.users.insert({username:'admin',password:'admin'});
app.db.admins.insert({username:'admin',password:'admin'});
});

cb();
Expand Down
1 change: 1 addition & 0 deletions db.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = function(app) {
app.db.playlists = new Datastore({ filename: app.get('configDir') + '/dbs/playlists.db', autoload: true });
app.db.settings = new Datastore({ filename: app.get('configDir') + '/dbs/settings.db', autoload: true });
app.db.users = new Datastore({ filename: app.get('configDir') + '/dbs/users.db', autoload: true });
app.db.admins = new Datastore({ filename: app.get('configDir') + '/dbs/admins.db', autoload: true });
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"song-search": "^0.1.0",
"soundcloud-resolver": "*",
"swig": "*",
"validator": "^6.2.1",
"youtube-playlist-info": "^0.1.0",
"ytdl-core": "*"
},
Expand Down
105 changes: 105 additions & 0 deletions passport_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// Configuration file for passportJS

var LocalStrategy = require('passport-local').Strategy;
var validate = require('validator');

module.exports = function(app, passport){

// Specify a local strategy for passport normal user login
passport.use('user-login', new LocalStrategy(
function(username, password, cb){

// Validate user data
var error = 0;
username = validate.trim(username);
username = username.toLowerCase();
error += validate.isEmpty(username);
error += validate.isEmpty(password);

if (!error) {
app.db.users.findOne({username: username}, function(err, user) {
if (err) { return cb(err); }
if (!user) { return cb(null, false, {message:"Invalid credentials"}); }
if (user.password != password) { return cb(null, false, {message:"Invalid credentials"}); }
return cb(null, user);
});

}
else
return cb(null, false);
}
));

// Specify a local strategy for passport normal user signup
passport.use('user-signup', new LocalStrategy(
function(username, password, cb){

// Validate user data
var error = 0;
username = validate.trim(username);
username = username.toLowerCase();
error += validate.isEmpty(username);
error += validate.isEmpty(password);

if (!error) {
app.db.users.findOne({username: username}, function(err, user) {
if (err) {
return cb(err);
}
if (user) {
return cb(null, false, {message:"User already registered"});
}
else{
// Must not be the same as admins
app.db.admins.findOne({username: username}, function(err, user) {
if (err) {
return cb(err);
}
if (user) {
return cb(null, false, {message:"User already registered"});
}
else{
app.db.users.insert({username: username, password:password});
}
});
}
});
}else
return cb(null, false);
}
));

// Specify a local strategy for passport admin login
passport.use('admin-login', new LocalStrategy(
function(username, password, cb){

// Validate user data
var error = 0;
username = validate.trim(username);
username = username.toLowerCase();
error += validate.isEmpty(username);
error += validate.isEmpty(password);

if (!error) {
app.db.admins.findOne({username: username}, function(err, user) {
if (err) { return cb(err); }
if (!user) { return cb(null, false, {message:"Invalid credentials"}); }
if (user.password != password) { return cb(null, false, {message:"Invalid credentials"}); }
return cb(null, user);
});

}
else
return cb(null, false);
}
));

// Specify serialize and deserialize methods for passport
passport.serializeUser(function(user, cb){
var sessionUser = user;
cb(null, sessionUser);
});
passport.deserializeUser(function(user, cb){
cb(null, user);
});
};
6 changes: 5 additions & 1 deletion routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ exports.createRoutes = function(app_ref) {
//adds login facility
app.get('/admin',function (req,res) { res.render('admin',{ msg:req.flash('error'), log: req.user? true : false});});
//auth using passport
app.post('/admin', passport.authenticate('local', { failureRedirect: '/admin', failureFlash: true }), function(req, res) {
app.post('/admin', passport.authenticate('admin-login', { failureRedirect: '/admin', failureFlash: true }), function(req, res) {
res.redirect('/');
});
app.get('/login', function (req,res) { res.render('login',{ msg:req.flash('error'), log: req.user? true : false});});
app.post('/login', passport.authenticate('user-login', { failureRedirect: '/login', failureFlash: true }), function(req, res) {
res.redirect('/');
});
app.post('/logout', function(req, res) {
Expand Down
169 changes: 169 additions & 0 deletions views/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<title>User Login</title>
<style>
@import url(https://fonts.googleapis.com/css?family=Roboto:300);
.login-page {
width: 410px;
padding: 8% 0 0;
margin: auto;
}

h1 {
color: white;
font-size: 50px;
font-weight: 130;
text-align: center;
margin: 15px;
}
.form {
position: relative;
z-index: 1;
background: #FFFFFF;
max-width: 360px;
margin: 0 auto 100px;
padding: 45px;
text-align: center;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
}

.form input {
font-family: "Roboto", sans-serif;
outline: 0;
background: #f2f2f2;
width: 100%;
border: 0;
margin: 0 0 15px;
padding: 15px;
box-sizing: border-box;
font-size: 14px;
}

.form button {
font-family: "Roboto", sans-serif;
text-transform: uppercase;
outline: 0;
background: #022a50;
width: 100%;
border: 0;
padding: 15px;
color: #FFFFFF;
font-size: 14px;
-webkit-transition: all 0.3 ease;
transition: all 0.3 ease;
cursor: pointer;
}

.form button:hover,
.form button:active,
.form button:focus {
background: #022a50;
}

.form .message {
margin: 15px 0 0;
color: #b3b3b3;
font-size: 12px;
}

.form .message a {
color: #022a50;
text-decoration: none;
}

.form .register-form {
display: none;
}

.container {
position: relative;
z-index: 1;
max-width: 300px;
margin: 0 auto;
}

.container:before,
.container:after {
content: "";
display: block;
clear: both;
}

.container .info {
margin: 50px auto;
text-align: center;
}

.container .info h1 {
margin: 0 0 15px;
padding: 0;
font-size: 36px;
font-weight: 300;
color: #1a1a1a;
}

.container .info span {
color: #4d4d4d;
font-size: 12px;
}

.container .info span a {
color: #000000;
text-decoration: none;
}

.container .info span .fa {
color: #EF3B3A;
}

.alert{
margin: 5px auto;
text-align: center;
color: red;
border: 2px;
}

body {
background: #022a50;
font-family: "Roboto", sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</style>
</head>

<body>
<div class="login-page">
<h1>Login</h1>
{% if msg %}
<div class="alert">
<p>{{msg}}</p>
</div>
{% endif %}
<div class="form">
<!-- <form class="register-form">
<input type="text" placeholder="name" />
<input type="password" placeholder="password" />
<input type="text" placeholder="email address" />
<button>create</button>
<p class="message">Already registered? <a href="#">Sign In</a></p>
</form> -->
{% if log %}
<form action="/logout" method="post" class="login-form">
<button type="submit">Logout</button>
{% else %}
<form action="/login" method="post" class="login-form">
<input type="text" placeholder="username" name="username" />
<input type="password" placeholder="password" name="password" />
<button type="submit">login</button>
<!-- <p class="message">Not registered? <a href="#">Create an account</a></p> -->
{% endif %}
</form>
</div>
</div>
</body>

</html>