From 13dc08038841d41b35e257539a5f1594a1c78ddb Mon Sep 17 00:00:00 2001 From: kyle hoell Date: Mon, 7 Dec 2020 21:06:22 -0500 Subject: [PATCH] removed unneeded comments --- backend/controllers/file.ts | 4 ---- backend/controllers/user.ts | 6 ------ backend/cookies/createCookies.ts | 2 -- backend/db/utils/folderUtils/index.ts | 3 --- backend/models/user.ts | 2 -- .../ChunkService/FileSystemService.ts | 3 --- backend/services/ChunkService/MongoService.ts | 3 --- backend/services/ChunkService/S3Service.ts | 5 ----- backend/services/FolderService/index.ts | 2 -- backend/services/UserService/index.ts | 1 - backend/utils/createQuery.ts | 3 --- backend/utils/sendShareEmail.ts | 1 - backend/utils/userUpdateCheck.ts | 2 -- src/actions/auth.js | 4 ---- src/actions/files.js | 21 ------------------- src/actions/folders.js | 2 -- src/actions/selectedItem.js | 2 -- src/components/Dataform/index.js | 6 ------ src/components/Header/index.js | 3 --- src/components/Homepage/index.js | 3 --- src/components/SettingsPage/index.js | 2 -- webUI/src/index.js | 2 -- 22 files changed, 82 deletions(-) diff --git a/backend/controllers/file.ts b/backend/controllers/file.ts index 1a2e090..ae7bbec 100644 --- a/backend/controllers/file.ts +++ b/backend/controllers/file.ts @@ -147,8 +147,6 @@ class FileController { const id = req.params.id; const userID = req.user._id; - - console.log("remove link", id); await fileService.removeLink(userID, id) @@ -547,8 +545,6 @@ class FileController { const fileID = req.body.id; const userID = req.user._id; const parentID = req.body.parent; - - console.log(fileID, userID, parentID); await fileService.moveFile(userID, fileID, parentID); diff --git a/backend/controllers/user.ts b/backend/controllers/user.ts index 2047ca4..5f6882c 100644 --- a/backend/controllers/user.ts +++ b/backend/controllers/user.ts @@ -82,14 +82,10 @@ class UserController { try { - console.log("\nCreating New Refresh Token...") - const user = req.user; if (!user) throw new NotFoundError("User Not Found"); - console.log("tokens", user.tokens.length); - const {accessToken, refreshToken} = await user.generateAuthToken(req.clientIp); if (!accessToken || !refreshToken) throw new InternalServerError("User/Access/Refresh Token Missing"); @@ -98,8 +94,6 @@ class UserController { res.status(201).send(); - console.log("New Refresh Token And Access Token Sent"); - } catch (e) { console.log("\nGet Refresh Token User Route Error:", e.message); diff --git a/backend/cookies/createCookies.ts b/backend/cookies/createCookies.ts index 0f87a4f..81c17f6 100644 --- a/backend/cookies/createCookies.ts +++ b/backend/cookies/createCookies.ts @@ -7,8 +7,6 @@ const maxAgeStreamVideo = 60 * 1000 * 60 * 24; const secureCookies = env.secureCookies ? env.secureCookies === "true" ? true : false : false; -console.log("Secure Cookies", secureCookies); - export const createLoginCookie = (res: Response, accessToken: string, refreshToken: string) => { res.cookie("access-token",accessToken, { diff --git a/backend/db/utils/folderUtils/index.ts b/backend/db/utils/folderUtils/index.ts index 6831954..f6515a8 100644 --- a/backend/db/utils/folderUtils/index.ts +++ b/backend/db/utils/folderUtils/index.ts @@ -56,8 +56,6 @@ class DbUtil { // query = {...query, "personalFolder": null} // } - console.log("folder query", query); - const folderList = await Folder.find(query) .sort(sortBy) as FolderInterface[]; @@ -71,7 +69,6 @@ class DbUtil { if (type) { if (type === "mongo") { query = {...query, "personalFolder": null} - console.log("mongo query", query) } else { query = {...query, "personalFolder": true} } diff --git a/backend/models/user.ts b/backend/models/user.ts index acecd27..a33f57b 100644 --- a/backend/models/user.ts +++ b/backend/models/user.ts @@ -251,7 +251,6 @@ userSchema.statics.findByCreds = async(email: string, password: string) => { const isMatch = await bcrypt.compare(password, user.password); if (!isMatch) { - console.log("incorrect password") throw new Error("Incorrect password"); } @@ -596,7 +595,6 @@ userSchema.methods.decryptS3Data = async function() { userSchema.methods.generatePasswordResetToken = async function() { - console.log("generating reset password token") const iv = crypto.randomBytes(16); const user = this as UserInterface; diff --git a/backend/services/ChunkService/FileSystemService.ts b/backend/services/ChunkService/FileSystemService.ts index e719fd9..b930dac 100644 --- a/backend/services/ChunkService/FileSystemService.ts +++ b/backend/services/ChunkService/FileSystemService.ts @@ -404,7 +404,6 @@ class FileSystemService implements ChunkInterface { await awaitStream(readStream.pipe(decipher), res, allStreamsToErrorCatch); if (file.metadata.linkType === "one") { - console.log("removing public link"); await dbUtilsFile.removeOneTimePublicLink(fileID); } } @@ -468,8 +467,6 @@ class FileSystemService implements ChunkInterface { deleteAll = async(userID: string) => { - console.log("remove all request") - await Folder.deleteMany({"owner": userID}); const fileList = await dbUtilsFile.getFileListByOwner(userID); diff --git a/backend/services/ChunkService/MongoService.ts b/backend/services/ChunkService/MongoService.ts index 6d743a9..e79b774 100644 --- a/backend/services/ChunkService/MongoService.ts +++ b/backend/services/ChunkService/MongoService.ts @@ -271,7 +271,6 @@ class MongoService implements ChunkInterface { await awaitStream(readStream.pipe(decipher), res, allStreamsToErrorCatch); if (file.metadata.linkType === "one") { - console.log("removing public link"); await dbUtilsFile.removeOneTimePublicLink(fileID); } } @@ -454,8 +453,6 @@ class MongoService implements ChunkInterface { deleteAll = async(userID: string) => { - console.log("remove all request") - let bucket = new mongoose.mongo.GridFSBucket(conn.db, { chunkSizeBytes: 1024 * 255 }); diff --git a/backend/services/ChunkService/S3Service.ts b/backend/services/ChunkService/S3Service.ts index 84d9fe9..053571b 100644 --- a/backend/services/ChunkService/S3Service.ts +++ b/backend/services/ChunkService/S3Service.ts @@ -203,8 +203,6 @@ class S3Service implements ChunkInterface { const decipher = crypto.createDecipheriv('aes256', CIPHER_KEY, IV); - console.log("download personal file", currentFile.filename); - res.set('Content-Type', 'binary/octet-stream'); res.set('Content-Disposition', 'attachment; filename="' + currentFile.filename + '"'); res.set('Content-Length', currentFile.metadata.size.toString()); @@ -466,7 +464,6 @@ class S3Service implements ChunkInterface { await awaitStream(readStream.pipe(decipher), res, allStreamsToErrorCatch); if (file.metadata.linkType === "one") { - console.log("removing public link"); await dbUtilsFile.removeOneTimePublicLink(fileID); } } @@ -538,8 +535,6 @@ class S3Service implements ChunkInterface { deleteAll = async(userID: string) => { - console.log("remove all request") - await Folder.deleteMany({"owner": userID}); const fileList = await dbUtilsFile.getFileListByOwner(userID); diff --git a/backend/services/FolderService/index.ts b/backend/services/FolderService/index.ts index 5506f59..871f9bf 100644 --- a/backend/services/FolderService/index.ts +++ b/backend/services/FolderService/index.ts @@ -171,8 +171,6 @@ class FolderService { if (rootID === currentID) break; - console.log("finding ID", currentID) - const currentFolder = await this.getFolderInfo(userID, currentID); const currentSubFolders = await this.getFolderList(user, {parent: currentFolder._id}); diff --git a/backend/services/UserService/index.ts b/backend/services/UserService/index.ts index def236a..2579e68 100644 --- a/backend/services/UserService/index.ts +++ b/backend/services/UserService/index.ts @@ -70,7 +70,6 @@ class UserService { if (currentEncryptedToken === encryptedToken) { - console.log("Refresh Token Found Logout!"); user.tokens.splice(i, 1); await user.save(); break; diff --git a/backend/utils/createQuery.ts b/backend/utils/createQuery.ts index 0592842..ffdd7a5 100644 --- a/backend/utils/createQuery.ts +++ b/backend/utils/createQuery.ts @@ -64,9 +64,6 @@ const createQuery = (owner: string, parent: string, sortBy: string, startAt: num // query = {...query, "metadata.personalFile": true} // } - console.log("storage type", storageType) - console.log("query", query); - return query; } diff --git a/backend/utils/sendShareEmail.ts b/backend/utils/sendShareEmail.ts index 29e8921..2d7b0cc 100644 --- a/backend/utils/sendShareEmail.ts +++ b/backend/utils/sendShareEmail.ts @@ -24,7 +24,6 @@ const sendShareEmail = async (file: any, respient: string) => { } await sgMail.send(msg); - console.log("Share email sent"); } export default sendShareEmail \ No newline at end of file diff --git a/backend/utils/userUpdateCheck.ts b/backend/utils/userUpdateCheck.ts index d55fd25..8e9dea7 100644 --- a/backend/utils/userUpdateCheck.ts +++ b/backend/utils/userUpdateCheck.ts @@ -19,8 +19,6 @@ type userAccessType = { const userUpdateCheck = async(res: Response, id: string, ipAddress: string | undefined) => { - console.log("Loading full user for email verification check"); - const updatedUser = await User.findById(id); if (!updatedUser) throw new NotFoundError("Cannot find updated user auth"); diff --git a/src/actions/auth.js b/src/actions/auth.js index 751771a..5484f80 100755 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -35,8 +35,6 @@ export const startLogin = (email, password, currentRoute) => { //window.localStorage.setItem("token", token); - console.log("USER SERVICE LOGIN RESPONSE", response.data.user); - if (emailVerified) { dispatch(setLoginFailed(false)) @@ -115,8 +113,6 @@ export const startLoginCheck = (currentRoute) => { return (dispatch) => { axios.get("/user-service/user").then((response) => { - - console.log("USER SERVICE LOGIN CHECK RESPONSE", response.data); const emailVerified = response.data.emailVerified; diff --git a/src/actions/files.js b/src/actions/files.js index 363974c..5102bc7 100644 --- a/src/actions/files.js +++ b/src/actions/files.js @@ -67,8 +67,6 @@ export const startSetFileAndFolderItems = (historyKey, parent="/", sortby="DEFAU if (search && search !== "") { //fileURL = - console.log("Searching"); - // if (storageType === "stripe") { // console.log("Pied Search") @@ -190,8 +188,6 @@ export const startSetAllItems = (clearCache, parent="/", sortby="DEFAULT", searc const quickItemsURL = !env.googleDriveEnabled ? `/file-service/quick-list` : `/file-service-google-mongo/quick-list`; - console.log("google drive enabled", env.googleDriveEnabled); - dispatch(setFiles([])) dispatch(setFolders([])) dispatch(setQuickFiles([])) @@ -235,12 +231,8 @@ export const startSetFiles = (parent="/", sortby="DEFAULT", search="", isGoogle= dispatch(setFiles([])) dispatch(setLoading(true)) - console.log("Fetching file list"); - if (env.googleDriveEnabled) { - console.log("is google") - axios.get(`/file-service-google/list?parent=${parent}&sortby=${sortby}&search=${search}&limit=${limit}&storageType=${storageType}`).then((results) => { const googleList = results.data; @@ -259,8 +251,6 @@ export const startSetFiles = (parent="/", sortby="DEFAULT", search="", isGoogle= }) } else if (env.googleDriveEnabled && parent === "/") { - console.log("is not google") - // Temp Google Drive API axios.get(`/file-service-google-mongo/list?parent=${parent}&sortby=${sortby}&search=${search}&limit=${limit}&storageType=${storageType}`).then((results) => { // console.log("Google Data", results.data.data.files); @@ -283,9 +273,6 @@ export const startSetFiles = (parent="/", sortby="DEFAULT", search="", isGoogle= }) } else { - console.log("is not google") - - axios.get(`/file-service/list?parent=${parent}&sortby=${sortby}&search=${search}&limit=${limit}&storageType=${storageType}`).then((results) => { const mongoData = results.data; @@ -316,10 +303,6 @@ export const startLoadMoreFiles = (parent="/", sortby="DEFAULT", search="", star return (dispatch) => { - console.log("search", search) - - //dispatch(setLoading(true)) - dispatch(setLoadingMoreItems(true)); let limit = window.localStorage.getItem("list-size") || 50 @@ -327,8 +310,6 @@ export const startLoadMoreFiles = (parent="/", sortby="DEFAULT", search="", star if (isGoogle) { - console.log("is google") - // Temp Google Drive API axios.get(`/file-service-google/list?limit=${limit}&parent=${parent}&sortby=${sortby}&search=${search}&startAt=${true}&startAtDate=${startAtDate}&startAtName=${startAtName}&pageToken=${pageToken}`).then((results) => { @@ -351,8 +332,6 @@ export const startLoadMoreFiles = (parent="/", sortby="DEFAULT", search="", star } else { - console.log("is not google") - axios.get(`/file-service/list?limit=${limit}&parent=${parent}&sortby=${sortby}&search=${search}&startAt=${true}&startAtDate=${startAtDate}&startAtName=${startAtName}`).then((results) => { //console.log("load more files result", results.data.length) diff --git a/src/actions/folders.js b/src/actions/folders.js index 958f7d0..3d3d78a 100644 --- a/src/actions/folders.js +++ b/src/actions/folders.js @@ -112,8 +112,6 @@ export const startRemoveFolder = (id, parentList, isGoogle=false, parent, person const url = isGoogle ? `/folder-service-google/remove` : personalFolder ? `/folder-service-personal/remove` : `/folder-service/remove`; - console.log("personal folder", personalFolder); - axios.delete(url, { data }).then((response) => { diff --git a/src/actions/selectedItem.js b/src/actions/selectedItem.js index 9bd538a..01abb19 100644 --- a/src/actions/selectedItem.js +++ b/src/actions/selectedItem.js @@ -25,8 +25,6 @@ export const startSetSelectedItem = (id, file, fromQuickItems, isGoogleDrive) => axios.get(`/file-service-google/info/${id}`).then((results) => { - console.log("file info google", results.data, results.data.id); - const data = results.data; const {filename: name, length: size, uploadDate: date, parentName: location, metadata, _id: id} = results.data; diff --git a/src/components/Dataform/index.js b/src/components/Dataform/index.js index 4acf54b..a047551 100644 --- a/src/components/Dataform/index.js +++ b/src/components/Dataform/index.js @@ -17,8 +17,6 @@ class DataFormContainer extends React.Component { changeListViewMode = () => { - console.log("changing list view", this.props.listView); - if (!this.props.listView) { this.props.dispatch(enableListView()) } else { @@ -55,10 +53,6 @@ class DataFormContainer extends React.Component { loadMoreItems = () => { - // return; - - console.log("load more items dataform"); - let limit = window.localStorage.getItem("list-size") || 50 limit = parseInt(limit) diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 714c878..a8057ee 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -52,9 +52,6 @@ class HeaderContainer extends React.Component { const value = e.target.value; this.searchValue = value; - console.log("search on change", value); - - this.props.dispatch(setSearch(value)) this.searchSuggested() } diff --git a/src/components/Homepage/index.js b/src/components/Homepage/index.js index f3102e6..4b68d71 100644 --- a/src/components/Homepage/index.js +++ b/src/components/Homepage/index.js @@ -48,7 +48,6 @@ class HomePageContainer extends React.Component { this.props.dispatch(startResetParentList()); } else if (pathname.includes("/search")) { - console.log("login check set search") this.setSearchItems(); return; @@ -189,8 +188,6 @@ class HomePageContainer extends React.Component { const storageType = url.searchParams.get("storageType") || undefined; const folderSearch = url.searchParams.get("folder_search") || undefined; - console.log("Search", value, parent, storageType, folderSearch); - this.props.dispatch(startResetCache()) this.props.dispatch(setCurrentRouteType("search")) this.props.dispatch(setCachedSearch(value)) diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js index 4aa7777..036be04 100644 --- a/src/components/SettingsPage/index.js +++ b/src/components/SettingsPage/index.js @@ -70,8 +70,6 @@ class SettingsPageContainer extends React.Component { env.emailAddress = response.data.email this.props.dispatch(setParent(uuid.v4())) - console.log("user detailed", response.data) - this.setState(() => { return { ...this.state, diff --git a/webUI/src/index.js b/webUI/src/index.js index 7b57e30..d6d48fe 100644 --- a/webUI/src/index.js +++ b/webUI/src/index.js @@ -1,7 +1,5 @@ import axios from "axios"; -console.log("Hello, there", process.env.PORT); - const formElement = document.getElementById("form-submit") const inputElement = document.getElementById("input-password"); const mainDiv = document.getElementById("main-div")