...

2 files changed, 11 insertions, 8 deletions

diff --git a/FrontEnd/src/app/http/common.ts b/FrontEnd/src/app/http/common.ts
index 2dd3677b..95d29fb6 100644
--- a/FrontEnd/src/app/http/common.ts
+++ b/FrontEnd/src/app/http/common.ts
@@ -1,15 +1,18 @@
 import rawAxios, { AxiosError, AxiosResponse } from "axios";
-import { BehaviorSubject } from "rxjs";
 
 export const apiBaseUrl = "/api";
 
 export const axios = rawAxios.create();
 
-export const tokenSubject: BehaviorSubject<string | null> = new BehaviorSubject<
-  string | null
->(null);
+let _token: string | null = null;
+
+export function getHttpToken(): string | null {
+  return _token;
+}
+
+export function setHttpToken(token: string | null): void {
+  _token = token;
 
-tokenSubject.subscribe((token) => {
   if (token == null) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     delete axios.defaults.headers.common["Authorization"];
@@ -17,7 +20,7 @@ tokenSubject.subscribe((token) => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
   }
-});
+}
 
 export function base64(blob: Blob): Promise<string> {
   return new Promise<string>((resolve) => {
diff --git a/FrontEnd/src/app/services/user.ts b/FrontEnd/src/app/services/user.ts
index c3343493..f08802a5 100644
--- a/FrontEnd/src/app/services/user.ts
+++ b/FrontEnd/src/app/services/user.ts
@@ -9,7 +9,7 @@ import {
   HttpNetworkError,
   BlobWithEtag,
   NotModified,
-  tokenSubject,
+  setHttpToken,
 } from "@/http/common";
 import {
   getHttpTokenClient,
@@ -68,7 +68,7 @@ const USER_STORAGE_KEY = "currentuser";
 export class UserService {
   constructor() {
     this.userSubject.subscribe((u) => {
-      tokenSubject.next(u?.token ?? null);
+      setHttpToken(u?.token ?? null);
     });
   }