TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-03-26 22:50:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug that caused users with large amounts of data to have extremely large tokens

Browse Source 
Subfolders are now ensured to exist with the normal downloading method

Initialization now happens after token retrieval to avoid failed requests

Fixed bug that caused login to be called twice, introducing a possible race condition
This commit is contained in:
Tzahi12345
2020-05-03 18:55:42 -04:00
parent 26ad195597
commit f73ec2dd94
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/login/login.component.ts
View File

@@ -41,12 +41,15 @@ export class LoginComponent implements OnInit {
}
login() {
if (this.loginPasswordInput === '') {
if (this.loginPasswordInput === '' || this.loggingIn) {
return;
}
this.loggingIn = true;
this.postsService.login(this.loginUsernameInput, this.loginPasswordInput).subscribe(res => {
this.loggingIn = false;
if (res['token']) {
this.postsService.afterLogin(res['user'], res['token'], res['permissions'], res['available_permissions']);
}
}, err => {
this.loggingIn = false;
});

16
src/app/posts.services.ts
View File

@@ -1,5 +1,5 @@
import {Injectable, isDevMode, Inject} from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch';
@@ -64,7 +64,7 @@ export class PostsService implements CanActivate {
this.httpOptions = {
params: new HttpParams({
fromString: this.http_params
}),
})
};
Fingerprint2.get(components => {
@@ -83,7 +83,6 @@ export class PostsService implements CanActivate {
if (localStorage.getItem('jwt_token')) {
this.token = localStorage.getItem('jwt_token');
this.httpOptions.params = this.httpOptions.params.set('jwt', this.token);
this.jwtAuth();
} else {
this.sendToLogin();
@@ -335,12 +334,13 @@ export class PostsService implements CanActivate {
this.permissions = permissions;
this.available_permissions = available_permissions;
this.token = token;
this.setInitialized();
localStorage.setItem('jwt_token', this.token);
this.httpOptions.params = this.httpOptions.params.set('jwt', this.token);
console.log(this.httpOptions);
this.setInitialized();
// needed to re-initialize parts of app after login
this.config_reloaded.next(true);
@@ -352,25 +352,23 @@ export class PostsService implements CanActivate {
// user methods
login(username, password) {
const call = this.http.post(this.path + 'auth/login', {userid: username, password: password}, this.httpOptions);
call.subscribe(res => {
if (res['token']) {
this.afterLogin(res['user'], res['token'], res['permissions'], res['available_permissions']);
}
});
return call;
}
// user methods
jwtAuth() {
console.log('doing jwt call');
const call = this.http.post(this.path + 'auth/jwtAuth', {}, this.httpOptions);
call.subscribe(res => {
if (res['token']) {
this.afterLogin(res['user'], res['token'], res['permissions'], res['available_permissions']);
}
}, err => {
console.log('jwt errored')
if (err.status === 401) {
this.sendToLogin();
}
console.log(err)
});
return call;
}