🪟🎉 Enable keycloak by default (#12037)

Co-authored-by: Teal Larson <[email protected]>
airbytehq · Apr 15, 2024 · fc45d32 · fc45d32
1 parent 1ddb612
commit fc45d32
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/airbyte-webapp/src/packages/cloud/views/auth/LoginPage/LoginPage.tsx b/airbyte-webapp/src/packages/cloud/views/auth/LoginPage/LoginPage.tsx
@@ -55,8 +55,8 @@ export const LoginPage: React.FC = () => {
   const { registerNotification } = useNotificationService();
   const { trackError } = useAppMonitoringService();
   const [searchParams] = useSearchParams();
-  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", false);
-  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", false);
+  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", true);
+  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", true);
   const keycloakAuthEnabled = keycloakAuthEnabledExperiment || keycloakAuthEnabledLocalStorage;
   const loginRedirectString = searchParams.get("loginRedirect");
   const isAcceptingInvitation = loginRedirectString?.includes("accept-invite");

diff --git a/airbyte-webapp/src/packages/cloud/views/auth/OAuthLogin/OAuthLogin.test.tsx b/airbyte-webapp/src/packages/cloud/views/auth/OAuthLogin/OAuthLogin.test.tsx
@@ -8,8 +8,14 @@ import { OAuthLogin } from "./OAuthLogin";
 
 const mockLoginWithOAuth = jest.fn();
 
+const mockRedirectToSignInWithGithub = jest.fn().mockReturnValue(Promise.resolve());
+const mockRedirectToSignInWithGoogle = jest.fn().mockReturnValue(Promise.resolve());
+
 jest.mock("packages/cloud/services/auth/KeycloakService", () => ({
-  useKeycloakService: () => ({ redirectToSignInWithGithub: jest.fn(), redirectToSignInWithGoogle: jest.fn() }),
+  useKeycloakService: () => ({
+    redirectToSignInWithGithub: mockRedirectToSignInWithGithub,
+    redirectToSignInWithGoogle: mockRedirectToSignInWithGoogle,
+  }),
 }));
 
 describe("OAuthLogin", () => {
@@ -22,14 +28,14 @@ describe("OAuthLogin", () => {
       wrapper: TestWrapper,
     });
     await userEvents.click(getByTestId("googleOauthLogin"));
-    expect(mockLoginWithOAuth).toHaveBeenCalledWith("google");
+    expect(mockRedirectToSignInWithGoogle).toHaveBeenCalled();
   });
 
   it("should call auth service for GitHub", async () => {
     const { getByTestId } = render(<OAuthLogin loginWithOAuth={mockLoginWithOAuth} type="login" />, {
       wrapper: TestWrapper,
     });
     await userEvents.click(getByTestId("githubOauthLogin"));
-    expect(mockLoginWithOAuth).toHaveBeenCalledWith("github");
+    expect(mockRedirectToSignInWithGithub).toHaveBeenCalled();
   });
 });
diff --git a/airbyte-webapp/src/packages/cloud/views/auth/OAuthLogin/OAuthLogin.tsx b/airbyte-webapp/src/packages/cloud/views/auth/OAuthLogin/OAuthLogin.tsx
@@ -76,8 +76,8 @@ export const OAuthLogin: React.FC<OAuthLoginProps> = ({ loginWithOAuth, type })
   const [searchParams] = useSearchParams();
   const loginRedirect = searchParams.get("loginRedirect");
   const navigate = useNavigate();
-  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", false);
-  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", false);
+  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", true);
+  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", true);
   const keycloakAuthEnabled = keycloakAuthEnabledExperiment || keycloakAuthEnabledLocalStorage;
   const {
     redirectToSignInWithGithub,

diff --git a/airbyte-webapp/src/packages/cloud/views/auth/SignupPage/SignupPage.tsx b/airbyte-webapp/src/packages/cloud/views/auth/SignupPage/SignupPage.tsx
@@ -33,8 +33,8 @@ const Detail: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => {
 };
 
 const SignupPage: React.FC<SignupPageProps> = () => {
-  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", false);
-  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", false);
+  const [keycloakAuthEnabledLocalStorage] = useLocalStorage("airbyte_keycloak-auth-ui", true);
+  const keycloakAuthEnabledExperiment = useExperiment("authPage.keycloak", true);
   const keycloakAuthEnabled = keycloakAuthEnabledExperiment || keycloakAuthEnabledLocalStorage;
   const { loginWithOAuth, signUp } = useAuthService();
   useTrackPage(PageTrackingCodes.SIGNUP);