on logout, user should redirect to workspace login page when login/register using workspace url

raheeliftikhar5 · raheeliftikhar5 · commit 79c07b0af58d · 2025-04-19T01:22:04.000+05:00
diff --git a/client/packages/lowcoder/src/api/apiUtils.ts b/client/packages/lowcoder/src/api/apiUtils.ts
@@ -122,7 +122,14 @@ export const apiFailureResponseInterceptor = (error: any) => {
       if (!notAuthRequiredPath(error.config?.url)) {
         if (error.response.status === API_STATUS_CODES.REQUEST_NOT_AUTHORISED) {
           // get x-org-id from failed request
-          const organizationId = error.response.headers['x-org-id'] || undefined;
+          let organizationId;
+          if (error.response.headers['x-org-id']) {
+            organizationId = error.response.headers['x-org-id'];
+          }
+          if (localStorage.getItem('lowcoder_login_orgId')) {
+            organizationId = localStorage.getItem('lowcoder_login_orgId');
+            localStorage.removeItem('lowcoder_login_orgId');
+          }
           // Redirect to login and set a redirect url.
           StoreRegistry.getStore().dispatch(
             logoutAction({
diff --git a/client/packages/lowcoder/src/pages/common/profileDropdown.tsx b/client/packages/lowcoder/src/pages/common/profileDropdown.tsx
@@ -150,7 +150,13 @@ export default function ProfileDropdown(props: DropDownProps) {
       dispatch(profileSettingModalVisible(true));
     } else if (e.key === "logout") {
       // logout
-      dispatch(logoutAction({}));
+      const organizationId = localStorage.getItem('lowcoder_login_orgId');
+      if (organizationId) {
+        localStorage.removeItem('lowcoder_login_orgId');
+      }
+      dispatch(logoutAction({
+        organizationId: organizationId || undefined,
+      }));
     } else if (e.keyPath.includes("switchOrg")) {
       if (e.key === "newOrganization") {
         // create new organization
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx b/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx
@@ -155,6 +155,13 @@ export default function FormLoginSteps(props: FormLoginProps) {
     setSigninEnabled(LOWCODER_EMAIL_AUTH_ENABLED === 'true');
   }, [serverSettings]);
 
+  const afterLoginSuccess = () => {
+    if (props.organizationId) {
+      localStorage.setItem("lowcoder_login_orgId", props.organizationId);
+    }
+    fetchUserAfterAuthSuccess?.();
+  }
+
   const { onSubmit, loading } = useAuthSubmit(
     () =>
       UserApi.formLogin({
@@ -168,7 +175,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
       }),
     false,
     redirectUrl,
-    fetchUserAfterAuthSuccess,
+    afterLoginSuccess,
   );
 
   const fetchOrgsByEmail = () => {
@@ -274,7 +281,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")}
diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/client/packages/lowcoder/src/pages/userAuth/register.tsx
@@ -86,6 +86,13 @@ function UserRegister() {
     };
   }, [serverSettings]);
   
+  const afterLoginSuccess = () => {
+    if (organizationId) {
+      localStorage.setItem("lowcoder_login_orgId", organizationId);
+    }
+    fetchUserAfterAuthSuccess?.();
+  }
+
   const { loading, onSubmit } = useAuthSubmit(
     () =>
       UserApi.formLogin({
@@ -99,7 +106,7 @@ function UserRegister() {
       }),
     false,
     redirectUrl,
-    fetchUserAfterAuthSuccess,
+    afterLoginSuccess,
   );
 
   const checkEmailExist = () => {
