Merge pull request wso2#5508 from pavinduLakshan/fix_suborg_login_flow

.changeset/bright-apricots-hang.md

@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Send empty string when conditional auth is disabled for sub organizations

apps/console/src/features/authentication-flow-builder/components/authentication-flow-visual-editor.tsx

@@ -19,6 +19,7 @@
 import Alert from "@oxygen-ui/react/Alert";
 import AlertTitle from "@oxygen-ui/react/AlertTitle";
 import Button from "@oxygen-ui/react/Button";
+import { OrganizationType } from "@wso2is/common";
 import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
 import { DocumentationLink, useDocumentation } from "@wso2is/react-components";
@@ -38,7 +39,7 @@ import React, {
     useState
 } from "react";
 import { Trans, useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import ReactFlow, {
     Background,
     BackgroundVariant,
@@ -70,6 +71,7 @@ import {
 } from "../../applications/utils/adaptive-script-utils";
 import { AuthenticatorManagementConstants } from "../../connections";
 import useMultiFactorAuthenticatorDetails from "../../connections/api/use-multi-factor-authentication-details";
+import { AppState } from "../../core";
 import { IdentityProviderManagementConstants } from "../../identity-providers/constants";
 import { ConnectorPropertyInterface } from "../../server-configurations";
 import useAuthenticationFlow from "../hooks/use-authentication-flow";
@@ -152,6 +154,9 @@ const AuthenticationFlowVisualEditor: FunctionComponent<AuthenticationFlowVisual
 
     const infoAlertRef: MutableRefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
 
+    const orgType: OrganizationType = useSelector((state: AppState) =>
+        state?.organization?.organizationType);
+
     const [ authenticatorAddStep, setAuthenticatorAddStep ] = useState<number>(0);
     const [ showAuthenticatorAddModal, setShowAuthenticatorAddModal ] = useState<boolean>(false);
     const [ showRevertDisclaimerModal, setShowRevertDisclaimerModal ] = useState<boolean>(false);
@@ -515,10 +520,18 @@ const AuthenticationFlowVisualEditor: FunctionComponent<AuthenticationFlowVisual
                 : AuthenticationSequenceType.USER_DEFINED
         };
 
-        if (!isAdaptiveAuthAvailable
-                || !isConditionalAuthenticationEnabled
-                || AdaptiveScriptUtils.isEmptyScript(authenticationSequence.script)) {
-            sequence.script = AdaptiveScriptUtils.generateScript(authenticationSequence?.steps?.length + 1).join("\n");
+        if (
+            !isAdaptiveAuthAvailable
+            || !isConditionalAuthenticationEnabled
+            || AdaptiveScriptUtils.isEmptyScript(authenticationSequence.script)
+        ) {
+            sequence.script = AdaptiveScriptUtils.generateScript(
+                authenticationSequence?.steps?.length + 1).join("\n"
+            );
+        }
+
+        if (orgType === OrganizationType.SUBORGANIZATION) {
+            sequence.script = "";
         }
 
         // Update the modified script state in the context.