Merge pull request #107 from alexwohlbruck/develop

1.1.2

app/config/strings.js

@@ -11,6 +11,12 @@ module.exports = {
 
         return `Thanks for signing up for ${semanticJoin(animalsList)} Facts! You will now receive fun facts about ${semanticJoin(animalsListCapital)} every day! =^.^=`;
     },
+    animalTypes: [
+        'cat',
+        'dog',
+        'snail',
+        'horse'
+    ],
     unauthenticated: "Sign in first",
     unauthorized: "You aren't allowed to do that!",
     noVerificationCode: "Please provide a verification code",
@@ -23,5 +29,5 @@ module.exports = {
         exists: "That person is already being facted"
     },
     invalidNumber: "That phone number is invalid!",
-    userPhotoUrl: "https://cat-fact.herokuapp.com/img/res/avatars/user-face.png"
+    userPhotoUrl: "https://cat-fact.herokuapp.com/img/res/avatars/user-face.png",
 };

app/models/fact.js

@@ -2,14 +2,15 @@ const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 const mongooseDelete = require('mongoose-delete');
 const random = require('mongoose-simple-random');
+const { animalTypes } = require('../config/strings.js');
 
 const FactSchema = new Schema({
     user: {type: Schema.Types.ObjectId, ref: 'User'},
     text: {type: String, required: true, unique: true},
     sendDate: {type: Date},
     used: {type: Boolean, default: false},
     source: {type: String, enum: ['user', 'api'], default: 'user'},
-    type: {type: String, enum: ['cat', 'dog', 'snail', 'horse'], default: 'cat'}
+    type: {type: String, enum: animalTypes, default: 'cat'}
 }, {
     timestamps: true
 });

app/models/recipient.js

