Auth: redirect to org's auth url if we get orgId in app view endpoint

Author: raheeliftikhar5

client/packages/lowcoder/src/api/apiUtils.ts

@@ -121,10 +121,13 @@ export const apiFailureResponseInterceptor = (error: any) => {
       // Need authorization
       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;
           // Redirect to login and set a redirect url.
           StoreRegistry.getStore().dispatch(
             logoutAction({
               notAuthorised: true,
+              organizationId,
             })
           );
           return Promise.reject({

client/packages/lowcoder/src/pages/editor/AppEditor.tsx

@@ -97,14 +97,15 @@ export default function AppEditor() {
   }, [dispatch, applicationId, paramViewMode]);
 
   useEffect(() => {
+    if (!currentUser?.id) return;
     DatasourceApi.fetchJsDatasourceByApp(applicationId).then((res) => {
       res.data.data.forEach((i) => {
         registryDataSourcePlugin(i.type, i.id, i.pluginDefinition);
       });
       setIsDataSourcePluginRegistered(true);
     });
     dispatch(setShowAppSnapshot(false));
-  }, [applicationId, dispatch]);
+  }, [applicationId, dispatch, currentUser]);
 
   useEffect(() => {
     if (!fetchOrgGroupsFinished) {

client/packages/lowcoder/src/redux/reduxActions/userActions.ts

@@ -52,7 +52,10 @@ export const markUserStatus = (type: UserStatusType, value: boolean) => {
   };
 };
 
-type LogoutActionPayload = { notAuthorised?: boolean };
+type LogoutActionPayload = {
+  notAuthorised?: boolean,
+  organizationId?: string,
+};
 export type LogoutActionType = ReduxAction<LogoutActionPayload>;
 export const logoutAction = (payload: LogoutActionPayload) => ({
   type: ReduxActionTypes.LOGOUT_USER_INIT,

client/packages/lowcoder/src/redux/sagas/userSagas.ts

@@ -6,7 +6,7 @@ import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
 } from "constants/reduxActionConstants";
-import { AUTH_LOGIN_URL } from "constants/routesURL";
+import { AUTH_LOGIN_URL, ORG_AUTH_LOGIN_URL } from "constants/routesURL";
 import log from "loglevel";
 import { all, call, delay, put, takeLatest } from "redux-saga/effects";
 import {
@@ -138,7 +138,9 @@ export function* updateUserSaga(action: ReduxAction<UpdateUserPayload>) {
 
 export function* logoutSaga(action: LogoutActionType) {
   try {
-    let redirectURL = AUTH_LOGIN_URL;
+    let redirectURL = action.payload.organizationId
+      ? ORG_AUTH_LOGIN_URL.replace(':orgId', action.payload.organizationId)
+      : AUTH_LOGIN_URL;
     if (action.payload.notAuthorised) {
       const currentUrl = window.location.href
       const urlObj = new URL(currentUrl);