feat: auth page

kafbat · Dec 17, 2024 · 8e78c51 · 8e78c51
1 parent 92b7db6
commit 8e78c51
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/frontend/src/components/AuthPage/AuthPage.tsx b/frontend/src/components/AuthPage/AuthPage.tsx
@@ -11,7 +11,9 @@ function AuthPage() {
   return (
     <S.AuthPageStyled>
       <Header />
-      {data && <SignIn appAuthenticationSettings={data} />}
+      {data && (
+        <SignIn authType={data.authType} oAuthProviders={data.oAuthProviders} />
+      )}
     </S.AuthPageStyled>
   );
 }

diff --git a/frontend/src/components/AuthPage/SignIn/BasicSignIn/BasicSignIn.tsx b/frontend/src/components/AuthPage/SignIn/BasicSignIn/BasicSignIn.tsx
@@ -27,6 +27,7 @@ function BasicSignIn() {
           methods.setError('root', { message: 'error' });
         } else {
           navigate('/');
+          window.location.reload();
         }
       },
     });

diff --git a/frontend/src/components/AuthPage/SignIn/OAuthSignIn/AuthCard/AuthCard.tsx b/frontend/src/components/AuthPage/SignIn/OAuthSignIn/AuthCard/AuthCard.tsx
@@ -24,7 +24,7 @@ function AuthCard({ serviceName, authPath, Icon = ServiceImage }: Props) {
       <S.ServiceButton
         buttonSize="L"
         buttonType="primary"
-        to={`http://localhost:8080${authPath}`}
+        to={`${window.basePath}${authPath}`}
       >
         Log in with {serviceName}
       </S.ServiceButton>

diff --git a/frontend/src/components/AuthPage/SignIn/SignIn.tsx b/frontend/src/components/AuthPage/SignIn/SignIn.tsx
@@ -1,17 +1,16 @@
 import React from 'react';
-import { AppAuthenticationSettings, AuthType } from 'generated-sources';
+import { AuthType, OAuthProvider } from 'generated-sources';
 
 import BasicSignIn from './BasicSignIn/BasicSignIn';
 import * as S from './SignIn.styled';
 import OAuthSignIn from './OAuthSignIn/OAuthSignIn';
 
 interface Props {
-  appAuthenticationSettings: AppAuthenticationSettings;
+  authType?: AuthType;
+  oAuthProviders?: OAuthProvider[];
 }
 
-function SignInForm({ appAuthenticationSettings }: Props) {
-  const { authType, oAuthProviders } = appAuthenticationSettings;
-
+function SignInForm({ authType, oAuthProviders }: Props) {
   return (
     <S.SignInStyled>
       <S.SignInTitle>Sign in</S.SignInTitle>

diff --git a/frontend/src/components/contexts/GlobalSettingsContext.tsx b/frontend/src/components/contexts/GlobalSettingsContext.tsx
@@ -17,20 +17,24 @@ export const GlobalSettingsProvider: React.FC<
 > = ({ children }) => {
   const info = useAppInfo();
   const navigate = useNavigate();
+  const [value, setValue] = React.useState<GlobalSettingsContextProps>({
+    hasDynamicConfig: false,
+  });
 
   React.useEffect(() => {
     if (info.data?.raw.url.includes('auth')) {
       navigate('auth');
+      return;
     }
-  }, []);
 
-  const value = React.useMemo(() => {
-    const features = info.data?.enabledFeatures || [];
-    return {
-      hasDynamicConfig: features.includes(
-        ApplicationInfoEnabledFeaturesEnum.DYNAMIC_CONFIG
-      ),
-    };
+    info.data?.value().then((res) => {
+      const features = res?.enabledFeatures || [];
+      setValue({
+        hasDynamicConfig: features.includes(
+          ApplicationInfoEnabledFeaturesEnum.DYNAMIC_CONFIG
+        ),
+      });
+    });
   }, [info.data]);
 
   return (