Browse Source

[BUG] Change language after login from user setting

pull/3828/head
Madhab Sahoo 11 months ago
committed by Thomas Kaul
parent
commit
17b39b876f
  1. 4
      apps/client/src/app/app.component.ts
  2. 17
      apps/client/src/app/components/header/header.component.ts

4
apps/client/src/app/app.component.ts

@ -224,7 +224,7 @@ export class AppComponent implements OnDestroy, OnInit {
.subscribe((state) => { .subscribe((state) => {
this.user = state.user; this.user = state.user;
const setUserLanguage = sessionStorage.getItem('set_user_language'); /* const setUserLanguage = sessionStorage.getItem('set_user_language');
if (setUserLanguage !== 'true' && this.user?.settings) { if (setUserLanguage !== 'true' && this.user?.settings) {
const userLanguage = this.user.settings.language; const userLanguage = this.user.settings.language;
const userBasePath = `/${userLanguage}/`; const userBasePath = `/${userLanguage}/`;
@ -232,7 +232,7 @@ export class AppComponent implements OnDestroy, OnInit {
sessionStorage.setItem('set_user_language', 'true'); sessionStorage.setItem('set_user_language', 'true');
window.location.href = `..${userBasePath}`; window.location.href = `..${userBasePath}`;
} }
} } */
this.canCreateAccount = hasPermission( this.canCreateAccount = hasPermission(
this.user?.permissions, this.user?.permissions,

17
apps/client/src/app/components/header/header.component.ts

@ -15,6 +15,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { DateRange } from '@ghostfolio/common/types'; import { DateRange } from '@ghostfolio/common/types';
import { GfAssistantComponent } from '@ghostfolio/ui/assistant/assistant.component'; import { GfAssistantComponent } from '@ghostfolio/ui/assistant/assistant.component';
import { LocationStrategy } from '@angular/common';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
@ -100,7 +101,8 @@ export class HeaderComponent implements OnChanges {
private router: Router, private router: Router,
private settingsStorageService: SettingsStorageService, private settingsStorageService: SettingsStorageService,
private tokenStorageService: TokenStorageService, private tokenStorageService: TokenStorageService,
private userService: UserService private userService: UserService,
private locationStrategy: LocationStrategy
) { ) {
this.impersonationStorageService this.impersonationStorageService
.onChangeHasImpersonation() .onChangeHasImpersonation()
@ -256,13 +258,24 @@ export class HeaderComponent implements OnChanges {
} }
public setToken(aToken: string) { public setToken(aToken: string) {
console.log('Set Token called');
this.tokenStorageService.saveToken( this.tokenStorageService.saveToken(
aToken, aToken,
this.settingsStorageService.getSetting(KEY_STAY_SIGNED_IN) === 'true' this.settingsStorageService.getSetting(KEY_STAY_SIGNED_IN) === 'true'
); );
this.userService
.get(true)
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((data) => {
const userLanguage = data.settings.language;
const userBasePath = `/${userLanguage}/`;
if (!this.locationStrategy.getBaseHref().includes(userBasePath)) {
window.location.href = `..${userBasePath}`;
} else {
this.router.navigate(['/']); this.router.navigate(['/']);
} }
});
}
public ngOnDestroy() { public ngOnDestroy() {
this.unsubscribeSubject.next(); this.unsubscribeSubject.next();

Loading…
Cancel
Save