@salesforce/templates 66.5.5 → 66.5.6

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/api/userProfileApi.ts

@@ -1,24 +1,24 @@
 /**
  * Extensible user profile fetching and updating via UI API GraphQL.
  */
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { flattenGraphQLRecord } from "../utils/helpers";
 
 const USER_PROFILE_FIELDS_FULL = `
     Id
-    FirstName { value }
-    LastName { value }
-    Email { value }
-    Phone { value }
-    Street { value }
-    City { value }
-    State { value }
-    PostalCode { value }
-    Country { value }`;
+    FirstName @optional { value }
+    LastName @optional { value }
+    Email @optional { value }
+    Phone @optional { value }
+    Street @optional { value }
+    City @optional { value }
+    State @optional { value }
+    PostalCode @optional { value }
+    Country @optional { value }`;
 
 const USER_CONTACT_FIELDS = `
     Id
-    ContactId { value }`;
+    ContactId @optional { value }`;
 
 function getUserProfileQuery(fields: string): string {
 	return `
@@ -61,7 +61,7 @@ export async function fetchUserProfile<T>(
 	userId: string,
 	fields: string = USER_PROFILE_FIELDS_FULL,
 ): Promise<T> {
-	const data = await getDataSDK();
+	const data = await createDataSDK();
 	const response: any = await data.graphql?.(getUserProfileQuery(fields), {
 		userId,
 	});
@@ -86,7 +86,7 @@ export async function updateUserProfile<T>(
 	userId: string,
 	values: Record<string, unknown>,
 ): Promise<T> {
-	const data = await getDataSDK();
+	const data = await createDataSDK();
 	const response: any = await data.graphql?.(getUserProfileMutation(USER_PROFILE_FIELDS_FULL), {
 		input: { Id: userId, User: { ...values } },
 	});

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/layouts/privateRouteLayout.tsx

@@ -3,17 +3,25 @@ import { useAuth } from "../context/AuthContext";
 import { AUTH_REDIRECT_PARAM, ROUTES } from "../authenticationConfig";
 import { CardSkeleton } from "../layout/card-skeleton";
 
+export interface PrivateRouteProps {
+	/**
+	 * Whether to show a card skeleton placeholder while authentication is loading.
+	 * @default false
+	 */
+	showCardSkeleton?: boolean;
+}
+
 /**
  * [Dev Note] Route Guard:
  * Renders the child route (Outlet) if the user is authenticated.
  * Otherwise, redirects to Login with a 'startUrl' parameter so the user can be
  * returned to this page after successful login.
  */
-export default function PrivateRoute() {
+export default function PrivateRoute({ showCardSkeleton = false }: PrivateRouteProps) {
 	const { isAuthenticated, loading } = useAuth();
 	const location = useLocation();
 
-	if (loading) return <CardSkeleton contentMaxWidth="md" />;
+	if (loading) return showCardSkeleton ? <CardSkeleton contentMaxWidth="md" /> : null;
 
 	if (!isAuthenticated) {
 		const searchParams = new URLSearchParams();

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/ChangePassword.tsx

@@ -4,7 +4,7 @@ import { z } from "zod";
 import { CenteredPageLayout } from "../layout/centered-page-layout";
 import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { newPasswordSchema } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
@@ -28,7 +28,7 @@ export default function ChangePassword() {
 			try {
 				// [Dev Note] Custom Apex Endpoint: /auth/change-password
 				// You must ensure this Apex class exists in your org
-				const sdk = await getDataSDK();
+				const sdk = await createDataSDK();
 				const response = await sdk.fetch!("/services/apexrest/auth/change-password", {
 					method: "POST",
 					body: JSON.stringify({

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/ForgotPassword.tsx

@@ -3,7 +3,7 @@ import { z } from "zod";
 import { CenteredPageLayout } from "../layout/centered-page-layout";
 import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
 
@@ -24,7 +24,7 @@ export default function ForgotPassword() {
 			try {
 				// [Dev Note] Custom Apex Endpoint: /auth/forgot-password
 				// You must ensure this Apex class exists in your org
-				const sdk = await getDataSDK();
+				const sdk = await createDataSDK();
 				const response = await sdk.fetch!("/services/apexrest/auth/forgot-password", {
 					method: "POST",
 					body: JSON.stringify({ username: value.username.trim() }),

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/Login.tsx

@@ -4,7 +4,7 @@ import { z } from "zod";
 import { CenteredPageLayout } from "../layout/centered-page-layout";
 import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { ROUTES } from "../authenticationConfig";
 import { emailSchema, getStartUrl, type AuthResponse } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
@@ -30,7 +30,7 @@ export default function Login() {
 				// "/services/apexrest/auth/login" refers to a custom Apex REST resource.
 				// You must ensure this Apex class exists in your org and handles the login logic
 				// (e.g., creating a session or returning a token).
-				const sdk = await getDataSDK();
+				const sdk = await createDataSDK();
 				const response = await sdk.fetch!("/services/apexrest/auth/login", {
 					method: "POST",
 					body: JSON.stringify({

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/Profile.tsx

@@ -46,8 +46,19 @@ export default function Profile() {
 			setSubmitError(null);
 			setSuccess(false);
 			try {
-				const updated = await updateUserProfile<ProfileFormValues>(user.id, value);
-				setProfile(updated);
+				const updated = await updateUserProfile<Partial<ProfileFormValues>>(user.id, value);
+				// Merge with submitted values so missing fields (e.g. due to FLS) don't break the form
+				setProfile({
+					FirstName: updated.FirstName ?? value.FirstName ?? "",
+					LastName: updated.LastName ?? value.LastName ?? "",
+					Email: updated.Email ?? value.Email ?? "",
+					Phone: updated.Phone ?? value.Phone ?? null,
+					Street: updated.Street ?? value.Street ?? null,
+					City: updated.City ?? value.City ?? null,
+					State: updated.State ?? value.State ?? null,
+					PostalCode: updated.PostalCode ?? value.PostalCode ?? null,
+					Country: updated.Country ?? value.Country ?? null,
+				});
 				setSuccess(true);
 				window.scrollTo({ top: 0, behavior: "smooth" });
 			} catch (err) {
@@ -59,10 +70,21 @@ export default function Profile() {
 
 	useEffect(() => {
 		let mounted = true;
-		fetchUserProfile<ProfileFormValues>(user.id)
+		fetchUserProfile<Partial<ProfileFormValues>>(user.id)
 			.then((data) => {
 				if (mounted) {
-					setProfile(data);
+					// Merge with defaults so missing fields (e.g. due to FLS) don't break the form
+					setProfile({
+						FirstName: data.FirstName ?? "",
+						LastName: data.LastName ?? "",
+						Email: data.Email ?? "",
+						Phone: data.Phone ?? null,
+						Street: data.Street ?? null,
+						City: data.City ?? null,
+						State: data.State ?? null,
+						PostalCode: data.PostalCode ?? null,
+						Country: data.Country ?? null,
+					});
 				}
 			})
 			.catch((err: any) => {

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/Register.tsx

@@ -4,7 +4,7 @@ import { z } from "zod";
 import { CenteredPageLayout } from "../layout/centered-page-layout";
 import { AuthForm } from "../forms/auth-form";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { emailSchema, passwordSchema, getStartUrl, type AuthResponse } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
@@ -47,7 +47,7 @@ export default function Register() {
 				// You must ensure this Apex class exists in your org and handles registration
 				// (e.g., duplicate checks and user creation such as Site.createExternalUser).
 				const { confirmPassword, ...request } = formFieldValues;
-				const sdk = await getDataSDK();
+				const sdk = await createDataSDK();
 				const response = await sdk.fetch!("/services/apexrest/auth/register", {
 					method: "POST",
 					body: JSON.stringify({ request }),

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/pages/ResetPassword.tsx

@@ -5,7 +5,7 @@ import { CenteredPageLayout } from "../layout/centered-page-layout";
 import { AuthForm } from "../forms/auth-form";
 import { StatusAlert } from "../../../components/alerts/status-alert";
 import { useAppForm } from "../hooks/form";
-import { getDataSDK } from "@salesforce/sdk-data";
+import { createDataSDK } from "@salesforce/sdk-data";
 import { ROUTES, AUTH_PLACEHOLDERS } from "../authenticationConfig";
 import { newPasswordSchema } from "../authHelpers";
 import { handleApiResponse, getErrorMessage } from "../utils/helpers";
@@ -25,7 +25,7 @@ export default function ResetPassword() {
 			try {
 				// [Dev Note] Custom Apex Endpoint: /auth/reset-password
 				// You must ensure this Apex class exists in your org
-				const sdk = await getDataSDK();
+				const sdk = await createDataSDK();
 				const response = await sdk.fetch!("/services/apexrest/auth/reset-password", {
 					method: "POST",
 					body: JSON.stringify({ token, newPassword: value.newPassword }),

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/sessionTimeout/SessionTimeoutValidator.tsx

@@ -253,19 +253,14 @@ function useSessionTimeout(config: SessionTimeoutConfig): SessionTimeoutResult {
 		isPollingRef.current = true;
 		setIsPolling(true);
 
-		try {
-			const response = await pollSessionTimeServlet(basePath);
+		const response = await pollSessionTimeServlet(basePath);
+		isPollingRef.current = false;
+		setIsPolling(false);
 
-			// Success - reset retry state and process response
-			isPollingRef.current = false;
-			setIsPolling(false);
+		if (response) {
 			retry.resetRetry();
 			processTimeoutResponse(response.sr);
-		} catch (error) {
-			console.error("[useSessionTimeout] Poll failed:", error);
-			// Reset polling flags before retry so handleRetryWithBackoff doesn't skip
-			isPollingRef.current = false;
-			setIsPolling(false);
+		} else {
 			handleRetryWithBackoff(() => checkSessionRef.current?.());
 		}
 	}, [basePath, retry, processTimeoutResponse, handleRetryWithBackoff]);
@@ -274,15 +269,12 @@ function useSessionTimeout(config: SessionTimeoutConfig): SessionTimeoutResult {
 	 * Extend the session (called when user clicks "Continue Working")
 	 */
 	const extendSession = useCallback(async () => {
-		try {
-			const response = await extendSessionTime(basePath);
+		const response = await extendSessionTime(basePath);
 
-			// Reset retry state and process the new session time
+		if (response) {
 			retry.resetRetry();
 			processTimeoutResponse(response.sr);
-		} catch (error) {
-			console.error("[useSessionTimeout] Failed to extend session:", error);
-			// On failure, retry extending session (not checkSession)
+		} else {
 			handleRetryWithBackoff(() => extendSessionRef.current?.());
 		}
 	}, [basePath, retry, processTimeoutResponse, handleRetryWithBackoff]);

package/lib/templates/project/reactb2x/_p_/_m_/_w_/_a_/src/_f_/authentication/sessionTimeout/sessionTimeService.ts

@@ -20,10 +20,9 @@ export interface SessionResponse {
  * Handles CSRF protection prefix
  *
  * @param text - Raw response text from servlet
- * @returns Parsed session response
- * @throws Error if response cannot be parsed
+ * @returns Parsed session response, or undefined if parsing fails
  */
-function parseResponseResult(text: string): SessionResponse {
+function parseResponseResult(text: string): SessionResponse | undefined {
 	let cleanedText = text;
 
 	// Strip CSRF protection prefix if present
@@ -45,25 +44,23 @@ function parseResponseResult(text: string): SessionResponse {
 		return parsed;
 	} catch (error) {
 		console.error("[sessionTimeService] Failed to parse response:", error, "Text:", cleanedText);
-		throw new Error(
-			`Failed to parse session response: ${error instanceof Error ? error.message : "Unknown error"}`,
-		);
 	}
 }
 
 /**
  * Call SessionTimeServlet API
- * Internal function used by both poll and extend functions
+ * Internal function used by both poll and extend functions.
+ * Returns undefined on any failure so the session timeout feature
+ * never crashes the running application.
  *
  * @param basePath - Community base path (e.g., "/sfsites/c/")
  * @param extend - Whether to extend the session (updateTimedOutSession param)
- * @returns Session response with remaining time
- * @throws Error if API call fails or security checks fail
+ * @returns Session response with remaining time, or undefined on failure
  */
 async function callSessionTimeServlet(
 	basePath: string,
 	extend: boolean = false,
-): Promise<SessionResponse> {
+): Promise<SessionResponse | undefined> {
 	// Build URL with cache-busting timestamp
 	const timestamp = Date.now();
 	let url = `${basePath}${SESSION_CONFIG.SERVLET_URL}?buster=${timestamp}`;
@@ -75,47 +72,37 @@ async function callSessionTimeServlet(
 	try {
 		const response = await fetch(url, {
 			method: "GET",
-			credentials: "same-origin", // Include cookies for session
+			credentials: "same-origin",
 			cache: "no-cache",
-			// Security headers
 			headers: {
-				"X-Requested-With": "XMLHttpRequest", // Helps identify XHR requests
+				"X-Requested-With": "XMLHttpRequest",
 			},
 		});
 
 		if (!response.ok) {
-			// Provide more context for common error codes
-			if (response.status === 401) {
-				throw new Error("Session expired or unauthorized");
-			} else if (response.status === 403) {
-				throw new Error("Access forbidden");
-			} else if (response.status === 404) {
-				throw new Error("Session endpoint not found");
-			} else {
-				throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-			}
+			console.error(`[sessionTimeService] HTTP ${response.status}: ${response.statusText}`);
+			return undefined;
 		}
 
-		// Security: Validate content type (should be text or JSON)
 		const contentType = response.headers.get("content-type");
 		if (contentType && !contentType.includes("text") && !contentType.includes("json")) {
-			throw new Error(`Unexpected content type: ${contentType}`);
+			console.error(`[sessionTimeService] Unexpected content type: ${contentType}`);
+			return undefined;
 		}
 
 		const text = await response.text();
 		const parsed = parseResponseResult(text);
-
-		// Apply latency buffer to account for network delay
-		const adjustedSecondsRemaining = Math.max(0, parsed.sr - SESSION_CONFIG.LATENCY_BUFFER_SECONDS);
+		if (!parsed) {
+			return undefined;
+		}
 
 		return {
 			sp: parsed.sp,
-			sr: adjustedSecondsRemaining,
+			sr: Math.max(0, parsed.sr - SESSION_CONFIG.LATENCY_BUFFER_SECONDS),
 		};
 	} catch (error) {
-		// Don't log the full URL in production to avoid leaking sensitive info
 		console.error("[sessionTimeService] API call failed:", error);
-		throw error;
+		return undefined;
 	}
 }
 
@@ -124,17 +111,17 @@ async function callSessionTimeServlet(
  * Called periodically to monitor session status
  *
  * @param basePath - Community base path (e.g., "/sfsites/c/")
- * @returns Session response with remaining time (after latency buffer adjustment)
- * @throws Error if API call fails
+ * @returns Session response with remaining time, or undefined on failure
  *
  * @example
- * const { sr, sp } = await pollSessionTimeServlet('/sfsites/c/');
- * if (sr <= 300) {
- *   // Less than 5 minutes remaining
+ * const response = await pollSessionTimeServlet('/sfsites/c/');
+ * if (response && response.sr <= 300) {
  *   showWarning();
  * }
  */
-export async function pollSessionTimeServlet(basePath: string): Promise<SessionResponse> {
+export async function pollSessionTimeServlet(
+	basePath: string,
+): Promise<SessionResponse | undefined> {
 	return callSessionTimeServlet(basePath, false);
 }
 
@@ -143,14 +130,15 @@ export async function pollSessionTimeServlet(basePath: string): Promise<SessionR
  * Called when user clicks "Continue Working" in warning modal
  *
  * @param basePath - Community base path (e.g., "/sfsites/c/")
- * @returns Session response with new remaining time
- * @throws Error if API call fails
+ * @returns Session response with new remaining time, or undefined on failure
  *
  * @example
- * const { sr } = await extendSessionTime('/sfsites/c/');
- * console.log(`Session extended. ${sr} seconds remaining.`);
+ * const response = await extendSessionTime('/sfsites/c/');
+ * if (response) {
+ *   console.log(`Session extended. ${response.sr} seconds remaining.`);
+ * }
  */
-export async function extendSessionTime(basePath: string): Promise<SessionResponse> {
+export async function extendSessionTime(basePath: string): Promise<SessionResponse | undefined> {
 	return callSessionTimeServlet(basePath, true);
 }