@@ -19,7 +19,7 @@ const RecipientSchema = new Schema({
     addedBy: {type: Schema.Types.ObjectId, ref: 'User'},
     subscriptions: [{
         type: String,
-        enum: ['cat', 'dog', 'snail', 'horse']
+        enum: strings.animalTypes // TODO: Move to constant definition
     }]
 }, {
     timestamps: true
@@ -165,8 +165,8 @@ RecipientSchema.statics.addRecipients = async function ({authenticatedUser, requ
 
 RecipientSchema.path('number').validate(function(number, done) {
     this.model('Recipient').count({number: number}, function(err, count) {
-        if (err) return done(err);
-        done(!count);
+        if (err) return err;
+        return !count;
     });
 }, strings.recipient.exists);
 

app/routes/catbot.routes.js

@@ -86,13 +86,10 @@ router.get('/daily', async (req, res) => {
 		};
 	};
 
-	// TODO: Define global list for animal types, use that to build this object
-	const facts = {
-		cat: getFactAndRecipients('cat'),
-		dog: getFactAndRecipients('dog'),
-		snail: getFactAndRecipients('snail'),
-		horse: getFactAndRecipients('horse')
-	};
+	const facts = {};
+	strings.animalTypes.forEach(animal => {
+		facts[animal] = getFactAndRecipients(animal);
+	});
 
 	const result = await Promise.props(facts),
 		  dbMessages = [];

app/routes/contact.routes.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const google = require('googleapis');
+const { google } = require('googleapis');
 const googleConfig = require.main.require('./app/config/google');
 const googleContacts = google.people('v1');
 

app/routes/fact.routes.js

@@ -18,7 +18,7 @@ router.get('/', async (req, res) => {
 	const matchAll = {
 		$match: {
 			used: false,
-			// source: 'user',
+			source: 'user',
 			sendDate: {
 				$exists: false
 			},
@@ -62,9 +62,9 @@ router.get('/', async (req, res) => {
 	countUpvotes = [
 		{$addFields: {
 			upvotes: { $size: "$upvotes" },
-			userUpvoted: {
+			userUpvoted: req.user ? {
 				$in: [ req.user._id, "$upvotes.user" ]
-			}
+			} : undefined
 		}},
 		{$sort: {
 			upvotes: -1
@@ -81,12 +81,12 @@ router.get('/', async (req, res) => {
 				projectUpvotes,
 				...countUpvotes
 			]),
-			me: Fact.aggregate([
+			me: req.user ? Fact.aggregate([
 				matchMe,
 				lookupUpvotes,
 				projectUpvotes,
 				...countUpvotes
-			])
+			]) : undefined
 		});
 
 		return res.status(200).json(data);

app/routes/recipient.routes.js

@@ -7,6 +7,7 @@ const IFTTTService = require.main.require('./app/services/ifttt.service.js');
 
 const Recipient = require.main.require('./app/models/recipient');
 const Message = require.main.require('./app/models/message');
+const VerificationCode = require.main.require('./app/models/verification-code');
 
 
 // Get all recipients
@@ -57,13 +58,33 @@ router.get('/me', isAuthenticated, async (req, res) => {
 // Add new recipient(s)
 router.post('/', isAuthenticated, async (req, res) => {
 
+	// TODO: Sanitize phone number input on server side
+
 	const requestedRecipients = req.body.recipients || [req.body.recipient];
 	const animalTypes = req.body.animalTypes;
 
+	/* 
+	 * requestedRecipients: [{
+	 *     name: String,
+	 *     number: String
+	 * }],
+	 * animalTypes: [String<Animal>]
+	 */
+
 	if (!requestedRecipients.length) {
 		return res.status(400).json({message: `No recipients provided`});
 	}
 
+	// If recipient already exists but is 'deleted', restore recipient to
+	// the new user account
+	const existingRecipients = await Recipient.findDeleted({number: {
+		$in: requestedRecipients.map(r => r.number)
+	}});
+
+	if (existingRecipients.length) {
+		existingRecipients.forEach(r => r.remove());
+	}
+
 	try {
 		const results = await Recipient.addRecipients({
 		    authenticatedUser: req.user,
@@ -78,6 +99,33 @@ router.post('/', isAuthenticated, async (req, res) => {
 	}
 });
 
+// Restore recipient with new subscriptions
+router.patch('/:recipientId/restore', isAuthenticated, async (req, res) => {
+
+	const recipientId = req.params.recipientId;
+	const resubscriptions = req.body.resubscriptions;
+
+	console.log(recipientId, resubscriptions);
+
+	try {
+		await Recipient.restore({_id: recipientId});
+
+		const recipient = await Recipient.findOneAndUpdate({_id: recipientId}, {
+			$set: {
+				subscriptions: resubscriptions
+			}
+		}, {
+			new: true
+		});
+		console.log(recipient);
+
+		return res.status(200).json(recipient);
+	}
+	catch (err) {
+		return res.status(err.status || 400).json(err);
+	}
+});
+
 router.patch('/:recipientId', isAuthenticated, async (req, res) => {
 
 	// TODO: only allow to edit recipient if user isAdmin or is addedBy them
@@ -98,6 +146,36 @@ router.patch('/:recipientId', isAuthenticated, async (req, res) => {
 	}
 });
 
+// Unsubscribe
+router.delete('/me', isAuthenticated, async (req, res) => {
+
+	if (!req.query.verificationCode) {
+        return res.status(403).json({
+            message: strings.noVerificationCode
+        });
+    }
+
+    const submittedCode = req.query.verificationCode.trim();
+    const verificationCode = await VerificationCode.findOne({code: submittedCode});
+    const number = verificationCode ? verificationCode.data : undefined;
+
+    if (!verificationCode || !verificationCode.user.equals(req.user._id)) {
+        return res.status(403).json({
+            message: strings.invalidVerificationCode
+        });
+    }
+
+    await Recipient.delete({ number });
+    await VerificationCode.findByIdAndRemove(verificationCode._id);
+
+    const formattedPhone = `(${number.substr(0,3)}) ${number.substr(3,3)}-${number.substr(6,4)}`;
+
+    return res.status(200).json({
+    	message: `Successfully unsubscribed ${formattedPhone}`
+    });	
+});
+
+// Remove one or more recipients
 router.delete('/', isAuthenticated, async (req, res) => {
 
 	const query = {_id: {$in: req.query.recipients}};

app/routes/user.routes.js

@@ -67,7 +67,11 @@ router.put('/me/profile/phone', isAuthenticated, async (req, res) => {
     const submittedCode = req.body.verificationCode.trim();
     const verificationCode = await VerificationCode.findOne({code: submittedCode});
 
-    if (!verificationCode) return res.status(403).json({message: strings.invalidVerificationCode});
+    if (!verificationCode || verificationCode.user != req.user._id) {
+        return res.status(403).json({
+            message: strings.invalidVerificationCode
+        });
+    }
 
     const updatedUser = await User.findByIdAndUpdate(req.user._id, {$set: {
         phone: verificationCode.data