26 changed files with 23 additions and 129 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1007,56 +1007,3 @@ steps:
      - aws cloudfront create-invalidation --distribution-id E15IFY23VM147K --paths "/*"
    depends_on:
      - make-rustat
 ---
 kind: pipeline
 type: docker
 name: deploy insport.live
 concurrency:
  limit: 1
 platform:
  os: linux
  arch: amd64
 trigger:
  ref:
  - refs/heads/insport.live
 steps:
  - name: npm-install
    image: node:16-alpine
    environment:
      REACT_APP_STRIPE_PK:
        from_secret: REACT_APP_STRIPE_PK
    commands:
      - apk add --no-cache make
      - npm install --legacy-peer-deps
  - name: make-insport-live
    image: node:16-alpine
    environment:
      REACT_APP_STRIPE_PK:
        from_secret: REACT_APP_STRIPE_PK
    commands:
      - apk add --no-cache make
      - make insport-live-prod
    depends_on:
      - npm-install
  - name: deploy-insport-live
    image: amazon/aws-cli:latest
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: AWS_ACCESS_KEY_ID
      AWS_SECRET_ACCESS_KEY:
        from_secret: AWS_SECRET_ACCESS_KEY
      AWS_DEFAULT_REGION:
        from_secret: AWS_DEFAULT_REGION
      AWS_MAX_ATTEMPTS: 10
    commands:
      - aws s3 sync build_insport_live s3://insports-live --delete
      - aws cloudfront create-invalidation --distribution-id E1LBC88VYP6XVB --paths "/*"
    depends_on:
      - make-insport-live
--- a/9
+++ b/9
@ -225,15 +225,6 @@ rustat-prod:
 	BUILD_PATH=build_rustat \
 	npm run build && cp -r .well-known build_rustat
 insport-live-prod:
 	rm -rf build_insport_live && \
 	REACT_APP_TYPE=ott \
 	REACT_APP_ENV=staging \
 	REACT_APP_CLIENT=lff \
 	REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW5XxhC6ntKZKddXgKHq5HOCDmJTdfSKluMYCdLHOcUA3Miuy8HesxG1eS4c0dQRQpMsEHRrQL00USpu5xIq \
 	BUILD_PATH=build_insport_live \
 	npm run build && cp -r .well-known build_insport_live
 deploy-all: prod preprod facr-prod lff-prod diwansport-prod india-prod fqtv-prod rustat-prod
 test:
--- a/public/clients/facr/favicon/android-chrome-192x192.png
+++ b/public/clients/facr/favicon/android-chrome-192x192.png
--- a/public/clients/facr/favicon/android-chrome-512x512.png
+++ b/public/clients/facr/favicon/android-chrome-512x512.png
--- a/public/clients/facr/favicon/apple-touch-icon.png
+++ b/public/clients/facr/favicon/apple-touch-icon.png
--- a/public/clients/facr/favicon/favicon-16x16.png
+++ b/public/clients/facr/favicon/favicon-16x16.png
--- a/public/clients/facr/favicon/favicon-32x32.png
+++ b/public/clients/facr/favicon/favicon-32x32.png
--- a/public/clients/facr/favicon/favicon.ico
+++ b/public/clients/facr/favicon/favicon.ico
--- a/public/clients/fqtv/favicon/android-chrome-192x192.png
+++ b/public/clients/fqtv/favicon/android-chrome-192x192.png
--- a/public/clients/fqtv/favicon/android-chrome-512x512.png
+++ b/public/clients/fqtv/favicon/android-chrome-512x512.png
--- a/public/clients/fqtv/favicon/apple-touch-icon.png
+++ b/public/clients/fqtv/favicon/apple-touch-icon.png
--- a/public/clients/fqtv/favicon/favicon-16x16.png
+++ b/public/clients/fqtv/favicon/favicon-16x16.png
--- a/public/clients/fqtv/favicon/favicon-32x32.png
+++ b/public/clients/fqtv/favicon/favicon-32x32.png
--- a/public/clients/fqtv/favicon/favicon.ico
+++ b/public/clients/fqtv/favicon/favicon.ico
--- a/public/clients/lff/favicon/android-chrome-192x192.png
+++ b/public/clients/lff/favicon/android-chrome-192x192.png
--- a/public/clients/lff/favicon/android-chrome-512x512.png
+++ b/public/clients/lff/favicon/android-chrome-512x512.png
--- a/public/clients/lff/favicon/apple-touch-icon.png
+++ b/public/clients/lff/favicon/apple-touch-icon.png
--- a/public/clients/lff/favicon/favicon-16x16.png
+++ b/public/clients/lff/favicon/favicon-16x16.png
--- a/public/clients/lff/favicon/favicon-32x32.png
+++ b/public/clients/lff/favicon/favicon-32x32.png
--- a/public/clients/lff/favicon/favicon.ico
+++ b/public/clients/lff/favicon/favicon.ico
--- a/public/silent-refresh.html
+++ b/public/silent-refresh.html
@ -1,28 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <title></title>
 </head>
 <body>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/oidc-client/1.11.5/oidc-client.min.js"
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/oidc-client/1.11.5/oidc-client.min.js" integrity="sha512-pGtU1n/6GJ8fu6bjYVGIOT9Dphaw5IWPwVlqkpvVgqBxFkvdNbytUh0H8AP15NYF777P4D3XEeA/uDWFCpSQ1g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    integrity="sha512-pGtU1n/6GJ8fu6bjYVGIOT9Dphaw5IWPwVlqkpvVgqBxFkvdNbytUh0H8AP15NYF777P4D3XEeA/uDWFCpSQ1g=="
    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
  <script>
    new Oidc.UserManager().signinSilentCallback()
