Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Fix initial Login page shows username/password fields even though VITE_DISABLE_EMAIL_PASSWORD_AUTHENTICATION is true

fzaninotto3d8fa16258e3
diff --git a/src/components/atomic-crm/login/LoginPage.tsx b/src/components/atomic-crm/login/LoginPage.tsx
index cdbec9e2..699ae2eb 100644
--- a/src/components/atomic-crm/login/LoginPage.tsx
+++ b/src/components/atomic-crm/login/LoginPage.tsx
@@ -7,6 +7,10 @@ import { TextInput } from "@/components/admin/text-input";
import { Notification } from "@/components/admin/notification";
import { useConfigurationContext } from "@/components/atomic-crm/root/ConfigurationContext.tsx";
import { SSOAuthButton } from "./SSOAuthButton";
+import {
+ disableEmailPasswordAuthentication,
+ googleWorkplaceDomain,
+} from "./authConfig";
/**
* Login page displayed when authentication is enabled and the user is not authenticated.
@@ -18,12 +22,7 @@ import { SSOAuthButton } from "./SSOAuthButton";
* @see {@link https://marmelab.com/shadcn-admin-kit/docs/security Security documentation}
*/
export const LoginPage = (props: { redirectTo?: string }) => {
- const {
- darkModeLogo,
- title,
- googleWorkplaceDomain,
- disableEmailPasswordAuthentication,
- } = useConfigurationContext();
+ const { darkModeLogo, title } = useConfigurationContext();
const { redirectTo } = props;
const [loading, setLoading] = useState(false);
const hasDisplayedRecoveryNotification = useRef(false);
diff --git a/src/components/atomic-crm/login/SignupPage.tsx b/src/components/atomic-crm/login/SignupPage.tsx
index 7d586f03..27c1ac7f 100644
--- a/src/components/atomic-crm/login/SignupPage.tsx
+++ b/src/components/atomic-crm/login/SignupPage.tsx
@@ -14,15 +14,12 @@ import { LoginSkeleton } from "./LoginSkeleton";
import { Notification } from "@/components/admin/notification";
import { ConfirmationRequired } from "./ConfirmationRequired";
import { SSOAuthButton } from "./SSOAuthButton";
+import { googleWorkplaceDomain } from "./authConfig";
export const SignupPage = () => {
const queryClient = useQueryClient();
const dataProvider = useDataProvider<CrmDataProvider>();
- const {
- darkModeLogo: logo,
- title,
- googleWorkplaceDomain,
- } = useConfigurationContext();
+ const { darkModeLogo: logo, title } = useConfigurationContext();
const navigate = useNavigate();
const translate = useTranslate();
const { data: isInitialized, isPending } = useQuery({
diff --git a/src/components/atomic-crm/login/StartPage.tsx b/src/components/atomic-crm/login/StartPage.tsx
index 56127e43..cd92ba3d 100644
--- a/src/components/atomic-crm/login/StartPage.tsx
+++ b/src/components/atomic-crm/login/StartPage.tsx
@@ -2,14 +2,13 @@ import { useQuery } from "@tanstack/react-query";
import { useDataProvider } from "ra-core";
import { Navigate } from "react-router-dom";
-import { useConfigurationContext } from "../root/ConfigurationContext";
import type { CrmDataProvider } from "../providers/types";
import { LoginSkeleton } from "./LoginSkeleton";
import { LoginPage } from "./LoginPage";
+import { disableEmailPasswordAuthentication } from "./authConfig";
export const StartPage = () => {
const dataProvider = useDataProvider<CrmDataProvider>();
- const { disableEmailPasswordAuthentication } = useConfigurationContext();
const {
data: isInitialized,
error,
diff --git a/src/components/atomic-crm/login/authConfig.ts b/src/components/atomic-crm/login/authConfig.ts
new file mode 100644
index 00000000..04e9d8a3
--- /dev/null
+++ b/src/components/atomic-crm/login/authConfig.ts
@@ -0,0 +1,5 @@
+export const disableEmailPasswordAuthentication =
+ import.meta.env.VITE_DISABLE_EMAIL_PASSWORD_AUTHENTICATION === "true";
+
+export const googleWorkplaceDomain: string | undefined = import.meta.env
+ .VITE_GOOGLE_WORKPLACE_DOMAIN;
diff --git a/src/components/atomic-crm/root/CRM.tsx b/src/components/atomic-crm/root/CRM.tsx
index 7f7995e4..37372b60 100644
--- a/src/components/atomic-crm/root/CRM.tsx
+++ b/src/components/atomic-crm/root/CRM.tsx
@@ -127,9 +127,6 @@ export const CRM = ({
authProvider = defaultAuthProviderBuilder(),
i18nProvider = defaulti18nProvider,
store = defaultStore,
- googleWorkplaceDomain = import.meta.env.VITE_GOOGLE_WORKPLACE_DOMAIN,
- disableEmailPasswordAuthentication = import.meta.env
- .VITE_DISABLE_EMAIL_PASSWORD_AUTHENTICATION === "true",
disableTelemetry,
...rest
}: CRMProps) => {
@@ -162,8 +159,6 @@ export const CRM = ({
title,
darkModeLogo,
lightModeLogo,
- googleWorkplaceDomain,
- disableEmailPasswordAuthentication,
} satisfies ConfigurationContextValue);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/components/atomic-crm/root/ConfigurationContext.tsx b/src/components/atomic-crm/root/ConfigurationContext.tsx
index 6efedbaf..3a29ebdd 100644
--- a/src/components/atomic-crm/root/ConfigurationContext.tsx
+++ b/src/components/atomic-crm/root/ConfigurationContext.tsx
@@ -17,8 +17,6 @@ export interface ConfigurationContextValue {
title: string;
darkModeLogo: string;
lightModeLogo: string;
- googleWorkplaceDomain?: string;
- disableEmailPasswordAuthentication?: boolean;
}
export const useConfigurationContext = () => {