fix webscokets for chats

Author: Awakich

projects/core/src/lib/services/token.service.ts

@@ -5,7 +5,7 @@ import { map, Observable } from "rxjs";
 import { RefreshResponse } from "@auth/models/http.model";
 import { plainToInstance } from "class-transformer";
 import { Tokens } from "@auth/models/tokens.model";
-import Cookies from "js-cookie";
+import Cookies, { CookieAttributes } from "js-cookie";
 import { ApiService, PRODUCTION } from "@corelib";
 
 /**
@@ -66,11 +66,13 @@ export class TokenService {
    * - Используются дефолтные настройки браузера
    * - Cookies привязаны к текущему домену
    */
-  getCookieOptions() {
+  getCookieOptions(): CookieAttributes {
     if (this.production) {
       return {
         domain: ".procollab.ru", // Домен для production окружения
         expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), // 30 дней
+        secure: true,
+        sameSite: "None",
       };
     }
 

projects/social_platform/src/app/core/services/websocket.service.ts

@@ -1,9 +1,10 @@
 /** @format */
-import { Injectable } from "@angular/core";
+import { inject, Injectable } from "@angular/core";
 import { filter, map, Observable, Observer, retry, Subject } from "rxjs";
 import { environment } from "@environment";
 import * as snakecaseKeys from "snakecase-keys";
 import camelcaseKeys from "camelcase-keys";
+import { TokenService } from "@corelib";
 
 /**
  * Сервис для работы с WebSocket соединениями
@@ -20,6 +21,8 @@ export class WebsocketService {
   /** Subject для обработки входящих сообщений */
   private messages$ = new Subject<MessageEvent>();
 
+  private readonly tokenService = inject(TokenService);
+
   /** Флаг состояния соединения */
   public isConnected = false;
 
@@ -36,7 +39,11 @@ export class WebsocketService {
    */
   public connect(path: string): Observable<void> {
     return new Observable((observer: Observer<void>) => {
-      this.socket = new WebSocket(environment.websocketUrl + path);
+      const tokens = this.tokenService.getTokens();
+
+      const tokenAccess = tokens?.access ? tokens.access : "";
+
+      this.socket = new WebSocket(environment.websocketUrl + path, ["Bearer", tokenAccess]);
 
       this.socket.onopen = () => {
         this.isConnected = true;

projects/social_platform/src/app/office/services/chat.service.ts

@@ -57,7 +57,7 @@ export class ChatService {
     const tokens = this.tokenService.getTokens();
     if (!tokens) throw new Error("No token provided");
 
-    return this.websocketService.connect(`/chat/?token=${tokens.access}`);
+    return this.websocketService.connect(`/chat/`);
   }
 
   /**

projects/social_platform/src/app/ui/components/input/input.component.scss

@@ -112,10 +112,10 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    padding: 0 4px;
     color: var(--red) !important;
-    transform: translateY(-50%);
     background: var(--ligth-white);
-    padding: 0 4px;
+    transform: translateY(-50%);
   }
 
   &__right-icon {