update checks on login page based on env variables

raheeliftikhar5 · raheeliftikhar5 · commit f2400d2c6b08 · 2025-04-22T21:24:54.000+05:00
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx b/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx
@@ -127,7 +127,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
   const isEmailLoginEnabled = useMemo(() => {
     return isFormLoginEnabled && signinEnabled;
   }, [isFormLoginEnabled, signinEnabled]);
- 
+  
   const isEnterpriseMode = useMemo(() => {
     return serverSettings?.LOWCODER_WORKSPACE_MODE === "ENTERPRISE" || serverSettings?.LOWCODER_WORKSPACE_MODE === "SINGLEWORKSPACE";
   }, [serverSettings]);
@@ -239,7 +239,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
           invitedOrganizationId={organizationId}
           authGoal="login"
         />
-        {(isFormLoginEnabled && signupEnabled) && (
+        {(isEmailLoginEnabled && signupEnabled) && (
           <>
             <Divider/>
             <AuthBottomView>
diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/client/packages/lowcoder/src/pages/userAuth/register.tsx
@@ -58,20 +58,24 @@ function UserRegister() {
   const [lastEmailChecked, setLastEmailChecked] = useState("");
   const [signupEnabled, setSignupEnabled] = useState<boolean>(true);
   const [signinEnabled, setSigninEnabled] = useState<boolean>(true);
+  const [defaultOrgId, setDefaultOrgId] = useState<string|undefined>();
   const redirectUrl = useRedirectUrl();
   const serverSettings = useSelector(getServerSettings);
   const { systemConfig, inviteInfo, fetchUserAfterAuthSuccess } = useContext(AuthContext);
   const invitationId = inviteInfo?.invitationId;
-  const isFormLoginEnabled = systemConfig?.form.enableLogin;
+  const isFormLoginEnabled = systemConfig ? systemConfig?.form.enableLogin : true;
   const authId = systemConfig?.form.id;
   const orgId = useParams<any>().orgId;
 
   const organizationId = useMemo(() => {
     if(inviteInfo?.invitedOrganizationId) {
       return inviteInfo?.invitedOrganizationId;
     }
-    return orgId;
-  }, [ inviteInfo, orgId ]);
+    if (orgId) {
+      return orgId;
+    }
+    return defaultOrgId;
+  }, [ inviteInfo, orgId, defaultOrgId ]);
 
   const isEmailLoginEnabled = useMemo(() => {
     return isFormLoginEnabled && signinEnabled;
@@ -81,6 +85,16 @@ function UserRegister() {
     return serverSettings?.LOWCODER_WORKSPACE_MODE === "ENTERPRISE" || serverSettings?.LOWCODER_WORKSPACE_MODE === "SINGLEWORKSPACE";
   }, [serverSettings]);
 
+  useEffect(() => {
+    const {
+      LOWCODER_EMAIL_SIGNUP_ENABLED,
+      LOWCODER_EMAIL_AUTH_ENABLED,
+    } = serverSettings;
+
+    setSignupEnabled(LOWCODER_EMAIL_SIGNUP_ENABLED === 'true');
+    setSigninEnabled(LOWCODER_EMAIL_AUTH_ENABLED === 'true');
+  }, [serverSettings]);
+
   useEffect(() => {
     if (isEnterpriseMode) {
       // dispatch(fetchConfigAction());
@@ -95,6 +109,7 @@ function UserRegister() {
             if (orgList.length) {
               // in Enterprise mode, we will get org data in different format
               const selectedOrgId = orgList[0]?.id || orgList[0]?.orgId;
+              setDefaultOrgId(selectedOrgId);
               dispatch(fetchConfigAction(selectedOrgId));
             }
           }
@@ -172,7 +187,7 @@ function UserRegister() {
         type="large"
       >
         <RegisterContent>
-          { isFormLoginEnabled && (
+          { isEmailLoginEnabled && (
             <>
               <StyledFormInput
                 className="form-input"
@@ -212,7 +227,7 @@ function UserRegister() {
             />
           )}
         </RegisterContent>
-        {isFormLoginEnabled && (
+        {isEmailLoginEnabled && (
           <>
             <Divider/>
             <StyledRouteLinkLogin to={{
diff --git a/client/packages/lowcoder/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx b/client/packages/lowcoder/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx
@@ -154,8 +154,8 @@ export function ThirdPartyAuth(props: {
   return (
     <ThirdPartyLoginButtonWrapper>
       { (
-        (isFormLoginEnabled && props.authGoal === 'login')
-        || (isFormLoginEnabled && isEmailSignupEnabled && props.authGoal === 'register')
+        (isEmailLoginEnabled && props.authGoal === 'login')
+        || (isEmailLoginEnabled && isEmailSignupEnabled && props.authGoal === 'register')
       ) && Boolean(socialLoginButtons.length) && (
         <Divider plain>
           <Text type="secondary">or</Text>
