removed some console logs, made it so broswerID check for axios should only load from localstorage once. Removed the IP address library from server.

This commit is contained in:
kyle hoell
2020-12-13 18:06:38 -05:00
parent 39b22ee2ab
commit 6b8b828aad
5 changed files with 7 additions and 41 deletions
-4
View File
@@ -26,10 +26,6 @@ const auth = async(req: RequestType, res: Response, next: NextFunction) => {
try {
console.log("auth uuid", req.headers.uuid);
// console.log(req.headers);
const accessToken = req.cookies["access-token"];
if (!accessToken) throw new Error("No Access Token");
-2
View File
@@ -87,8 +87,6 @@ const authRefresh = async(req: RequestType, res: Response, next: NextFunction) =
e.message !== "No User" &&
e.message !== "Refresh Token Not Found") console.log("\nAuthorization Refresh Middleware Error:", e.message);
console.log("refresh error", e.message);
res.status(401).send("Error Refreshing Token");
}
}
+4 -3
View File
@@ -18,7 +18,7 @@ import compression from "compression";
import http from "http";
import cookieParser from "cookie-parser";
import env from "../enviroment/env";
import requestIp from "request-ip";
// import requestIp from "request-ip";
const app = express();
const publicPath = path.join(__dirname, "..", "..", "public");
@@ -53,10 +53,11 @@ app.use(express.json());
app.use(express.static(publicPath));
app.use(bodyParser.json({limit: "50mb"}));
app.use(bodyParser.urlencoded({limit: "50mb", extended: true, parameterLimit:50000}))
app.use(requestIp.mw());
// app.use(requestIp.mw());
app.use(busboy({
highWaterMark: 2 * 1024 * 1024,
highWaterMark: 2 * 1024 * 1024,
}));
app.use(userRouter, fileRouter, folderRouter, storageRouter, googleFileRouter, personalFileRouter, googleFolderRouter, userPersonalRouter, userGoogleRouter);
+1 -29
View File
@@ -66,34 +66,6 @@ export const startSetFileAndFolderItems = (historyKey, parent="/", sortby="DEFAU
if (search && search !== "") {
//fileURL =
// if (storageType === "stripe") {
// console.log("Pied Search")
// fileURL = `/file-service/list?search=${search}&storageType=${storageType}`;
// folderURL = `/folder-service/list?search=${search}&storageType=${storageType}`
// if (folderSearch) {
// console.log("Folder Search")
// fileURL = `/file-service/list?search=${search}&folder_search=${true}&parent=${parent}`
// folderURL = `/folder-service/list?search=${search}&folder_search=${true}&parent=${parent}`
// } else {
// console.log("Everywhere Search")
// if (env.googleDriveEnabled) {
// fileURL = `/file-service-google-mongo/list?search=${search}`;
// folderURL = `/folder-service-google-mongo/list?search=${search}`;
// } else {
// fileURL = `/file-service/list?search=${search}`;
// folderURL = `/folder-service/list?search=${search}`;
// }
// }
if (env.googleDriveEnabled) {
fileURL = `/file-service-google-mongo/list?search=${search}`;
folderURL = `/folder-service-google-mongo/list?search=${search}`;
@@ -404,7 +376,7 @@ export const startAddFile = (uploadInput, parent, parentList, storageSwitcherTyp
dispatch(editUpload(currentID, currentProgress))
}
},
cancelToken: source.token
cancelToken: source.token,
};
dispatch(addUpload({id: currentID, progress: 0, name: currentFile.name, completed: false, source, canceled: false, size: currentFile.size}))
+2 -3
View File
@@ -1,6 +1,8 @@
import axios from 'axios';
import uuid from "uuid";
let browserIDCheck = localStorage.getItem("browser-id");
const sleep = () => {
return new Promise((resolve, reject) => {
setTimeout(() => {
@@ -16,7 +18,6 @@ const axios3 = axios.create();
axiosRetry.interceptors.request.use((config) => {
console.time("uuid-test")
let browserIDCheck = localStorage.getItem("browser-id");
if (!browserIDCheck) {
console.log("creating new UUID")
@@ -63,8 +64,6 @@ axiosRetry.interceptors.response.use((response) => {
return reject();
}
let browserIDCheck = localStorage.getItem("browser-id");
if (!browserIDCheck) {
console.log("creating new UUID")
browserIDCheck = uuid.v4();