Enhance authentication flow by adding token refresh mechanism and improving error handling. Implement checks to prevent authentication loops during API calls and ensure token is updated before requests. This improves user experience and security in the application.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "challenge-admin-pl",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "challenge-admin-pl",
-      "version": "1.5.1",
+      "version": "1.5.2",
       "license": "ISC",
       "dependencies": {
         "@brojs/cli": "^1.9.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "challenge-admin",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "",
   "main": "./src/index.tsx",
   "scripts": {

src/__data__/api/api.ts

@@ -31,15 +31,35 @@ export const api = createApi({
     ) => {
       const response = await fetch(input, init)
 
-      if (response.status === 403) keycloak.login()
+      if (response.status === 401 || response.status === 403) {
+        const { isAuthLoopBlocked, recordAuthAttempt } = await import('../../utils/authLoopGuard')
+        
+        if (!isAuthLoopBlocked()) {
+          recordAuthAttempt()
+          keycloak.login()
+        } else {
+          console.error('Auth loop detected, not redirecting to login')
+        }
+      }
 
       return response
     },
     headers: {
       'Content-Type': 'application/json;charset=utf-8',
     },
-    prepareHeaders: (headers) => {
+    prepareHeaders: async (headers) => {
+      try {
+        // Обновить токен, если он истекает в течение 30 секунд
+        await keycloak.updateToken(30)
+      } catch (error) {
+        console.error('Failed to refresh token:', error)
+      }
+      
+      if (keycloak.token) {
         headers.set('Authorization', `Bearer ${keycloak.token}`)
+      }
+      
+      return headers
     },
   }),
   tagTypes: ['Task', 'Chain', 'User', 'Submission', 'Stats'],

src/index.tsx

@@ -34,9 +34,22 @@ export const mount = async (Component, element = document.getElementById('app'))
 
     recordAuthAttempt()
     await keycloak.init({
-      onLoad: 'login-required'
+      onLoad: 'login-required',
+      checkLoginIframe: false
     })
 
+    // Настройка автоматического обновления токена
+    setInterval(() => {
+      keycloak.updateToken(70).then((refreshed) => {
+        if (refreshed) {
+          console.log('Token was successfully refreshed')
+        }
+      }).catch(() => {
+        console.error('Failed to refresh token, redirecting to login')
+        keycloak.login()
+      })
+    }, 60000) // Проверять каждую минуту
+
     const userInfo = await keycloak.loadUserInfo()
 
     if (userInfo && keycloak.tokenParsed) {

src/pages/tasks/TaskFormPage.tsx

@@ -26,6 +26,20 @@ import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { ErrorAlert } from '../../components/ErrorAlert'
 import { toaster } from '../../components/ui/toaster'
 
+// Функция для разбиения текста на блоки по 30 строк
+const splitTextIntoBlocks = (text: string, linesPerBlock: number = 30): string[] => {
+  if (!text) return []
+  const lines = text.split('\n')
+  const blocks: string[] = []
+  
+  for (let i = 0; i < lines.length; i += linesPerBlock) {
+    const block = lines.slice(i, i + linesPerBlock).join('\n')
+    blocks.push(block)
+  }
+  
+  return blocks
+}
+
 export const TaskFormPage: React.FC = () => {
   const { id } = useParams<{ id: string }>()
   const navigate = useNavigate()
@@ -394,7 +408,16 @@ export const TaskFormPage: React.FC = () => {
                     overflowY="auto"
                   >
                     {learningMaterial ? (
+                      <VStack align="stretch" gap={4}>
+                        {splitTextIntoBlocks(learningMaterial, 30).map((block, index) => (
                           <Box
+                            key={index}
+                            p={4}
+                            borderWidth="2px"
+                            borderColor="teal.200"
+                            borderRadius="md"
+                            bg="white"
+                            position="relative"
                             className="markdown-preview"
                             css={{
                               '& a': {
@@ -407,8 +430,24 @@ export const TaskFormPage: React.FC = () => {
                               }
                             }}
                           >
-                        <ReactMarkdown>{learningMaterial}</ReactMarkdown>
+                            <Box
+                              position="absolute"
+                              top="-10px"
+                              left="10px"
+                              bg="teal.500"
+                              color="white"
+                              px={2}
+                              py={1}
+                              borderRadius="md"
+                              fontSize="xs"
+                              fontWeight="bold"
+                            >
+                              Блок {index + 1} (30 строк)
                             </Box>
+                            <ReactMarkdown>{block}</ReactMarkdown>
+                          </Box>
+                        ))}
+                      </VStack>
                     ) : (
                       <Text color="gray.400" fontStyle="italic">
                         {t('challenge.admin.tasks.preview.empty')}
@@ -455,7 +494,16 @@ export const TaskFormPage: React.FC = () => {
                   height="100%"
                 >
                   {learningMaterial ? (
+                    <VStack align="stretch" gap={4}>
+                      {splitTextIntoBlocks(learningMaterial, 30).map((block, index) => (
                         <Box
+                          key={index}
+                          p={4}
+                          borderWidth="2px"
+                          borderColor="teal.200"
+                          borderRadius="md"
+                          bg="white"
+                          position="relative"
                           className="markdown-preview"
                           css={{
                             '& a': {
@@ -468,8 +516,24 @@ export const TaskFormPage: React.FC = () => {
                             }
                           }}
                         >
-                      <ReactMarkdown>{learningMaterial}</ReactMarkdown>
+                          <Box
+                            position="absolute"
+                            top="-10px"
+                            left="10px"
+                            bg="teal.500"
+                            color="white"
+                            px={2}
+                            py={1}
+                            borderRadius="md"
+                            fontSize="xs"
+                            fontWeight="bold"
+                          >
+                            Блок {index + 1} (30 строк)
                           </Box>
+                          <ReactMarkdown>{block}</ReactMarkdown>
+                        </Box>
+                      ))}
+                    </VStack>
                   ) : (
                     <Text color="gray.400" fontStyle="italic">
                       {t('challenge.admin.tasks.preview.empty')}