oxmc/myDrive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more typescript support to the backend

Browse Source
This commit is contained in:
subnub
2020-04-18 00:16:31 -04:00
parent c70abc69bb
commit e18ae1eee1
19 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/db/mongoose.js
-29
View File
@@ -1,29 +0,0 @@
const mongoose = require("mongoose");
const env = require("../enviroment/env.js");
const fs = require("fs");
if (env.useDocumentDB === "true") {
console.log("Using DocumentDB");
mongoose.connect(env.mongoURL, {
useNewUrlParser: true,
useCreateIndex: true,
useUnifiedTopology: true,
sslValidate: true,
useNewUrlParser: true,
sslCA: fs.readFileSync('./rds-combined-ca-bundle.pem')
})
} else {
mongoose.connect(env.mongoURL, {
useNewUrlParser: true,
useCreateIndex: true,
useUnifiedTopology: true,
})
}
module.exports = mongoose;
backend/db/mongoose.ts
+43
View File
@@ -0,0 +1,43 @@
import mongoose from "mongoose";
import env from "../enviroment/env";
import fs from "fs";
const DBUrl = env.mongoURL as string;
if (env.useDocumentDB === "true") {
console.log("Using DocumentDB");
if (env.documentDBBundle === "true") {
const fileBuffer = fs.readFileSync('./rds-combined-ca-bundle.pem');
const mongooseCertificateConnect = mongoose as any;
mongooseCertificateConnect.connect(DBUrl, {
useCreateIndex: true,
useUnifiedTopology: true,
sslValidate: true,
sslCA: fileBuffer
})
} else {
mongoose.connect(DBUrl, {
useNewUrlParser: true,
useCreateIndex: true,
useUnifiedTopology: true,
sslValidate: true,
})
}
} else {
mongoose.connect(DBUrl, {
useNewUrlParser: true,
useCreateIndex: true,
useUnifiedTopology: true,
})
}
export default mongoose;
backend/db/utils/fileUtils/index.js
+3 -2
View File
@@ -1,4 +1,4 @@
const mongoose = require("../../mongoose")
import mongoose from "../../mongoose";
const conn = mongoose.connection;
const ObjectID = require('mongodb').ObjectID
@@ -163,4 +163,5 @@ const DbUtil = function() {
}
module.exports = DbUtil;
module.exports = DbUtil;
export default DbUtil;
backend/db/utils/folderUtils/index.js
+2 -1
View File
@@ -58,4 +58,5 @@ const DbUtil = function() {
}
}
module.exports = DbUtil;
module.exports = DbUtil;
export default DbUtil;
backend/enviroment/env.js → backend/enviroment/env.ts
+2 -1
View File
@@ -11,5 +11,6 @@ export default {
s3ID: process.env.S3_ID,
s3Key: process.env.S3_KEY,
s3Bucket: process.env.S3_BUCKET,
useDocumentDB: process.env.USE_DOCUMENT_DB
useDocumentDB: process.env.USE_DOCUMENT_DB,
documentDBBundle: process.env.DOCUMENT_DB_BUNDLE
}
backend/key/getKey.js
+1 -1
View File
@@ -1,5 +1,5 @@
const prompt = require('password-prompt')
const env = require("../enviroment/env");
import env from "../enviroment/env";
const crypto = require("crypto");
const getKey = async() => {
backend/middleware/auth.js
+1 -1
View File
@@ -1,6 +1,6 @@
const jwt = require("jsonwebtoken");
import User from "../models/user";
const env = require("../enviroment/env");
import env from "../enviroment/env";
const auth = async(req, res, next) => {
backend/middleware/tempAuth.js
+1 -1
View File
@@ -1,6 +1,6 @@
const jwt = require("jsonwebtoken");
import User from "../models/user";
const env = require("../enviroment/env");
import env from "../enviroment/env";
const tempAuth = async(req, res, next) => {
backend/middleware/tempAuthVideo.js
+1 -1
View File
@@ -1,6 +1,6 @@
const jwt = require("jsonwebtoken");
import User from "../models/user";
const env = require("../enviroment/env");
import env from "../enviroment/env";
const tempAuthVideo = async(req, res, next) => {
backend/models/user.ts
+2 -2
View File
@@ -3,7 +3,7 @@ const validator = require("validator");
const crypto = require("crypto");
const bcrypt = require("bcrypt");
const jwt = require("jsonwebtoken");
const env = require("../enviroment/env");
import env from "../enviroment/env";
const userSchema = new mongoose.Schema({
@@ -221,7 +221,7 @@ userSchema.methods.getEncryptionKey = function() {
} catch (e) {
console.log("Get Encryption Key Error");
console.log("Get Encryption Key Error", e);
return undefined;
}
}
backend/services/FileService/index.js
+2 -2
View File
@@ -1,14 +1,14 @@
const imageChecker = require("../../utils/imageChecker");
import crypto from "crypto";
const videoChecker = require("../../utils/videoChecker");
const mongoose = require("../../db/mongoose")
import mongoose from "../../db/mongoose";
const conn = mongoose.connection;
const createThumbnail = require("./utils/createThumbnail.ss");
const Thumbnail = require("../../models/thumbnail");
const ObjectID = require('mongodb').ObjectID
const NotAuthorizedError = require("../../utils/NotAuthorizedError");
const NotFoundError = require("../../utils/NotFoundError");
const env = require("../../enviroment/env");
import env from "../../enviroment/env";
const jwt = require("jsonwebtoken");
const removeChunks = require("./utils/removeChunks");
const User = require("../../models/user");
backend/services/FileService/indexnew.ts
+2 -2
View File
@@ -1,14 +1,14 @@
const imageChecker = require("../../utils/imageChecker");
import crypto from "crypto";
const videoChecker = require("../../utils/videoChecker");
const mongoose = require("../../db/mongoose")
import mongoose from "../../db/mongoose";
const conn = mongoose.connection;
const createThumbnail = require("../../services/FileService/utils/createThumbnail");
import Thumbnail, {ThumbnailInterface} from "../../models/thumbnail";
const ObjectID = require('mongodb').ObjectID
import NotAuthorizedError from "../../utils/NotAuthorizedError";
import NotFoundError from "../../utils/NotFoundError";
const env = require("../../enviroment/env");
import env from "../../enviroment/env";
const jwt = require("jsonwebtoken");
const removeChunks = require("./utils/removeChunks");
const User = require("../../models/user");
backend/services/FileService/utils/createThumbnail.ts
+5 -5
View File
@@ -1,7 +1,7 @@
const mongoose = require("../../../db/mongoose")
import mongoose from "../../../db/mongoose";
const conn = mongoose.connection;
const crypto= require("crypto");
const env = require("../../../enviroment/env");
import env from "../../../enviroment/env";
import Thumbnail from "../../../models/thumbnail";
const ObjectID = require('mongodb').ObjectID
const sharp = require("sharp");
@@ -49,12 +49,12 @@ const createThumbnail = (file: FileInterface, filename: string, user: UserInterf
await thumbnailModel.save();
let updatedFile = await conn.db.collection("fs.files")
const getUpdatedFile = await conn.db.collection("fs.files")
.findOneAndUpdate({"_id": file._id}, {"$set": {"metadata.hasThumbnail": true, "metadata.thumbnailID": thumbnailModel._id}})
updatedFile = updatedFile.value;
let updatedFile: FileInterface = getUpdatedFile.value;
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}}
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}} as FileInterface;
resolve(updatedFile);
backend/services/FileService/utils/createThumbnailFS.ts
+4 -4
View File
@@ -1,4 +1,4 @@
const mongoose = require("../../../db/mongoose")
import mongoose from "../../../db/mongoose";
const conn = mongoose.connection;
const crypto= require("crypto");
import Thumbnail from "../../../models/thumbnail";
@@ -62,12 +62,12 @@ const createThumbnailFS = (file: FileInterface, filename: string, user: UserInte
await thumbnailModel.save();
let updatedFile = await conn.db.collection("fs.files")
const getUpdatedFile = await conn.db.collection("fs.files")
.findOneAndUpdate({"_id": file._id}, {"$set": {"metadata.hasThumbnail": true, "metadata.thumbnailID": thumbnailModel._id}})
updatedFile = updatedFile.value;
let updatedFile: FileInterface = getUpdatedFile.value;
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}}
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}} as FileInterface
resolve(updatedFile);
})
backend/services/FileService/utils/createThumbnailS3.ts
+4 -4
View File
@@ -1,4 +1,4 @@
const mongoose = require("../../../db/mongoose")
import mongoose from "../../../db/mongoose";
const conn = mongoose.connection;
const crypto= require("crypto");
import Thumbnail from "../../../models/thumbnail";
@@ -87,12 +87,12 @@ const createThumbnailS3 = (file: FileInterface, filename: string, user: UserInte
await thumbnailModel.save();
let updatedFile = await conn.db.collection("fs.files")
const getUpdatedFile = await conn.db.collection("fs.files")
.findOneAndUpdate({"_id": file._id}, {"$set": {"metadata.hasThumbnail": true, "metadata.thumbnailID": thumbnailModel._id}})
updatedFile = updatedFile.value;
let updatedFile: FileInterface = getUpdatedFile.value;
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}}
updatedFile = {...updatedFile, metadata: {...updatedFile.metadata, hasThumbnail: true, thumbnailID: thumbnailModel._id}} as FileInterface;
resolve(updatedFile);
})
backend/services/FolderService/index.js
+1 -1
View File
@@ -4,7 +4,7 @@ const NotFoundError = require("../../utils/NotFoundError");
const UtilsFile = require("../../db/utils/fileUtils");
const ObjectID = require('mongodb').ObjectID
const UtilsFolder = require("../../db/utils/folderUtils");
const mongoose = require("../../db/mongoose")
import mongoose from "../../db/mongoose";
const conn = mongoose.connection;
const Thumbnail = require("../../models/thumbnail");
const sortBySwitch = require("../../utils/sortBySwitchFolder");
key/getKey.js
+1 -1
View File
@@ -1,5 +1,5 @@
const prompt = require('password-prompt')
const env = require("../backend/enviroment/env")
import env from "../backend/enviroment/env";
const crypto = require("crypto");
const getKey = async() => {
key/getNewKey.js
+1 -1
View File
@@ -1,5 +1,5 @@
const prompt = require('password-prompt')
const env = require("../backend/enviroment/env")
import env from "../backend/enviroment/env";
const crypto = require("crypto");
const getKey = async() => {
serverUtils/createThumbnailBuffer.js
+2 -2
View File
@@ -1,7 +1,7 @@
const mongoose = require("../backend/db/mongooseServerUtils")
import mongoose from "../backend/db/mongoose";
const conn = mongoose.connection;
const crypto= require("crypto");
const env = require("../backend/enviroment/env");
import env from "../backend/enviroment/env";
const Thumbnail = require("../backend/models/thumbnail");
const ObjectID = require('mongodb').ObjectID
const sharp = require("sharp");