[menu] fix json.parse on missing auth in localstorage

This commit is contained in:
nymkappa
2023-08-20 08:11:55 +02:00
parent c4f2f4ca66
commit b64b6fb3c7
4 changed files with 23 additions and 9 deletions

View File

@@ -5,6 +5,7 @@ import { LanguageService } from '../../services/language.service';
import { EnterpriseService } from '../../services/enterprise.service';
import { NavigationService } from '../../services/navigation.service';
import { MenuComponent } from '../menu/menu.component';
import { StorageService } from '../../services/storage.service';
@Component({
selector: 'app-master-page',
@@ -37,6 +38,7 @@ export class MasterPageComponent implements OnInit {
private languageService: LanguageService,
private enterpriseService: EnterpriseService,
private navigationService: NavigationService,
private storageService: StorageService
) { }
ngOnInit(): void {
@@ -74,12 +76,12 @@ export class MasterPageComponent implements OnInit {
this.stateService.resetScroll$.next(true);
}
onLoggedOut() {
onLoggedOut(): void {
this.refreshAuth();
}
refreshAuth(): void {
this.userAuth = JSON.parse(localStorage.getItem('auth') || '') ?? null;
this.userAuth = this.storageService.getAuth();
}
hamburgerClick(): void {

View File

@@ -2,6 +2,7 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core';
import { Observable } from 'rxjs';
import { ApiService } from '../../services/api.service';
import { MenuGroup } from '../../interfaces/services.interface';
import { StorageService } from '../../services/storage.service';
@Component({
selector: 'app-menu',
@@ -16,11 +17,12 @@ export class MenuComponent implements OnInit {
@Output() loggedOut = new EventEmitter<boolean>();
constructor(
private apiService: ApiService
private apiService: ApiService,
private storageService: StorageService
) {}
ngOnInit(): void {
this.userAuth = JSON.parse(localStorage.getItem('auth') || '') ?? null;
this.userAuth = this.storageService.getAuth();
this.userMenuGroups$ = this.apiService.getUserMenuGroups$();
}