From e5c681d62ed795363a497c46b1efa4eff852a74a Mon Sep 17 00:00:00 2001
From: Madhab Sahoo <msahoo001@gmail.com>
Date: Thu, 10 Oct 2024 23:14:58 +0530
Subject: [PATCH] Modified changes as suggested

---
 apps/client/src/app/app.component.ts                | 13 +------------
 .../src/app/components/header/header.component.ts   | 13 ++++++-------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index f6d227906..eed29a757 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -5,7 +5,7 @@ import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { ColorScheme } from '@ghostfolio/common/types';
 
-import { DOCUMENT, LocationStrategy } from '@angular/common';
+import { DOCUMENT } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -91,7 +91,6 @@ export class AppComponent implements OnDestroy, OnInit {
     private dialog: MatDialog,
     @Inject(DOCUMENT) private document: Document,
     private impersonationStorageService: ImpersonationStorageService,
-    private locationStrategy: LocationStrategy,
     private notificationService: NotificationService,
     private route: ActivatedRoute,
     private router: Router,
@@ -224,16 +223,6 @@ export class AppComponent implements OnDestroy, OnInit {
       .subscribe((state) => {
         this.user = state.user;
 
-        const setUserLanguage = sessionStorage.getItem('set_user_language');
-        if (setUserLanguage !== 'true' && this.user?.settings) {
-          const userLanguage = this.user.settings.language;
-          const userBasePath = `/${userLanguage}/`;
-          if (!this.locationStrategy.getBaseHref().includes(userBasePath)) {
-            sessionStorage.setItem('set_user_language', 'true');
-            window.location.href = `..${userBasePath}`;
-          }
-        }
-
         this.canCreateAccount = hasPermission(
           this.user?.permissions,
           permissions.createUserAccount
diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index 865312eae..310b85a2d 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@@ -258,19 +258,18 @@ export class HeaderComponent implements OnChanges {
   }
 
   public setToken(aToken: string) {
-    console.log('Set Token called');
     this.tokenStorageService.saveToken(
       aToken,
       this.settingsStorageService.getSetting(KEY_STAY_SIGNED_IN) === 'true'
     );
     this.userService
-      .get(true)
+      .get()
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((data) => {
-        const userLanguage = data.settings.language;
-        const userBasePath = `/${userLanguage}/`;
-        if (!this.locationStrategy.getBaseHref().includes(userBasePath)) {
-          window.location.href = `..${userBasePath}`;
+      .subscribe((user) => {
+        const userLanguage = user?.settings?.language;
+
+        if (userLanguage && document.documentElement.lang !== userLanguage) {
+          window.location.href = `../${userLanguage}`;
         } else {
           this.router.navigate(['/']);
         }