From 926f7199677991f22a23671197218c636d0b029d Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:41:48 +0100
Subject: [PATCH] Fix: Rebase fixes

---
 backend/src/services/org/org-service.ts |  1 +
 frontend/src/views/Login/Login.tsx      | 67 +++++++++++--------------
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts
index bab3b9869..64cd51e09 100644
--- a/backend/src/services/org/org-service.ts
+++ b/backend/src/services/org/org-service.ts
@@ -33,6 +33,7 @@ import { TOrgRoleDALFactory } from "./org-role-dal";
 import {
   TDeleteOrgMembershipDTO,
   TFindAllWorkspacesDTO,
+  TFindOrgMembersByEmailDTO,
   TInviteUserToOrgDTO,
   TUpdateOrgDTO,
   TUpdateOrgMembershipDTO,
diff --git a/frontend/src/views/Login/Login.tsx b/frontend/src/views/Login/Login.tsx
index 0f3586238..31695869f 100644
--- a/frontend/src/views/Login/Login.tsx
+++ b/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();
@@ -52,38 +48,33 @@ export const Login = () => {
     }
   }, []);
 
-    const renderView = () => {
-        switch (step) {
-            case 0:
-                return (
-                    <InitialStep 
-                        setStep={setStep}
-                        email={email}
-                        setEmail={setEmail}
-                        password={password}
-                        setPassword={setPassword}
-                    />
-                );
-            case 1:
-                return (
-                    <MFAStep 
-                        email={email}
-                        password={password}
-                        providerAuthToken={undefined}
-                        callbackPort={queryParams.get("callback_port")}
-                    />
-                );
-            case 2:
-                return (
-                    <SAMLSSOStep setStep={setStep} />
-                );
-            case 3:
-                return (
-                    <LDAPStep setStep={setStep} />
-                );
-            default:
-                return <div />;
-        }
+  const renderView = () => {
+    switch (step) {
+      case 0:
+        return (
+          <InitialStep
+            setStep={setStep}
+            email={email}
+            setEmail={setEmail}
+            password={password}
+            setPassword={setPassword}
+          />
+        );
+      case 1:
+        return (
+          <MFAStep
+            email={email}
+            password={password}
+            providerAuthToken={undefined}
+            callbackPort={queryParams.get("callback_port")}
+          />
+        );
+      case 2:
+        return <SAMLSSOStep setStep={setStep} />;
+      case 3:
+        return <LDAPStep setStep={setStep} />;
+      default:
+        return <div />;
     }
   };