mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-03-03 17:47:01 +01:00
Code Issues Projects Releases Wiki Activity

[auth] fix blinking profile picture

Browse source
This commit is contained in:
nymkappa 2023-08-28 09:29:13 +02:00
parent 8ba4a7b421
commit 7fd8790750
No known key found for this signature in database
GPG key ID: E155910B16E8BD04
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/components/master-page/master-page.component.ts
View file

@ -29,7 +29,6 @@ export class MasterPageComponent implements OnInit {
networkPaths: { [network: string]: string }; networkPaths: { [network: string]: string };
networkPaths$: Observable<Record<string, string>>; networkPaths$: Observable<Record<string, string>>;
footerVisible = true; footerVisible = true;
userAuth: any | undefined;
user: any = undefined; user: any = undefined;
servicesEnabled = false; servicesEnabled = false;
menuOpen = false; menuOpen = false;
@ -94,7 +93,7 @@ export class MasterPageComponent implements OnInit {
} }
refreshAuth(): void { refreshAuth(): void {
this.apiService.getUserInfo$().subscribe(user => this.user = user); this.user = this.storageService.getAuth()?.user ?? null;
} }
hamburgerClick(event): void { hamburgerClick(event): void {

5
frontend/src/app/components/menu/menu.component.ts
View file

@ -30,6 +30,11 @@ export class MenuComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.userAuth = this.storageService.getAuth(); this.userAuth = this.storageService.getAuth();
if (this.userAuth && this.userAuth.user && !this.userAuth.user.imageMd5) {
this.logout();
return;
}
if (this.stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE) { if (this.stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE) {
this.userMenuGroups$ = this.apiService.getUserMenuGroups$(); this.userMenuGroups$ = this.apiService.getUserMenuGroups$();
} }

9
frontend/src/app/shared/components/global-footer/global-footer.component.ts
View file

@ -28,7 +28,6 @@ export class GlobalFooterComponent implements OnInit {
networkPaths: { [network: string]: string }; networkPaths: { [network: string]: string };
currentNetwork = ''; currentNetwork = '';
loggedIn = false; loggedIn = false;
username = null;
urlSubscription: Subscription; urlSubscription: Subscription;
isServicesPage = false; isServicesPage = false;
@ -64,13 +63,7 @@ export class GlobalFooterComponent implements OnInit {
}); });
this.urlSubscription = this.route.url.subscribe((url) => { this.urlSubscription = this.route.url.subscribe((url) => {
this.loggedIn = JSON.parse(this.storageService.getValue('auth')) !== null; this.loggedIn = this.storageService.getAuth() !== null;
const auth = JSON.parse(this.storageService.getValue('auth'));
if (auth?.user?.username) {
this.username = auth.user.username;
} else {
this.username = null;
}
this.cd.markForCheck(); this.cd.markForCheck();
}) })
} }