diff --git a/functions/handlers/post.js b/functions/handlers/post.js index 5f361fe..e3d0c01 100644 --- a/functions/handlers/post.js +++ b/functions/handlers/post.js @@ -15,29 +15,28 @@ exports.putPost = (req, res) => { }; admin.firestore().collection('posts').add(newPost) - .then((doc) => { - const resPost = newPost; - resPost.postId = doc.id; - return res.status(200).json(resPost); - }) - .catch((err) => { - console.error(err); - return res.status(500).json({ error: 'something is wrong'}); - }); + .then((doc) => { + const resPost = newPost; + resPost.postId = doc.id; + return res.status(200).json(resPost); + }) + .catch((err) => { + console.error(err); + return res.status(500).json({ error: 'something is wrong'}); + }); }; exports.getallPostsforUser = (req, res) => { - admin.firestore().collection('posts').where('userHandle', '==', 'new user' ).get() - .then((data) => { - let posts = []; - data.forEach(function(doc) { - posts.push(doc.data()); - }); - return res.status(200).json(posts); - }) - .catch((err) => { - console.error(err); - return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'}) - }) - } + .then((data) => { + let posts = []; + data.forEach(function(doc) { + posts.push(doc.data()); + }); + return res.status(200).json(posts); + }) + .catch((err) => { + console.error(err); + return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'}) + }) +}; diff --git a/functions/handlers/users.js b/functions/handlers/users.js index 0d9c9e9..c59712f 100644 --- a/functions/handlers/users.js +++ b/functions/handlers/users.js @@ -1,4 +1,5 @@ /* eslint-disable promise/catch-or-return */ + const { admin, db } = require("../util/admin"); const config = require("../util/config"); const { validateUpdateProfileInfo } = require("../util/validator"); @@ -6,6 +7,8 @@ const { validateUpdateProfileInfo } = require("../util/validator"); const firebase = require("firebase"); firebase.initializeApp(config); +var handle2Email = new Map(); + exports.signup = (req, res) => { const newUser = { email: req.body.email, @@ -71,11 +74,12 @@ exports.signup = (req, res) => { .then((idToken) => { token = idToken; const userCred = { - email: req.body.email, + email: newUser.email, handle: newUser.handle, createdAt: newUser.createdAt, userId }; + handle2Email.set(userCred.handle, userCred.email); return db.doc(`/users/${newUser.handle}`).set(userCred); }) .then(() => { @@ -93,16 +97,22 @@ exports.signup = (req, res) => { exports.login = (req, res) => { const user = { email: req.body.email, + handle: req.body.handle, password: req.body.password }; // Auth validation let errors = {}; + const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + // Email check if (user.email.trim() === "") { errors.email = "Email must not be blank."; } + else if (!user.email.match(emailRegEx)) { + user.email = handle2Email.get(user.email); + } // Password check if (user.password.trim() === "") { @@ -125,7 +135,7 @@ exports.login = (req, res) => { }) .catch((err) => { console.error(err); - if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email") { + if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email" || err.code === "auth/user-not-found") { return res .status(403) .json({ general: "Invalid credentials. Please try again." }); @@ -134,6 +144,44 @@ exports.login = (req, res) => { }); }; +//Deletes user account +exports.deleteUser = (req, res) => { + var currentUser; + + firebase.auth().onAuthStateChanged(function(user) { + currentUser = user; + if (currentUser) { + /*db.collection("users").doc(`${currentUser.handle}`).delete() + .then(function() { + res.status(200).send("Removed user from database."); + return; + }) + .catch(function(err) { + res.status(500).send("Failed to remove user from database.", err); + });*/ + + //let ref = db.collection('users'); + //let userDoc = ref.where('userId', '==', currentUser.uid).get(); + //userDoc.ref.delete(); + + currentUser.delete() + .then(function() { + console.log("User successfully deleted."); + res.status(200).send("Deleted user."); + return; + }) + .catch(function(err) { + console.log("Error deleting user.", err); + res.status(500).send("Failed to delete user."); + }); + } + else { + console.log("Cannot get user."); + res.status(500).send("Cannot get user."); + } + }); +}; + // Returns all data in the database for the user who is currently signed in exports.getProfileInfo = (req, res) => { db.collection("users") @@ -153,7 +201,7 @@ exports.updateProfileInfo = (req, res) => { // TODO: Add functionality for adding/updating profile images // Data validation - const { valid, errors, profileData } = validateUpdateProfileInfo(req.body); + const { valid, errors, profileData } = validateUpdateProfileInfo(req); if (!valid) return res.status(400).json(errors); // Update the database entry for this user @@ -209,3 +257,5 @@ exports.getAuthenticatedUser = (req, res) => { return res.status(500).json({ error: err.code }); }); }; + + diff --git a/functions/index.js b/functions/index.js index a718b52..675b020 100644 --- a/functions/index.js +++ b/functions/index.js @@ -15,6 +15,7 @@ const { getProfileInfo, login, signup, + deleteUser, updateProfileInfo } = require("./handlers/users"); @@ -27,6 +28,9 @@ app.post("/signup", signup); // and password app.post("/login", login); +//Deletes user account +app.delete("/delete", deleteUser); + app.get("/getUser", fbAuth, getUserDetails); // Returns all profile data of the currently logged in user diff --git a/functions/package-lock.json b/functions/package-lock.json index a20f589..439a2e2 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -34,21 +34,6 @@ "dom-storage": "2.1.0", "tslib": "1.10.0", "xmlhttprequest": "1.8.0" - }, - "dependencies": { - "@firebase/logger": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", - "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" - }, - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/app-types": { @@ -70,15 +55,9 @@ "integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg==" }, "@firebase/database": { -<<<<<<< HEAD - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.3.tgz", - "integrity": "sha512-LnXKRE1AmjlS+iRF7j8vx+Ni8x85CmLP5u5Pw5rDKhKLn2eTR1tJKD937mUeeGEtDHwR1rrrkLYOqRR2cSG3hQ==", -======= "version": "0.5.4", "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz", "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==", ->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f "requires": { "@firebase/database-types": "0.4.3", "@firebase/logger": "0.1.25", @@ -113,11 +92,7 @@ "@firebase/firestore": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz", -<<<<<<< HEAD - "integrity": "sha512-CPYLvkGZBKE47oQC9a0q13UMVRj3LvnSbB1nOerktE3CGRHKy44LxDumamN8Kj067hV/80mKK9FdbeUufwO/Rg==", -======= "integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==", ->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f "requires": { "@firebase/firestore-types": "1.5.0", "@firebase/logger": "0.1.25", @@ -126,21 +101,6 @@ "@grpc/proto-loader": "^0.5.0", "grpc": "1.23.3", "tslib": "1.10.0" - }, - "dependencies": { - "@firebase/logger": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", - "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" - }, - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/firestore-types": { @@ -173,16 +133,6 @@ "@firebase/util": "0.2.28", "idb": "3.0.2", "tslib": "1.10.0" - }, - "dependencies": { - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/installations-types": { @@ -190,6 +140,11 @@ "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.1.2.tgz", "integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ==" }, + "@firebase/logger": { + "version": "0.1.25", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", + "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" + }, "@firebase/messaging": { "version": "0.4.11", "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz", @@ -198,16 +153,6 @@ "@firebase/messaging-types": "0.3.2", "@firebase/util": "0.2.28", "tslib": "1.10.0" - }, - "dependencies": { - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/messaging-types": { @@ -225,21 +170,6 @@ "@firebase/performance-types": "0.0.3", "@firebase/util": "0.2.28", "tslib": "1.10.0" - }, - "dependencies": { - "@firebase/logger": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", - "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" - }, - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/performance-types": { @@ -272,16 +202,6 @@ "@firebase/storage-types": "0.3.3", "@firebase/util": "0.2.28", "tslib": "1.10.0" - }, - "dependencies": { - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "@firebase/storage-types": { @@ -289,6 +209,14 @@ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz", "integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w==" }, + "@firebase/util": { + "version": "0.2.28", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", + "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", + "requires": { + "tslib": "1.10.0" + } + }, "@firebase/webchannel-wrapper": { "version": "0.2.26", "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.26.tgz", @@ -607,12 +535,6 @@ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -830,28 +752,28 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } } }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - } - } -}, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -1190,15 +1112,9 @@ } }, "end-of-stream": { -<<<<<<< HEAD - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", -======= "version": "1.4.3", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz", "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==", ->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f "optional": true, "requires": { "once": "^1.4.0" @@ -1274,7 +1190,6 @@ "progress": "^2.0.0", "regexpp": "^2.0.1", "semver": "^5.5.1", - "strip-ansi": "^4.0.0", "strip-json-comments": "^2.0.1", "table": "^5.2.3", "text-table": "^0.2.0" @@ -1556,33 +1471,6 @@ "@firebase/polyfill": "0.3.22", "@firebase/storage": "0.3.12", "@firebase/util": "0.2.28" - }, - "dependencies": { - "@firebase/database": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz", - "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==", - "requires": { - "@firebase/database-types": "0.4.3", - "@firebase/logger": "0.1.25", - "@firebase/util": "0.2.28", - "faye-websocket": "0.11.3", - "tslib": "1.10.0" - } - }, - "@firebase/logger": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", - "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" - }, - "@firebase/util": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", - "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", - "requires": { - "tslib": "1.10.0" - } - } } }, "firebase-admin": { @@ -1710,8 +1598,7 @@ "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "optional": true + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" }, "gaxios": { "version": "2.0.1", @@ -2259,15 +2146,9 @@ } }, "gtoken": { -<<<<<<< HEAD - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.0.0.tgz", - "integrity": "sha512-XaRCfHJxhj06LmnWNBzVTAr85NfAErq0W1oabkdqwbq3uL/QTB1kyvGog361Uu2FMG/8e3115sIy/97Rnd4GjQ==", -======= "version": "4.1.0", "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.0.tgz", "integrity": "sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw==", ->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f "optional": true, "requires": { "gaxios": "^2.0.0", @@ -2441,8 +2322,7 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "optional": true + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "inflight": { "version": "1.0.6", @@ -2457,8 +2337,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "optional": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "inquirer": { "version": "6.5.2", @@ -2476,7 +2355,6 @@ "mute-stream": "0.0.7", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" }, @@ -2525,14 +2403,6 @@ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", "optional": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -2929,7 +2799,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "optional": true, "requires": { "wrappy": "1" } @@ -3374,8 +3243,7 @@ "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "optional": true + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "slice-ansi": { "version": "2.1.0", @@ -3384,8 +3252,7 @@ "dev": true, "requires": { "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" + "astral-regex": "^1.0.0" } }, "snakeize": { @@ -3425,31 +3292,12 @@ "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "optional": true }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -3496,7 +3344,6 @@ "dev": true, "requires": { "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } }, @@ -3755,8 +3602,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "optional": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write": { "version": "1.0.3", diff --git a/functions/util/fbAuth.js b/functions/util/fbAuth.js index 3b59d14..35253e7 100644 --- a/functions/util/fbAuth.js +++ b/functions/util/fbAuth.js @@ -32,6 +32,7 @@ module.exports = (req, res, next) => { .then((data) => { req.user.handle = data.docs[0].data().handle; // Save username req.user.imageUrl = data.docs[0].data().imageUrl; + req.userData = data.docs[0].data(); // Stores all user data from the database return next(); }) .catch((err) => { diff --git a/functions/util/validator.js b/functions/util/validator.js index c2b1240..8265d6b 100644 --- a/functions/util/validator.js +++ b/functions/util/validator.js @@ -9,23 +9,39 @@ const isEmpty = (str) => { else return false; }; -exports.validateUpdateProfileInfo = (data) => { +exports.validateUpdateProfileInfo = (req) => { + const newData = req.body; + // const oldData = req.userData; let errors = {}; - let profileData = {}; + let profileData = req.userData; // ?: Should users be able to change their handles and emails? - // Only adds the key to the database if the values are not empty - if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim(); - if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim(); - if (!isEmpty(data.bio)) profileData.bio = data.bio.trim(); + // Deletes any unused keys so that they aren't stored in the database + if (newData.firstName) { + profileData.firstName = newData.firstName.toString().trim(); + } else { + delete profileData.firstName; + } - if (isEmpty(data.email)) { + if (newData.lastName) { + profileData.lastName = newData.lastName.toString().trim(); + } else { + delete profileData.lastName; + } + + if (newData.bio) { + profileData.bio = newData.bio.toString().trim(); + } else { + delete profileData.bio; + } + + if (isEmpty(newData.email)) { errors.email = "Must not be empty."; - } else if (!isEmail(data.email)) { + } else if (!isEmail(newData.email)) { errors.email = "Must be a valid email."; } else { - profileData.email = data.email; + profileData.email = newData.email; } return { diff --git a/package-lock.json b/package-lock.json index c7bbe95..c65b0ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,15 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "axios": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", + "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "requires": { + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -164,6 +173,24 @@ "unpipe": "~1.0.0" } }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } + } + }, "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -204,6 +231,16 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "jwt-decode": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz", + "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk=" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", diff --git a/twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json b/twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json deleted file mode 100644 index d24aa3c..0000000 --- a/twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "twistter-e4649", - "private_key_id": "1e57494429e4fd7d17f6fc28524e14b8e5227596", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyRdMZwXrpf3HB\nsVrGZVoPt+S+ahkT4SCCEWV/Q4O4hVyW277Rs0p7k5ZkZfkhcVVBUqKGMgW/Esvz\npx0VIgpg3gg308kMRmC3MGzYbodjynVyDHatyAZhhUi9cg0N2K9+vSsW5eSmWROe\nfVvB8hvr6m5xGVdJFA7DV4/0vm2cfy+Q/FlFb6vFmQTZtPZzGFf5BKoNMe7pMxey\n4zspAIZgRmxWDbAqqzX0PYk/WbXFgH/wn2X25S+ArHhoay2Hms65/NbWCV6mpFUJ\nYqzrlCn/WcwXGAm7tjmu00yD+bARabImh8R7+PSBaHMQ+SGdri2snIXWsvB/xi9/\nSNFqzHynAgMBAAECggEAVty/zapg1bnTt0FPziBfIA6FpaPzoSSN3uJUFozSdwuA\nAD+E/A9EiO7yFew71egvVrtJVmK0OxQRDSDNglkKPoWg8na+XL1D7a5qMpC0ZlKl\nJBNfljBCr6yuMySJqMf+Rp4siyUr4kO/0/cXyOnLYglhk7j5tzFPOi4FhgZtSRU9\nYckk5wwcBObUFE0Rmqf0gPcI9WuFUkusIjz3rjuEju1/U6E/VV5gHmMuQy3f9LHB\nnsiLAobx9+TGgs12CvkjWYpW5raUCCn5z/EYNPZSt7rg9CSWqXW009HCfTqi6i7o\nNpZ7qpp5DVQdHNFJunSGvI+k44+i8OE7HEY4xXt+OQKBgQDZ/E1QwJQoHuzPkrGW\nAc0a+NQeG8NwaXwsezlvYXMTbL27SxKXC3dzPT1WgNUKpaKj3wLJPar4NgPPSPi3\nqgmcvMqgwm4B+HPbXc1oxBS7/jD3pWJVyPO9Re17Uc0RYV/DORQhWe1Yq7TyMHvl\nbD/KqIvOxswigVxK4JMIxp4s7wKBgQDRXJfb4BHdR7CGfuTVQ19gH5uLgrK9ezBk\nQOLK+u9yBpoKyYSnD3OH/i0wG5bm3rUegzvwHGKKhDfiLbajMIt04n2DuVUm57HQ\n+Jca29V8XMWfhTbu3kDl+OOFmLvPCwg8C9edNTJWUVYu3EbwsyzCQY5TDroWGQdF\n6cQIkAIbyQKBgQCUtWd1UHuCR16cWOHniQEIhnoGtEAHHx9EJShQkLV1qfhhnlxn\nSL5LkpqWubsc0VR74LbA3N4XCJpevdRXT5vRHoZJV3q+w2UeYQaxkxrmCQoU1/GW\nvklxdRQGzg5M7hXrU7Qk8HlXxYPiuSq8n7WBJqyB+uLmI0P4HO6RzRW5ZwKBgBkr\nf5pQkvU+dCuHP+2fvuyogCPCn8iF8ehroJh0mKrlvklDtu36vpH/7eDVwEubRL0Z\nW/BfCT3L7YgEpOtzn6B6xko60tDtlAQijtAM09qysJOgCV2oXLcJOBlMpm+azO+j\nINXmmlmkR680jlbLw7rK9NhpcdfMRIKUOxwobAh5AoGBAJMN6n7Hy8nJRJZ18iHY\n3hEkVbKrLLMMHFDQj5BZQCeAp1v0Fj30RYJWS4hTzR9ht0MtdmPub460lh9hhqCM\nl3UnCJoz00ApF3Z2FRN/l0KpCFD9Gw2Hjyc3u9sEUpqd8G3cg3IZE6eZ6CZWljFT\nHcuQ2cTFdB8bq8oLUxXeY3Yv\n-----END PRIVATE KEY-----\n", - "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com", - "client_id": "102241295911303209723", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com" -} diff --git a/twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json b/twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json new file mode 100644 index 0000000..3d3ce5d --- /dev/null +++ b/twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "twistter-e4649", + "private_key_id": "382fc005e17340a21dd39079feca75371330644d", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL1bwTpEluR6dJ\nVfS/K1d76j2I3Wrn4qSbrTYm4/cAPBPlsBRO0bwrkhr+g0I6rwW/fFz8udjNAFB1\nfDfz769buR6go5us71I5LxMNviIhzFr59ZsEkcnUCgW8G7koicLEjWdstI4lJxZT\nRRolH+SFpPwsQAY399zjdBiCC8STbavVVhe+ChEDl/S2K72W7A7nWSMbLsyGsz2o\nQ9uIG3onwFNE7WRIeObWCxSBKlydMmTJ+p/CsTdFY4fUHb97QsMEmzRJox10kmyt\nP9l5wfJ2wUYvRXRJKq7Mwx1UnLduXP2oe/XvR5fzJLJ780HO6BNBf5IKcTHXHVBA\ne6ZtiL5dAgMBAAECggEAFvfN1NttjXL0KKak3hMA1+z8Y2WqXC1aUFMOMlz8Qhct\nmXNjy8CFAYEvGtVTgHqkR9Vi7PShYfLSc3U8diI155H5H4S6pUaPmfNHTwRzosyn\ncQRPJA6sEqvRGvHMxVfwjbvultMpiTTZpnxiMSNiLqT5PUs26CuSb5bErt1V7dP5\nn/lhY+4rzfXSrw38ZsO/gEvLZ/7iRA+JZgqE3Qs2cD5idxqqOcOLLiW741JpXTmd\n5ug/urJgSyvz+cNo3yHnajEtAxiSfkpU4sUHZ/WWqaRGWxpt3XWILtR9Q/4afPeM\n/T82YvddoW5pUwDpgvZxdVYjopuoxvnS298L0AGySQKBgQDqDD7Yh6SbOR3w4ZN9\nRO7q5KiJbyZmVdZ3lLZddsL/vto9JkUtnLDOMpYnb2TezGfN6ErzAkRQCSUsWK4m\nERbSK6oyUvevhlt/gHGP34uc/OCxGk2D7WCAS3s54ofDt2369tzIpGjsnkYM+h3b\nuZ5lFoWHG1YM3JtgcIIU6UygTwKBgQDe9ArV08wPDuXf4rcldmImQDB7xhGcg9xU\njAKEn5FZW1mvmBy3Sq1qpZj0baZz6eEDn6FBLwH1Ke5gdfrd8WnESUNnFnBBqpA1\nospIgUmKZ1sjyly9CHMQ11Kbzt7+kA9GYZrMbaMjS8M18qFEBZ7CoPLv5DLyabJW\nOkPzTwb/kwKBgQDR3fUkmEzj202bx8pHE97gxfTSd9aJAQN06uaz3GByjyKGnqB9\ni/mGjBnUdrCOj9+s5VT/ntK+qdSpdUODYuOBxiGxSnBK9kFpjTVHe35nYOHiLOHB\nIMPdhtGSUCzJNNvrpBzJ1ZM4SZwq2sSXWFRN9On7Amog0liJG5mpQqGxRQKBgHmP\nzFycF3XaZKH2xm8ppgg/FXBXJYEWMEr07+aJ7kEvWq4wHPAfSoCMe+JB6vDmg2Zr\nYgvdao7W5v83NKpQl5+LZrHNfTWAnxJviSWRQJyzD/Fqw7fZ5Is5K/SCDfn0aC+y\nxilSWhHDnFNM0Hr7KX3rLap43QJpePAk4qnF3AX7AoGBAOe5C1VMKoTapnxvo/FI\nBCvXw05SSEExfXVR0ryoqUxgu1asCkYyJSoWxOZQ+33npQ1/zV1mCXn/lNZcyveW\nZ5/cUw71grW8KBYFrW7LeQIzjZb7xPI3Z4EV0uYd2b69GkQk1buHj/gsswRhGEvx\nJM1DN1SCenbGcVLprM0vVelp\n-----END PRIVATE KEY-----\n", + "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com", + "client_id": "102241295911303209723", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com" +} diff --git a/twistter-frontend/README.md b/twistter-frontend/README.md index f41c183..e4bc8be 100644 --- a/twistter-frontend/README.md +++ b/twistter-frontend/README.md @@ -1,5 +1,10 @@ This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app). + +Cloud: https://us-central1-twistter-e4649.cloudfunctions.net/api +Local: http://localhost:5001/twistter-e4649/us-central1/api (npm install --save firebase) + + Below you will find some information on how to perform common tasks.
You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md). diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js index 6306ab1..db0c81c 100644 --- a/twistter-frontend/src/App.js +++ b/twistter-frontend/src/App.js @@ -27,6 +27,7 @@ import signup from './pages/Signup'; import login from './pages/Login'; import user from './pages/user'; import logout from './pages/Logout'; +import Delete from './pages/Delete'; import writeMicroblog from './Writing_Microblogs.js'; import editProfile from './pages/editProfile'; import userLine from './Userline.js'; @@ -63,6 +64,7 @@ class App extends Component { + diff --git a/twistter-frontend/src/components/layout/NavBar.js b/twistter-frontend/src/components/layout/NavBar.js index 92ad833..5f8d28d 100644 --- a/twistter-frontend/src/components/layout/NavBar.js +++ b/twistter-frontend/src/components/layout/NavBar.js @@ -50,9 +50,12 @@ import withStyles from "@material-ui/core/styles/withStyles"; - + + ) diff --git a/twistter-frontend/src/pages/Delete.js b/twistter-frontend/src/pages/Delete.js new file mode 100644 index 0000000..ab610b1 --- /dev/null +++ b/twistter-frontend/src/pages/Delete.js @@ -0,0 +1,56 @@ +/* eslint-disable */ +import React, { Component } from "react"; +import PropTypes from "prop-types"; + +// Material UI stuff +import Button from "@material-ui/core/Button"; +import withStyles from "@material-ui/core/styles/withStyles"; + +// Redux stuff +import { logoutUser } from "../redux/actions/userActions"; +import { connect } from "react-redux"; + +const styles = { + form: { + textAlign: "center" + }, + textField: { + marginBottom: 30 + }, + pageTitle: { + marginBottom: 40 + }, + button: { + positon: "relative", + marginBottom: 30 + }, + progress: { + position: "absolute" + } +}; + +export class Delete extends Component { + + componentDidMount() { + this.props.logoutUser(); + this.props.history.push('/'); + } + + render() { + return null; + } +} + +const mapStateToProps = (state) => ({ + user: state.user +}); + +const mapActionsToProps = { logoutUser }; + +Delete.propTypes = { + logoutUser: PropTypes.func.isRequired, + user: PropTypes.object.isRequired, + classes: PropTypes.object.isRequired +}; + +export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Delete)); diff --git a/twistter-frontend/src/pages/Login.js b/twistter-frontend/src/pages/Login.js index 7e3be76..ef7e5c4 100644 --- a/twistter-frontend/src/pages/Login.js +++ b/twistter-frontend/src/pages/Login.js @@ -146,7 +146,7 @@ export class Login extends Component { )} {errors.general && ( - Wrong Email or Password + Invalid username/email or password )} diff --git a/twistter-frontend/src/pages/Signup.js b/twistter-frontend/src/pages/Signup.js index d4b9c3c..91e4e52 100644 --- a/twistter-frontend/src/pages/Signup.js +++ b/twistter-frontend/src/pages/Signup.js @@ -159,7 +159,7 @@ export class Signup extends Component { )} {errors.general && ( - Wrong Email or Password + Invalid username/email or password )} diff --git a/twistter-frontend/src/pages/editProfile.js b/twistter-frontend/src/pages/editProfile.js index 3c3c51b..ff6f3f7 100644 --- a/twistter-frontend/src/pages/editProfile.js +++ b/twistter-frontend/src/pages/editProfile.js @@ -88,6 +88,14 @@ export class edit extends Component { handle: this.state.handle, bio: this.state.bio }; + + // Removes all keys from newProfileData that are empty, undefined, or null + Object.keys(newProfileData).forEach(key => { + if (newProfileData[key] === "" || newProfileData[key] === undefined || newProfileData[key] === null) { + delete newProfileData[key]; + } + }) + axios .post("/updateProfileInfo", newProfileData) .then((res) => { diff --git a/twistter-frontend/src/redux/actions/userActions.js b/twistter-frontend/src/redux/actions/userActions.js index 9b9b9a1..5993804 100644 --- a/twistter-frontend/src/redux/actions/userActions.js +++ b/twistter-frontend/src/redux/actions/userActions.js @@ -61,6 +61,26 @@ export const logoutUser = () => (dispatch) => { dispatch({ type: SET_UNAUTHENTICATED }); } +export const deleteUser = () => (dispatch) => { + axios + .delete("/delete") + .then((res) => { + console.log(res); + console.log("User account successfully deleted."); + } + ) + .catch((err) => { + dispatch ({ + type: SET_ERRORS, + payload: err.response.data, + }) + }); + + localStorage.removeItem('FBIdToken'); + delete axios.defaults.headers.common['Authorization']; + dispatch({ type: SET_UNAUTHENTICATED }); +} + const setAuthorizationHeader = (token) => { const FBIdToken = `Bearer ${token}`; localStorage.setItem('FBIdToken', FBIdToken);