show login/signup form when used workspace/invitation url

raheeliftikhar5 · raheeliftikhar5 · commit 2b36ad309964 · 2025-04-23T16:56:48.000+05:00
diff --git a/client/packages/lowcoder/src/pages/common/inviteLanding.tsx b/client/packages/lowcoder/src/pages/common/inviteLanding.tsx
@@ -45,7 +45,7 @@ function InviteLanding(props: InviteLandingProp) {
           orgId = inviteInfo.invitedOrganizationId;
           const inviteState = inviteInfo ? { ...inviteInfo, invitationId } : { invitationId };
           history.push({
-            pathname: AUTH_LOGIN_URL,
+            pathname: `/org/${orgId}/auth/login`,
             state: {
               inviteInfo: inviteState,
             },
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLoginAdmin.tsx b/client/packages/lowcoder/src/pages/userAuth/formLoginAdmin.tsx
@@ -31,6 +31,13 @@ export default function FormLogin(props: FormLoginProps) {
   const [password, setPassword] = useState("");
   const { fetchUserAfterAuthSuccess } = useContext(AuthContext);
 
+  const afterLoginSuccess = () => {
+    if (props.organizationId) {
+      localStorage.setItem("lowcoder_login_orgId", props.organizationId);
+    }
+    fetchUserAfterAuthSuccess?.();
+  }
+
   const { onSubmit, loading } = useAuthSubmit(
     () =>
       UserApi.formLogin({
@@ -42,7 +49,7 @@ export default function FormLogin(props: FormLoginProps) {
       }),
     false,
     null,
-    fetchUserAfterAuthSuccess,
+    afterLoginSuccess,
   );
 
   return (
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx b/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx
@@ -230,10 +230,16 @@ export default function FormLoginSteps(props: FormLoginProps) {
     }
   }, [isEnterpriseMode]);
 
-  if (isEnterpriseMode) {
+  useEffect(() => {
+    if (Boolean(props.organizationId)) {
+      fetchOrgsByEmail();
+    }
+  }, [props.organizationId]);
+
+  if (isEnterpriseMode || Boolean(props.organizationId)) {
     return (
       <Spin indicator={<LoadingOutlined style={{ fontSize: 30 }} />} spinning={isFetchingConfig}>
-        { isEmailLoginEnabled && <FormLogin /> }
+        { isEmailLoginEnabled && <FormLogin organizationId={props.organizationId} /> }
         <ThirdPartyAuth
           invitationId={invitationId}
           invitedOrganizationId={organizationId}
@@ -244,7 +250,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
             <Divider/>
             <AuthBottomView>
               <StyledRouteLink to={{
-                pathname: AUTH_REGISTER_URL,
+                pathname: props.organizationId ? `/org/${props.organizationId}/auth/register` : AUTH_REGISTER_URL,
                 state: {...location.state || {}, email: account}
               }}>
                 {trans("userAuth.register")}
