Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.
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: 13 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@ const express = require('express');
const cookieParser = require('cookie-parser');
const logger = require('morgan');

const indexRouter = require('./routes/index');
const usersRouter = require('./routes/users');
const indexRouter = require('./routes/index')
const usersRouter = require('./routes/users')
const folderRouter = require('./routes/folder')
const snippetsRouter = require('./routes/snippets')

const app = express();

app.use(logger('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use('/', indexRouter);
app.use('/api/v1/users', usersRouter);
app.use(logger('dev'))
app.use(express.json())
app.use(express.urlencoded({ extended: false }))
app.use(cookieParser())
app.use('/', indexRouter)
app.use('/api/v1/users', usersRouter)
app.use('/api/v1/folder', folderRouter)
app.use('/api/v1/snippets', snippetsRouter)


// catch 404 and forward to error handler

Expand Down
3 changes: 1 addition & 2 deletions db/mongo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ const mongoose = require('mongoose');
const { MONGO_URI, NODE_ENV } = require('../config');

//Set up default mongoose connection
console.log(process.env.NODE_ENV);

if (NODE_ENV === 'development') {
mongoose.connect('mongodb://localhost:27017/knipper', {
useNewUrlParser: true,
useUnifiedTopology: true,
});
}
if (NODE_ENV === 'production' || MONGO_URI) {
else if (NODE_ENV === 'production' || MONGO_URI) {
mongoose.connect(MONGO_URI, {
useNewUrlParser: true,
useUnifiedTopology: true,
Expand Down
10 changes: 5 additions & 5 deletions middleware/userLogin.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ const User = db.model('User', userSchema);
*
*/
exports.userLogin = async (req, res) => {
const { user_name, email, password } = req.body;
const user_detail = user_name || email;
try {
const { loginDetails, password } = req.body;
if (!loginDetails || !password) throw new CustomError(402, 'Bad Request');
const user = await User.find({
$or: [
{ user_name: loginDetails.toLowerCase() },
{ email: loginDetails.toLowerCase() },
{ user_name: user_detail.toLowerCase() },
{ email: user_detail.toLowerCase() },
],
});
if (!user[0]) throw new CustomError(402, 'Invalid Login Credentials');
if (!user[0]) throw new Error(`User doesn't exist`);
const isPasswordCorrect = bcrypt.compareSync(password, user[0].password);
if (isPasswordCorrect) {
const token = generateAccessToken(user[0]);
Expand Down
3 changes: 2 additions & 1 deletion model/user_model.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const userSchema = new Schema({
user_name: String,
email: String,
password: String,
folders: [folderSchema],
user_type: {type: String, enum:["user", "admin"], default: "user"},
folders: [folderSchema]
});

module.exports = userSchema;
27 changes: 27 additions & 0 deletions routes/folder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
const authenticateToken = require('../middleware/tokenAuthenticate');
const express = require('express');
const router = express.Router();
const db = require('../db/mongo');
const userSchema = require('../model/user_model');

const userModel = db.model('user', userSchema);

/* GET all folder. */
router.get('/', authenticateToken, async (req, res) => {
const current_user = await userModel.findOne({ _id: req.user.userId });
let folders;
if (current_user.user_type === 'admin') {
userModel.find({}, (err, data) => {
if (err) {
res.status(500).send({ error: err });
} else {
folders = [].concat(...data.map((e) => e.folders));
res.send(folders);
}
});
} else {
res.send(current_user.folders);
}
});

module.exports = router;
29 changes: 29 additions & 0 deletions routes/snippets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const authenticateToken = require('../middleware/tokenAuthenticate');
const express = require('express');
const router = express.Router();
const db = require('../db/mongo');
const userSchema = require('../model/user_model');
/* GET home page. */
const userModel = db.model('user', userSchema);

/* GET all folder. */
router.get('/', authenticateToken, async (req, res) => {
const current_user = await userModel.findOne({ _id: req.user.userId });
let snippets;
if (current_user.user_type === 'admin') {
userModel.find({}, (err, data) => {
if (err) {
res.status(500).send({ error: err });
} else {
const folders = [].concat(...data.map((e) => e.folders));

snippets = [].concat(...folders.map((e) => e.snippets));
res.send(snippets);
}
});
} else {
res.send(current_user.folders);
}
});

module.exports = router;