Fix: Rebase fixes

backend/src/services/org/org-service.ts

@@ -33,6 +33,7 @@ import { TOrgRoleDALFactory } from "./org-role-dal";
 import {
   TDeleteOrgMembershipDTO,
   TFindAllWorkspacesDTO,
+  TFindOrgMembersByEmailDTO,
   TInviteUserToOrgDTO,
   TUpdateOrgDTO,
   TUpdateOrgMembershipDTO,

frontend/src/views/Login/Login.tsx

@@ -5,12 +5,8 @@ import axios from "axios";
 import { fetchUserDetails } from "@app/hooks/api/users/queries";
 import { getAuthToken, isLoggedIn } from "@app/reactQuery";
 
-import { 
-    InitialStep,
-    LDAPStep,
-    MFAStep,
-    SAMLSSOStep} from "./components";
-import { navigateUserToOrg } from "./Login.utils";
+import { InitialStep, LDAPStep, MFAStep, SAMLSSOStep } from "./components";
+import { navigateUserToSelectOrg } from "./Login.utils";
 
 export const Login = () => {
   const router = useRouter();
@@ -74,17 +70,12 @@ export const Login = () => {
           />
         );
       case 2:
-                return (
-                    <SAMLSSOStep setStep={setStep} />
-                );
+        return <SAMLSSOStep setStep={setStep} />;
       case 3:
-                return (
-                    <LDAPStep setStep={setStep} />
-                );
+        return <LDAPStep setStep={setStep} />;
       default:
         return <div />;
     }
-    }
   };
 
   return <div>{renderView()}</div>;