TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-20 08:53:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs that prevented subscription videos from being downloaded and non-users from accessing shared videos

Browse Source
This commit is contained in:
Isaac Abadi
2020-09-26 00:29:13 -04:00
parent 96cf1b87d1
commit 10922fedd7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/app.js
View File

@@ -2530,9 +2530,9 @@ app.post('/api/downloadFile', optionalJwt, async (req, res) => {
let base_path = fileFolderPath; let base_path = fileFolderPath;
let usersFileFolder = null; let usersFileFolder = null;
const multiUserMode = config_api.getConfigItem('ytdl_multi_user_mode'); const multiUserMode = config_api.getConfigItem('ytdl_multi_user_mode');
if (multiUserMode && req.body.uuid) { if (multiUserMode && (req.body.uuid || req.user.uid)) {
usersFileFolder = config_api.getConfigItem('ytdl_users_base_path'); usersFileFolder = config_api.getConfigItem('ytdl_users_base_path');
base_path = path.join(usersFileFolder, req.body.uuid, type); base_path = path.join(usersFileFolder, req.body.uuid ? req.body.uuid : req.user.uid, type);
} }
if (!subscriptionName) { if (!subscriptionName) {
file = path.join(__dirname, base_path, fileNames + ext); file = path.join(__dirname, base_path, fileNames + ext);
@@ -2550,7 +2550,7 @@ app.post('/api/downloadFile', optionalJwt, async (req, res) => {
fileNames[i] = decodeURIComponent(fileNames[i]); fileNames[i] = decodeURIComponent(fileNames[i]);
} }
file = await createPlaylistZipFile(fileNames, type, outputName, fullPathProvided, req.body.uuid); file = await createPlaylistZipFile(fileNames, type, outputName, fullPathProvided, req.body.uuid);
file = path.join(__dirname, file); if (!path.isAbsolute(file)) file = path.join(__dirname, file);
} }
res.sendFile(file, function (err) { res.sendFile(file, function (err) {
if (err) { if (err) {

2
backend/authentication/auth.js
View File

@@ -297,7 +297,7 @@ exports.getUserVideo = function(user_uid, file_uid, type, requireSharing = false
if (!file && type) file = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value(); if (!file && type) file = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value();
// prevent unauthorized users from accessing the file info // prevent unauthorized users from accessing the file info
if (requireSharing && !file['sharingEnabled']) file = null; if (file && !file['sharingEnabled'] && requireSharing) file = null;
return file; return file;
} }

2
src/app/player/player.component.ts
View File

@@ -215,7 +215,7 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
// adds user token if in multi-user-mode // adds user token if in multi-user-mode
const uuid_str = this.uuid ? `&uuid=${this.uuid}` : ''; const uuid_str = this.uuid ? `&uuid=${this.uuid}` : '';
const uid_str = (this.id || !this.db_file) ? '' : `&uid=${this.db_file.uid}`; const uid_str = (this.id || !this.db_file) ? '' : `&uid=${this.db_file.uid}`;
const type_str = (this.id || !this.db_file) ? '' : `&type=${this.db_file.type}` const type_str = (this.id || !this.db_file || !this.db_file.type) ? '' : `&type=${this.db_file.type}`
const id_str = this.id ? `&id=${this.id}` : ''; const id_str = this.id ? `&id=${this.id}` : '';
if (this.postsService.isLoggedIn) { if (this.postsService.isLoggedIn) {
fullLocation += (this.subscriptionName ? '&' : '?') + `jwt=${this.postsService.token}`; fullLocation += (this.subscriptionName ? '&' : '?') + `jwt=${this.postsService.token}`;

2
src/app/subscription/subscription/subscription.component.ts
View File

@@ -108,7 +108,7 @@ export class SubscriptionComponent implements OnInit {
} else { } else {
this.router.navigate(['/player', {fileNames: name, this.router.navigate(['/player', {fileNames: name,
type: this.subscription.type ? this.subscription.type : 'video', subscriptionName: this.subscription.name, type: this.subscription.type ? this.subscription.type : 'video', subscriptionName: this.subscription.name,
subPlaylist: this.subscription.isPlaylist, uuid: this.postsService.user ? this.postsService.user.uid : null}]); subPlaylist: this.subscription.isPlaylist}]);
} }
} }