Compare commits

..

1 Commits

Author SHA1 Message Date
Isaac Abadi
245b21d03e Updated express and moment 2022-07-10 00:19:07 -04:00
6 changed files with 74 additions and 2652 deletions

View File

@@ -6,7 +6,7 @@ COPY ffmpeg-fetch.sh .
RUN sh ./ffmpeg-fetch.sh RUN sh ./ffmpeg-fetch.sh
# Create our Ubuntu 22.04 with node 16.14.2 (that specific version is required as per: https://stackoverflow.com/a/72855258/8088021) # Create our Ubuntu 22.04 with node 16
# Go to 20.04 # Go to 20.04
FROM ubuntu:20.04 AS base FROM ubuntu:20.04 AS base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@@ -21,8 +21,7 @@ RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
apt install -y --no-install-recommends curl ca-certificates tzdata && \ apt install -y --no-install-recommends curl ca-certificates tzdata && \
curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
apt install -y --no-install-recommends nodejs && \ apt install -y --no-install-recommends nodejs && \
npm -g install npm n && \ npm -g install npm && \
n 16.14.2 && \
apt clean && \ apt clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

View File

@@ -7,6 +7,7 @@ const path = require('path');
const compression = require('compression'); const compression = require('compression');
const multer = require('multer'); const multer = require('multer');
const express = require("express"); const express = require("express");
const session = require("express-session");
const bodyParser = require("body-parser"); const bodyParser = require("body-parser");
const archiver = require('archiver'); const archiver = require('archiver');
const unzipper = require('unzipper'); const unzipper = require('unzipper');
@@ -158,7 +159,13 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json()); app.use(bodyParser.json());
// use passport // use passport
app.use(session({
resave: false,
saveUninitialized: true,
secret: 'ytdl-material-secret'
}));
app.use(auth_api.passport.initialize()); app.use(auth_api.passport.initialize());
app.use(auth_api.passport.session());
// actual functions // actual functions

1286
backend/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -27,6 +27,7 @@
"compression": "^1.7.4", "compression": "^1.7.4",
"config": "^3.2.3", "config": "^3.2.3",
"express": "^4.17.3", "express": "^4.17.3",
"express-session": "^1.17.3",
"fluent-ffmpeg": "^2.1.2", "fluent-ffmpeg": "^2.1.2",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
@@ -34,13 +35,13 @@
"md5": "^2.2.1", "md5": "^2.2.1",
"merge-files": "^0.1.2", "merge-files": "^0.1.2",
"mocha": "^9.2.2", "mocha": "^9.2.2",
"moment": "^2.29.2", "moment": "^2.29.4",
"mongodb": "^3.6.9", "mongodb": "^3.6.9",
"multer": "1.4.5-lts.1", "multer": "1.4.5-lts.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"node-id3": "^0.1.14", "node-id3": "^0.1.14",
"node-schedule": "^2.1.0", "node-schedule": "^2.1.0",
"passport": "^0.4.1", "passport": "^0.6.0",
"passport-http": "^0.3.0", "passport-http": "^0.3.0",
"passport-jwt": "^4.0.0", "passport-jwt": "^4.0.0",
"passport-ldapauth": "^3.0.1", "passport-ldapauth": "^3.0.1",

24
package-lock.json generated
View File

@@ -3593,12 +3593,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true "dev": true
},
"qs": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
"dev": true
} }
} }
}, },
@@ -5877,6 +5871,12 @@
"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
"dev": true "dev": true
}, },
"qs": {
"version": "6.9.7",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
"integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
"dev": true
},
"raw-body": { "raw-body": {
"version": "2.4.3", "version": "2.4.3",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
@@ -10281,9 +10281,9 @@
"dev": true "dev": true
}, },
"qs": { "qs": {
"version": "6.9.7", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
"integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
"dev": true "dev": true
}, },
"randombytes": { "randombytes": {
@@ -10497,9 +10497,9 @@
}, },
"dependencies": { "dependencies": {
"qs": { "qs": {
"version": "6.5.3", "version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
"dev": true "dev": true
} }
} }

File diff suppressed because it is too large Load Diff