X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fshared%2Fservices%2FUserService.ts;h=0724f400f3128e267ee869d54c9f3b78cc4145db;hb=7eddc52c1302a1f0d7189576ace44957d6b42d2a;hp=286b468c753324777aa354d721532866a5390800;hpb=f4f7a24b3ce7585777d2fa83b6f6c0b74364ff10;p=lemmy-ui.git

diff --git a/src/shared/services/UserService.ts b/src/shared/services/UserService.ts
index 286b468..0724f40 100644
--- a/src/shared/services/UserService.ts
+++ b/src/shared/services/UserService.ts
@@ -1,8 +1,10 @@
-// import Cookies from 'js-cookie';
-import IsomorphicCookie from "isomorphic-cookie";
-import { LocalUserSettingsView, LoginResponse } from "lemmy-js-client";
+import { isAuthPath } from "@utils/app";
+import { clearAuthCookie, isBrowser, setAuthCookie } from "@utils/browser";
+import * as cookie from "cookie";
 import jwt_decode from "jwt-decode";
-import { Subject, BehaviorSubject } from "rxjs";
+import { LoginResponse, MyUserInfo } from "lemmy-js-client";
+import { toast } from "../toast";
+import { I18NextService } from "./I18NextService";
 
 interface Claims {
   sub: number;
@@ -10,51 +12,75 @@ interface Claims {
   iat: number;
 }
 
+interface JwtInfo {
+  claims: Claims;
+  jwt: string;
+}
+
 export class UserService {
-  private static _instance: UserService;
-  public localUserView: LocalUserSettingsView;
-  public claims: Claims;
-  public jwtSub: Subject<string> = new Subject<string>();
-  public unreadCountSub: BehaviorSubject<number> = new BehaviorSubject<number>(
-    0
-  );
+  static #instance: UserService;
+  public myUserInfo?: MyUserInfo;
+  public jwtInfo?: JwtInfo;
 
   private constructor() {
-    if (this.auth) {
-      this.setClaims(this.auth);
-    } else {
-      // setTheme();
-      console.log("No JWT cookie found.");
-    }
+    this.#setJwtInfo();
   }
 
   public login(res: LoginResponse) {
-    let expires = new Date();
+    const expires = new Date();
     expires.setDate(expires.getDate() + 365);
-    IsomorphicCookie.save("jwt", res.jwt, { expires, secure: false });
-    console.log("jwt cookie set");
-    this.setClaims(res.jwt);
+
+    if (isBrowser() && res.jwt) {
+      toast(I18NextService.i18n.t("logged_in"));
+      setAuthCookie(res.jwt);
+      this.#setJwtInfo();
+    }
   }
 
   public logout() {
-    IsomorphicCookie.remove("jwt", { secure: false });
-    this.claims = undefined;
-    this.localUserView = undefined;
-    // setTheme();
-    this.jwtSub.next();
-    console.log("Logged out.");
+    this.jwtInfo = undefined;
+    this.myUserInfo = undefined;
+
+    if (isBrowser()) {
+      clearAuthCookie();
+    }
+
+    if (isAuthPath(location.pathname)) {
+      location.replace("/");
+    } else {
+      location.reload();
+    }
   }
 
-  public get auth(): string {
-    return IsomorphicCookie.load("jwt");
+  public auth(throwErr = false): string | undefined {
+    const jwt = this.jwtInfo?.jwt;
+
+    if (jwt) {
+      return jwt;
+    } else {
+      const msg = "No JWT cookie found";
+
+      if (throwErr && isBrowser()) {
+        console.error(msg);
+        toast(I18NextService.i18n.t("not_logged_in"), "danger");
+      }
+
+      return undefined;
+      // throw msg;
+    }
   }
 
-  private setClaims(jwt: string) {
-    this.claims = jwt_decode(jwt);
-    this.jwtSub.next(jwt);
+  #setJwtInfo() {
+    if (isBrowser()) {
+      const { jwt } = cookie.parse(document.cookie);
+
+      if (jwt) {
+        this.jwtInfo = { jwt, claims: jwt_decode(jwt) };
+      }
+    }
   }
 
   public static get Instance() {
-    return this._instance || (this._instance = new this());
+    return this.#instance || (this.#instance = new this());
   }
 }