-      // обновляем рефреш токен в локалсторадже
+        .catch((err) => {
-      // так как safari не дает доступ к кукам
+            console.error('OIDC: silent refresh callback error', err);
-      .then(() => {
+        });
        const refreshToken = localStorage.getItem('refresh_token');
        if (refreshToken) {
          localStorage.setItem('refresh_token', new URLSearchParams(document.location.search).get('refresh_token'));
        }
      })
      .catch((err) => {
        console.error('OIDC: silent refresh callback error', err);
      });
  </script>
 </body>
-
+</html>
 </html>
--- a/src/features/AuthServiceApp/config/lexics.tsx
+++ b/src/features/AuthServiceApp/config/lexics.tsx
@ -34,7 +34,7 @@ export const lexics = {
  go_back: 1907,
  i_accept: 15737,
  i_agree: 15430,
-  login: 20304,
+  login: 13404,
  ok: 724,
  or_continue_with: 15118,
  password_changed_success: 17824,
--- a/src/features/AuthStore/hooks/useAuth.tsx
+++ b/src/features/AuthStore/hooks/useAuth.tsx
@ -24,10 +24,6 @@ import {
  setCookie,
  removeCookie,
  isMatchPage,
  REFRESH_TOKEN_KEY,
  removeRefreshToken,
  writeRefreshToken,
  readRefreshToken,
 } from 'helpers'
 import {
@ -81,7 +77,6 @@ export const useAuth = () => {
      userManager.signoutRedirect({ post_logout_redirect_uri: urlWithLang })
    })
    removeToken()
    removeRefreshToken()
    if (key !== 'saveToken') {
      removeCookie('access_token')
    }
@ -163,15 +158,12 @@ export const useAuth = () => {
    }
  }
