machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4672 from mempool/nymkappa/fix-username-not-showing

Browse Source 
[auth] properly refresh user when `auth` object changes
This commit is contained in:
softsimon 2024-02-11 20:13:51 +08:00 committed by GitHub
commit cc2f42e814
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/app/services/services-api.service.ts
View File

@ -1,9 +1,10 @@
import { Router, NavigationStart } from '@angular/router';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http'; import { HttpClient, HttpParams } from '@angular/common/http';
import { StateService } from './state.service'; import { StateService } from './state.service';
import { StorageService } from './storage.service'; import { StorageService } from './storage.service';
import { MenuGroup } from '../interfaces/services.interface'; import { MenuGroup } from '../interfaces/services.interface';
import { Observable, of, ReplaySubject, tap, catchError, share } from 'rxjs'; import { Observable, of, ReplaySubject, tap, catchError, share, filter, switchMap } from 'rxjs';
import { IBackendInfo } from '../interfaces/websocket.interface'; import { IBackendInfo } from '../interfaces/websocket.interface';
import { Acceleration, AccelerationHistoryParams } from '../interfaces/node-api.interface'; import { Acceleration, AccelerationHistoryParams } from '../interfaces/node-api.interface';
@ -30,16 +31,20 @@ const SERVICES_API_PREFIX = `/api/v1/services`;
providedIn: 'root' providedIn: 'root'
}) })
export class ServicesApiServices { export class ServicesApiServices {
private apiBaseUrl: string; // base URL is protocol, hostname, and port apiBaseUrl: string; // base URL is protocol, hostname, and port
private apiBasePath: string; // network path is /testnet, etc. or '' for mainnet apiBasePath: string; // network path is /testnet, etc. or '' for mainnet
userSubject$ = new ReplaySubject<IUser | null>(1); userSubject$ = new ReplaySubject<IUser | null>(1);
currentAuth = null;
constructor( constructor(
private httpClient: HttpClient, private httpClient: HttpClient,
private stateService: StateService, private stateService: StateService,
private storageService: StorageService private storageService: StorageService,
private router: Router,
) { ) {
this.currentAuth = localStorage.getItem('auth');
this.apiBaseUrl = ''; // use relative URL by default this.apiBaseUrl = ''; // use relative URL by default
if (!stateService.isBrowser) { // except when inside AU SSR process if (!stateService.isBrowser) { // except when inside AU SSR process
this.apiBaseUrl = this.stateService.env.NGINX_PROTOCOL + '://' + this.stateService.env.NGINX_HOSTNAME + ':' + this.stateService.env.NGINX_PORT; this.apiBaseUrl = this.stateService.env.NGINX_PROTOCOL + '://' + this.stateService.env.NGINX_HOSTNAME + ':' + this.stateService.env.NGINX_PORT;
@ -59,6 +64,10 @@ export class ServicesApiServices {
} }
this.getUserInfo$().subscribe(); this.getUserInfo$().subscribe();
this.router.events.pipe(
filter((event) => event instanceof NavigationStart && this.currentAuth !== localStorage.getItem('auth')),
switchMap(() => this.getUserInfo$()),
).subscribe();
} }
/** /**