added admin login page

Author: raheeliftikhar5

client/packages/lowcoder/src/app.tsx

@@ -28,6 +28,7 @@ import {
   ADMIN_APP_URL,
   ORG_AUTH_FORGOT_PASSWORD_URL,
   ORG_AUTH_RESET_PASSWORD_URL,
+  ADMIN_AUTH_URL,
 } from "constants/routesURL";
 import React from "react";
 import { createRoot } from "react-dom/client";
@@ -337,6 +338,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
                 // component={ApplicationListPage}
                 component={LazyApplicationHome}
               />
+              <LazyRoute exact path={ADMIN_AUTH_URL} component={LazyUserAuthComp} />
               <LazyRoute path={USER_AUTH_URL} component={LazyUserAuthComp} />
               <LazyRoute
                 path={ORG_AUTH_LOGIN_URL}

client/packages/lowcoder/src/constants/routesURL.ts

@@ -4,6 +4,7 @@ import { UserGuideLocationState } from "pages/tutorials/tutorialsConstant";
 import { DatasourceType } from "@lowcoder-ee/constants/queryConstants";
 
 export const BASE_URL = "/";
+export const ADMIN_AUTH_URL = "/admin/login";
 export const USER_AUTH_URL = "/user/auth";
 export const USER_PROFILE_URL = "/user/profile";
 export const NEWS_URL = "/news";

client/packages/lowcoder/src/pages/userAuth/formLogin.tsx renamed to client/packages/lowcoder/src/pages/userAuth/formLoginAdmin.tsx

@@ -1,24 +1,15 @@
 import { FormInput, PasswordInput } from "lowcoder-design";
 import {
-  AuthBottomView,
   ConfirmButton,
   FormWrapperMobile,
-  LoginCardTitle,
-  StyledRouteLink,
 } from "pages/userAuth/authComponents";
 import React, { useContext, useState } from "react";
 import styled from "styled-components";
 import UserApi from "api/userApi";
-import { useRedirectUrl } from "util/hooks";
 import { checkEmailValid, checkPhoneValid } from "util/stringUtils";
 import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants";
 import { trans } from "i18n";
 import { AuthContext, useAuthSubmit } from "pages/userAuth/authUtils";
