From 59aa0063dd0bd6ed77029c4ad5383e06097a1c8c Mon Sep 17 00:00:00 2001
From: Mirlan <m.maksitaliev@gmail.com>
Date: Fri, 1 Oct 2021 22:29:59 +0600
Subject: [PATCH] fix(1748): changed sending token from cookie to url param in
 player (#515)

---
 src/features/AuthStore/hooks/useAuth.tsx         | 7 -------
 src/features/StreamPlayer/config.tsx             | 9 ++++++---
 src/features/StreamPlayer/hooks/useHlsPlayer.tsx | 2 ++
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx
index 1cc1a114..423b0592 100644
--- a/src/features/AuthStore/hooks/useAuth.tsx
+++ b/src/features/AuthStore/hooks/useAuth.tsx
@@ -14,7 +14,6 @@ import isString from 'lodash/isString'
 import { PAGES } from 'config'
 
 import { writeToken, removeToken } from 'helpers/token'
-import { setCookie, removeCookie } from 'helpers/cookie'
 import { isMatchPage } from 'helpers/isMatchPage'
 
 import { useLocalStore, useToggle } from 'hooks'
@@ -42,17 +41,11 @@ export const useAuth = () => {
       userManager.signoutRedirect({ post_logout_redirect_uri: url })
     })
     removeToken()
-    removeCookie('access_token')
   }, [userManager])
 
   const storeUser = useCallback((loadedUser: User) => {
     setUser(loadedUser)
     writeToken(loadedUser.access_token)
-    setCookie({
-      exdays: 1,
-      name: 'access_token',
-      value: loadedUser.access_token,
-    })
   }, [])
 
   const checkUser = useCallback(async () => {
diff --git a/src/features/StreamPlayer/config.tsx b/src/features/StreamPlayer/config.tsx
index ec64dce8..6ec6a692 100644
--- a/src/features/StreamPlayer/config.tsx
+++ b/src/features/StreamPlayer/config.tsx
@@ -1,10 +1,13 @@
 import Hls from 'hls.js'
 
+import { readToken } from 'helpers/token'
+
 export const streamConfig: Partial<Hls.Config> = {
   liveSyncDuration: 10,
   maxBufferLength: 15,
-  xhrSetup: (xhr) => {
-    // eslint-disable-next-line no-param-reassign
-    xhr.withCredentials = true
+  xhrSetup: (xhr, urlString) => {
+    const url = new URL(urlString)
+    url.searchParams.set('access_token', readToken() || '')
+    xhr.open('GET', url.toString())
   },
 }
diff --git a/src/features/StreamPlayer/hooks/useHlsPlayer.tsx b/src/features/StreamPlayer/hooks/useHlsPlayer.tsx
index 53304bf0..054056c6 100644
--- a/src/features/StreamPlayer/hooks/useHlsPlayer.tsx
+++ b/src/features/StreamPlayer/hooks/useHlsPlayer.tsx
@@ -27,6 +27,8 @@ export const useHlsPlayer = (src: string, resumeFrom?: number) => {
     hls.attachMedia(video)
   }, [src, hls])
 
+  useEffect(() => () => hls.destroy(), [hls])
+
   return {
     hls,
     videoRef,