-  const signinRedirectCallback = useCallback((refreshToken: string | null) => {
+  const signinRedirectCallback = useCallback(() => {
    setPage(history.location.pathname)
    userManager.signinRedirectCallback()
      .then((loadedUser) => {
        storeUser(loadedUser)
        if (refreshToken) writeRefreshToken(refreshToken)
        queryParamStorage.clear()
        if (page.includes(PAGES.useraccount)) {
          history.push(PAGES.home)
@ -183,7 +175,7 @@ export const useAuth = () => {
        setPage('')
        setSearch('')
      }).catch(login)
-      // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
    login,
    storeUser,
@ -195,14 +187,11 @@ export const useAuth = () => {
    const searchToken = urlSearch.get('access_token')
    const searchRefToken = urlSearch.get('id_token')
    const searchExp = urlSearch.get('expires_in')
    const refreshToken = urlSearch.get(REFRESH_TOKEN_KEY)
    const isRedirectedBackFromAuthProvider = Boolean(searchToken && searchRefToken && searchExp)
-    isRedirectedBackFromAuthProvider
+    isRedirectedBackFromAuthProvider ? signinRedirectCallback() : checkUser()
-      ? signinRedirectCallback(refreshToken)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
      : checkUser()
      // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
    checkUser,
    signinRedirectCallback,
@ -232,7 +221,7 @@ export const useAuth = () => {
  }, [reChekNewDevice])
  useEffect(() => {
-    if (!needCheckNewDeviсe || !user) return undefined
+    if (!needCheckNewDeviсe && !user) return undefined
    const startCheckDevice = setInterval(checkNewDevice, 20000)
    isNewDeviceLogin && clearInterval(startCheckDevice)
    return () => clearInterval(startCheckDevice)
@ -242,7 +231,6 @@ export const useAuth = () => {
    checkNewDevice,
    isNewDeviceLogin,
    setIsNewDeviceLogin,
    user,
  ])
  duel.channel('active_page') // поле в LS, определяющее активность вкладки
@ -252,13 +240,7 @@ export const useAuth = () => {
      // библиотека oidc-client не поддерживает обновление токена только на 1 вкладке
      // @ts-ignore
      if (window.isMaster()) {
-        // safari ограничивает доступ к куке через крос доменные запросы
+        userManager.signinSilent().catch(logout)
        // передаем рефреш токен через квери параметры
        userManager.signinSilent({
          extraQueryParams: {
            refresh_token: readRefreshToken(),
          },
        }).catch(logout)
      }
    }
    // если запросы вернули 401 | 403
--- a/src/features/MatchCard/CardFrontside/hooks.tsx
+++ b/src/features/MatchCard/CardFrontside/hooks.tsx
@ -4,20 +4,20 @@ import {
  useState,
 } from 'react'
 import { readToken } from 'helpers'
 export type TUseCardFrontside = {
  preview?: string,
  previewURL?: string,
 }
 const PREVIEW_WIDTH = 400 // макс. 1920
 export const useCardPreview = ({
  preview,
  previewURL,
 }: TUseCardFrontside) => {
  const [previewImage, setPreviewImage] = useState('')
  const currentPreviewURL = useMemo(() => (
-    previewURL ? `${previewURL}?width=${PREVIEW_WIDTH}` : preview
+    previewURL ? `${previewURL}?access_token=${readToken()}` : preview
  ), [preview, previewURL])
  useEffect(() => {
@ -25,11 +25,12 @@ export const useCardPreview = ({
      if (!currentPreviewURL) return
      try {
-        const image = await fetch(String(currentPreviewURL))
+        const image = await fetch(String(currentPreviewURL), {
-          .then(async (result) => ({
+          headers: { Authorization: `Bearer ${readToken()}` },
-            blob: await result.blob(),
+        }).then(async (result) => ({
-            status: result.status,
+          blob: await result.blob(),
-          }))
+          status: result.status,
        }))
        if (image.status === 200) {
          setPreviewImage(URL.createObjectURL(image.blob))
--- a/src/features/SystemSettings/hooks.tsx
+++ b/src/features/SystemSettings/hooks.tsx
@ -9,8 +9,8 @@ import { SELECTED_API_KEY } from 'helpers/selectedApi'
 import { useToggle } from 'hooks/useToggle'
 import { useLocalStore } from 'hooks/useStorage'
-import { removeRefreshToken, removeToken } from 'helpers'
+import { removeToken } from '../../helpers'
-import { removeCookie } from 'helpers/cookie'
+import { removeCookie } from '../../helpers/cookie'
 type FormElement = HTMLFormElement & {
  api: HTMLInputElement & {
@ -37,7 +37,6 @@ export const useSystemSettings = () => {
    const { api } = e.currentTarget
    setSelectedApi(api.value)
    removeToken()
    removeRefreshToken()
    removeCookie('access_token')
    window.location.reload()
  }
--- a/src/helpers/token/index.tsx
+++ b/src/helpers/token/index.tsx
@ -1,5 +1,4 @@
 export const TOKEN_KEY = 'token'
 export const REFRESH_TOKEN_KEY = 'refresh_token'
 export const readToken = () => (
  localStorage.getItem(TOKEN_KEY)
@ -12,15 +11,3 @@ export const writeToken = (token: string) => (
 export const removeToken = () => (
  localStorage.removeItem(TOKEN_KEY)
 )
 export const removeRefreshToken = () => {
  localStorage.removeItem(REFRESH_TOKEN_KEY)
 }
 export const writeRefreshToken = (token: string) => (
  localStorage.setItem(REFRESH_TOKEN_KEY, token)
 )
 export const readRefreshToken = () => (
  localStorage.getItem(REFRESH_TOKEN_KEY)
 )