diff --git a/.env b/.env index fab92c8..f9ed347 100644 --- a/.env +++ b/.env @@ -57,7 +57,6 @@ JWT_PASSPHRASE=827c9f8cce8bb82e75b2aec4a14a61f572ac28c7a8531f08dcdf1652573a7049 LOCK_DSN=flock ###< symfony/lock ### -OAUTH_AUTHORIZATION_URL= OAUTH_CLIENT_ID= OAUTH_CLIENT_SECRET= OAUTH_AUTHORIZATION_URL= diff --git a/assets/App.tsx b/assets/App.tsx index c4777b6..22a0482 100644 --- a/assets/App.tsx +++ b/assets/App.tsx @@ -59,7 +59,7 @@ export default function App() { useEffect(() => { getUser().then(() => { setIsAuthenticated(true) - if (location.pathname === '/login') navigate('/search/domain') + if (location.pathname === '/login') navigate('/home') }).catch(() => { setIsAuthenticated(false) navigate('/home') diff --git a/assets/components/tracking/ConnectorsList.tsx b/assets/components/tracking/ConnectorsList.tsx index 722f575..6c60627 100644 --- a/assets/components/tracking/ConnectorsList.tsx +++ b/assets/components/tracking/ConnectorsList.tsx @@ -1,12 +1,17 @@ -import {Card, Divider, Popconfirm, Typography} from "antd"; +import {Card, Divider, Popconfirm, theme, Typography} from "antd"; import {t} from "ttag"; import {DeleteFilled} from "@ant-design/icons"; import React from "react"; import {Connector, deleteConnector} from "../../utils/api/connectors"; +const {useToken} = theme; + + type ConnectorElement = Connector & { id: string } export function ConnectorsList({connectors, onDelete}: { connectors: ConnectorElement[], onDelete: () => void }) { + const {token} = useToken() + return <> {connectors.map(connector => <> @@ -16,7 +21,7 @@ export function ConnectorsList({connectors, onDelete}: { connectors: ConnectorEl onConfirm={() => deleteConnector(connector.id).then(onDelete)} okText={t`Yes`} cancelText={t`No`} - > }> + >}> {t`Provider`} : {connector.provider} diff --git a/assets/pages/LoginPage.tsx b/assets/pages/LoginPage.tsx index 2d2162d..f65762e 100644 --- a/assets/pages/LoginPage.tsx +++ b/assets/pages/LoginPage.tsx @@ -1,6 +1,6 @@ -import React, {createContext, useContext, useState} from "react"; +import React, {createContext, useContext, useEffect, useState} from "react"; import {Alert, Button, Card, Flex, Form, Input} from "antd"; -import {login} from "../utils/api"; +import {getUser, login} from "../utils/api"; import {useNavigate} from "react-router-dom"; import {t} from 'ttag' @@ -11,7 +11,7 @@ type FieldType = { export const AuthenticatedContext = createContext(null) -export default function Page() { +export default function LoginPage() { const [error, setError] = useState() const navigate = useNavigate() @@ -27,6 +27,13 @@ export default function Page() { }) } + useEffect(() => { + getUser().then(() => { + setIsAuthenticated(true) + navigate('/home') + }) + }, []) + return