-import { ThirdPartyAuth } from "pages/userAuth/thirdParty/thirdPartyAuth";
-import { AUTH_FORGOT_PASSWORD_URL, AUTH_REGISTER_URL, ORG_AUTH_FORGOT_PASSWORD_URL, ORG_AUTH_REGISTER_URL } from "constants/routesURL";
-import { Link, useLocation, useParams } from "react-router-dom";
-import { Divider } from "antd";
-import Flex from "antd/es/flex";
 
 export const AccountLoginWrapper = styled(FormWrapperMobile)`
   position: relative;
@@ -38,26 +29,19 @@ type FormLoginProps = {
 export default function FormLogin(props: FormLoginProps) {
   const [account, setAccount] = useState("");
   const [password, setPassword] = useState("");
-  const redirectUrl = useRedirectUrl();
-  const { systemConfig, inviteInfo, fetchUserAfterAuthSuccess } = useContext(AuthContext);
-  const invitationId = inviteInfo?.invitationId;
-  const authId = systemConfig?.form.id;
-  const location = useLocation();
-  const orgId = useParams<any>().orgId;
+  const { fetchUserAfterAuthSuccess } = useContext(AuthContext);
 
   const { onSubmit, loading } = useAuthSubmit(
     () =>
       UserApi.formLogin({
         register: false,
         loginId: account,
         password: password,
-        invitationId: invitationId,
         source: UserConnectionSource.email,
         orgId: props.organizationId,
-        authId,
       }),
     false,
-    redirectUrl,
+    null,
     fetchUserAfterAuthSuccess,
   );
 
@@ -79,38 +63,10 @@ export default function FormLogin(props: FormLoginProps) {
           onChange={(value) => setPassword(value)}
           valueCheck={() => [true, ""]}
         />
-        <Flex justify="end" style={{margin: '10px 0'}}>
-          <Link to={{
-            pathname: orgId
-              ? ORG_AUTH_FORGOT_PASSWORD_URL.replace(':orgId', orgId)
-              : AUTH_FORGOT_PASSWORD_URL,
-            state: location.state
-            }}
-          >
-            {`${trans("userAuth.forgotPassword")}?`}
-          </Link>
-        </Flex>
-        <ConfirmButton loading={loading} disabled={!account || !password} onClick={onSubmit}>
+        <ConfirmButton style={{marginTop: '32px'}} loading={loading} disabled={!account || !password} onClick={onSubmit}>
           {trans("userAuth.login")}
         </ConfirmButton>
-        {props.organizationId && (
-          <ThirdPartyAuth
-            invitationId={invitationId}
-            invitedOrganizationId={props.organizationId}
-            authGoal="login"
-          />
-        )}
       </AccountLoginWrapper>
-      <Divider/>
-      <AuthBottomView>
-        <StyledRouteLink to={{
-          pathname: orgId
-            ? ORG_AUTH_REGISTER_URL.replace(':orgId', orgId)
-            : AUTH_REGISTER_URL,
-          state: location.state
-          }}>{trans("userAuth.register")}
-        </StyledRouteLink>
-      </AuthBottomView>
     </>
   );
 }

client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx

@@ -21,8 +21,7 @@ import { Divider } from "antd";
 import Flex from "antd/es/flex";
 import { validateResponse } from "@lowcoder-ee/api/apiUtils";
 import OrgApi from "@lowcoder-ee/api/orgApi";
-import Card from "antd/es/card/Card";
-import { AccountLoginWrapper } from "./formLogin";
+import { AccountLoginWrapper } from "./formLoginAdmin";
 import { default as Button } from "antd/es/button";
 import LeftOutlined from "@ant-design/icons/LeftOutlined";
 import { fetchConfigAction } from "@lowcoder-ee/redux/reduxActions/configActions";

client/packages/lowcoder/src/pages/userAuth/index.tsx

@@ -1,4 +1,4 @@
-import { AUTH_LOGIN_URL, USER_AUTH_URL } from "constants/routesURL";
+import { ADMIN_AUTH_URL, AUTH_LOGIN_URL, USER_AUTH_URL } from "constants/routesURL";
 import { Redirect, Route, Switch, useLocation, useParams } from "react-router-dom";
 import React, { useEffect, useMemo } from "react";
 import { useSelector, useDispatch } from "react-redux";
@@ -9,6 +9,7 @@ import { AuthLocationState } from "constants/authConstants";
 import { ProductLoading } from "components/ProductLoading";
 import { fetchConfigAction } from "redux/reduxActions/configActions";
 import { fetchUserAction } from "redux/reduxActions/userActions";
+import LoginAdmin from "./loginAdmin";
 import _ from "lodash";
 
 export default function UserAuth() {
@@ -51,6 +52,7 @@ export default function UserAuth() {
     >
       <Switch location={location}>
         <Redirect exact from={USER_AUTH_URL} to={AUTH_LOGIN_URL} />
+        <Route exact path={ADMIN_AUTH_URL} component={LoginAdmin} />
         {AuthRoutes.map((route) => (
           <Route key={route.path} path={route.path} component={route.component} />
         ))}

client/packages/lowcoder/src/pages/userAuth/login.tsx

@@ -3,7 +3,7 @@ import { AuthSearchParams } from "constants/authConstants";
 import { CommonTextLabel } from "components/Label";
 import { trans } from "i18n";
 import { ThirdPartyAuth } from "pages/userAuth/thirdParty/thirdPartyAuth";
-import FormLogin from "@lowcoder-ee/pages/userAuth/formLogin";
+import FormLogin from "@lowcoder-ee/pages/userAuth/formLoginAdmin";
 import { AuthContainer } from "pages/userAuth/authComponents";
 import React, { useContext, useMemo } from "react";
 import { AuthContext, getLoginTitle } from "pages/userAuth/authUtils";
@@ -145,10 +145,6 @@ function Login() {
         subHeading={loginSubHeading}
       >
         <FormLoginSteps organizationId={organizationId} />
-        {/* { Boolean(organizationId)
-          ? <FormLogin organizationId={organizationId} />
-          : <FormLoginSteps />
-        } */}
       </AuthContainer>
     </>
   );

client/packages/lowcoder/src/pages/userAuth/loginAdmin.tsx

@@ -0,0 +1,23 @@
+import { trans } from "i18n";
+import FormLogin from "@lowcoder-ee/pages/userAuth/formLoginAdmin";
+import { AuthContainer } from "pages/userAuth/authComponents";
+import { requiresUnAuth } from "pages/userAuth/authHOC";
+
+// this is the classic Sign In for super admin
+function LoginAdmin() {
+  const loginHeading = trans("userAuth.userLogin");
+  const loginSubHeading = trans("userAuth.poweredByLowcoder");
+
+  return (
+    <>
+      <AuthContainer
+        heading={loginHeading}
+        subHeading={loginSubHeading}
+      >
+        <FormLogin />
+      </AuthContainer>
+    </>
+  );
+}
+
+export default requiresUnAuth(LoginAdmin);