hazo_auth 1.0.5 → 1.2.0

package/src/app/hazo_auth/reset_password/page.tsx

@@ -1,6 +1,6 @@
 // file_description: render the reset password page shell and mount the reset password layout component within sidebar
 // section: imports
-import { SidebarLayoutWrapper } from "../../../components/layouts/shared/components/sidebar_layout_wrapper";
+import { AuthPageShell } from "../../../components/layouts/shared/components/auth_page_shell";
 import { ResetPasswordPageClient } from "./reset_password_page_client";
 import { get_reset_password_config } from "../../../lib/reset_password_config.server";
 
@@ -10,7 +10,7 @@ export default function reset_password_page() {
   const resetPasswordConfig = get_reset_password_config();
 
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <ResetPasswordPageClient
         errorMessage={resetPasswordConfig.errorMessage}
         successMessage={resetPasswordConfig.successMessage}
@@ -23,7 +23,7 @@ export default function reset_password_page() {
         returnHomePath={resetPasswordConfig.returnHomePath}
         passwordRequirements={resetPasswordConfig.passwordRequirements}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/app/hazo_auth/user_management/page.tsx

@@ -1,14 +1,14 @@
 // file_description: render the user management page shell and mount the user management layout component within sidebar
 // section: imports
-import { SidebarLayoutWrapper } from "../../../components/layouts/shared/components/sidebar_layout_wrapper";
+import { AuthPageShell } from "../../../components/layouts/shared/components/auth_page_shell";
 import { UserManagementPageClient } from "./user_management_page_client";
 
 // section: component
 export default function user_management_page() {
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <UserManagementPageClient />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/app/hazo_auth/verify_email/page.tsx

@@ -1,6 +1,6 @@
 // file_description: render the email verification page shell and mount the email verification layout component within sidebar
 // section: imports
-import { SidebarLayoutWrapper } from "../../../components/layouts/shared/components/sidebar_layout_wrapper";
+import { AuthPageShell } from "../../../components/layouts/shared/components/auth_page_shell";
 import { VerifyEmailPageClient } from "./verify_email_page_client";
 import { get_email_verification_config } from "../../../lib/email_verification_config.server";
 
@@ -10,7 +10,7 @@ export default function verify_email_page() {
   const emailVerificationConfig = get_email_verification_config();
 
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <VerifyEmailPageClient
         alreadyLoggedInMessage={emailVerificationConfig.alreadyLoggedInMessage}
         showLogoutButton={emailVerificationConfig.showLogoutButton}
@@ -18,7 +18,7 @@ export default function verify_email_page() {
         returnHomeButtonLabel={emailVerificationConfig.returnHomeButtonLabel}
         returnHomePath={emailVerificationConfig.returnHomePath}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/components/layouts/login/hooks/use_login_form.ts

@@ -25,6 +25,7 @@ export type UseLoginFormParams<TClient = unknown> = {
   };
   redirectRoute?: string;
   successMessage?: string;
+  urlOnLogon?: string;
 };
 
 export type UseLoginFormResult = {
@@ -62,6 +63,7 @@ export const use_login_form = <TClient,>({
   logger,
   redirectRoute,
   successMessage = "Successfully logged in",
+  urlOnLogon,
 }: UseLoginFormParams<TClient>): UseLoginFormResult => {
   const router = useRouter();
   const [values, setValues] = useState<LoginFormValues>(buildInitialValues);
@@ -87,10 +89,9 @@ export const use_login_form = <TClient,>({
   }, []);
 
   const isSubmitDisabled = useMemo(() => {
-    const hasEmptyField = Object.values(values).some((fieldValue) => fieldValue.trim() === "");
-    const hasErrors = Object.keys(errors).length > 0;
-    return hasEmptyField || hasErrors;
-  }, [errors, values]);
+    const allFieldsEmpty = Object.values(values).every((fieldValue) => fieldValue.trim() === "");
+    return allFieldsEmpty;
+  }, [values]);
 
   const togglePasswordVisibility = useCallback(() => {
     setPasswordVisibility((previous) => ({
@@ -189,6 +190,7 @@ export const use_login_form = <TClient,>({
           body: JSON.stringify({
             email,
             password,
+            url_on_logon: urlOnLogon,
           }),
         });
 
@@ -230,9 +232,12 @@ export const use_login_form = <TClient,>({
         // Refresh the page to update authentication state (cookies are set server-side)
         router.refresh();
 
-        // If redirect route is provided, redirect to it
-        if (redirectRoute) {
-          router.push(redirectRoute);
+        // Use redirectUrl from server response if available, otherwise fall back to redirectRoute prop
+        // The server logic already prioritizes: query param > stored DB value > config > default "/"
+        const finalRedirectUrl = data.redirectUrl || redirectRoute;
+
+        if (finalRedirectUrl) {
+          router.push(finalRedirectUrl);
         } else {
           // Otherwise, show success message
           setIsSuccess(true);
@@ -251,7 +256,7 @@ export const use_login_form = <TClient,>({
         setIsSuccess(false);
       }
     },
-    [values, clientIp, log_login_attempt, redirectRoute, router],
+    [values, clientIp, log_login_attempt, redirectRoute, router, urlOnLogon],
   );
 
   const handleCancel = useCallback(() => {

package/src/components/layouts/login/index.tsx

@@ -3,6 +3,7 @@
 "use client";
 
 // section: imports
+import Link from "next/link";
 import { Input } from "../../ui/input";
 import { PasswordField } from "../shared/components/password_field";
 import { FormFieldWrapper } from "../shared/components/form_field_wrapper";
@@ -50,6 +51,11 @@ export type LoginLayoutProps<TClient = unknown> = {
   showReturnHomeButton?: boolean;
   returnHomeButtonLabel?: string;
   returnHomePath?: string;
+  forgot_password_path?: string;
+  forgot_password_label?: string;
+  create_account_path?: string;
+  create_account_label?: string;
+  urlOnLogon?: string;
 };
 
 const ORDERED_FIELDS: LoginFieldId[] = [
@@ -76,6 +82,11 @@ export default function login_layout<TClient>({
   showReturnHomeButton = false,
   returnHomeButtonLabel = "Return home",
   returnHomePath = "/",
+  forgot_password_path = "/hazo_auth/forgot_password",
+  forgot_password_label = "Forgot password?",
+  create_account_path = "/hazo_auth/register",
+  create_account_label = "Create account",
+  urlOnLogon,
 }: LoginLayoutProps<TClient>) {
   const fieldDefinitions = createLoginFieldDefinitions(field_overrides);
   const resolvedLabels = resolveLoginLabels(labels);
@@ -86,6 +97,7 @@ export default function login_layout<TClient>({
     logger,
     redirectRoute,
     successMessage,
+    urlOnLogon: urlOnLogon,
   });
 
   const renderFields = (formState: UseLoginFormResult) => {
@@ -214,6 +226,22 @@ export default function login_layout<TClient>({
                 submitAriaLabel="Submit login form"
                 cancelAriaLabel="Cancel login form"
               />
+              <div className="cls_login_layout_support_links flex flex-col gap-1 text-sm text-muted-foreground">
+                <Link
+                  href={forgot_password_path}
+                  className="cls_login_layout_forgot_password_link text-primary underline-offset-4 hover:underline"
+                  aria-label="Go to forgot password page"
+                >
+                  {forgot_password_label}
+                </Link>
+                <Link
+                  href={create_account_path}
+                  className="cls_login_layout_create_account_link text-primary underline-offset-4 hover:underline"
+                  aria-label="Go to create account page"
+                >
+                  {create_account_label}
+                </Link>
+              </div>
             </form>
           </>
         }

package/src/components/layouts/register/hooks/use_register_form.ts

@@ -28,6 +28,7 @@ export type UseRegisterFormParams<TClient = unknown> = {
   passwordRequirements: PasswordRequirementOptions;
   passwordRequirementOverrides?: PasswordRequirementOverrides;
   dataClient: LayoutDataClient<TClient>;
+  urlOnLogon?: string;
 };
 
 export type UseRegisterFormResult = {
@@ -58,6 +59,7 @@ export const use_register_form = <TClient,>({
   showNameField,
   passwordRequirements,
   dataClient,
+  urlOnLogon,
 }: UseRegisterFormParams<TClient>): UseRegisterFormResult => {
   const [values, setValues] = useState<RegisterFormValues>(buildInitialValues);
   const [errors, setErrors] = useState<RegisterFormErrors>({});
@@ -203,6 +205,7 @@ export const use_register_form = <TClient,>({
             name: values[REGISTER_FIELD_IDS.NAME] || undefined,
             email: values[REGISTER_FIELD_IDS.EMAIL],
             password: values[REGISTER_FIELD_IDS.PASSWORD],
+            url_on_logon: urlOnLogon,
           }),
         });
 
@@ -242,7 +245,7 @@ export const use_register_form = <TClient,>({
         setIsSubmitting(false);
       }
     },
-    [values, passwordRequirements, dataClient],
+    [values, passwordRequirements, dataClient, urlOnLogon],
   );
 
   const handleCancel = useCallback(() => {

package/src/components/layouts/register/index.tsx

@@ -3,6 +3,7 @@
 "use client";
 
 // section: imports
+import Link from "next/link";
 import { Input } from "../../ui/input";
 import { PasswordField } from "../shared/components/password_field";
 import { FormFieldWrapper } from "../shared/components/form_field_wrapper";
@@ -45,6 +46,9 @@ export type RegisterLayoutProps<TClient = unknown> = {
   showReturnHomeButton?: boolean;
   returnHomeButtonLabel?: string;
   returnHomePath?: string;
+  signInPath?: string;
+  signInLabel?: string;
+  urlOnLogon?: string;
 };
 
 const ORDERED_FIELDS: RegisterFieldId[] = [
@@ -72,6 +76,9 @@ export default function register_layout<TClient>({
   showReturnHomeButton = false,
   returnHomeButtonLabel = "Return home",
   returnHomePath = "/",
+  signInPath = "/hazo_auth/login",
+  signInLabel = "Sign in",
+  urlOnLogon,
 }: RegisterLayoutProps<TClient>) {
   const fieldDefinitions = createRegisterFieldDefinitions(field_overrides);
   const resolvedLabels = resolveRegisterLabels(labels);
@@ -84,6 +91,7 @@ export default function register_layout<TClient>({
     showNameField: show_name_field,
     passwordRequirements: resolvedPasswordRequirements,
     dataClient: data_client,
+    urlOnLogon: urlOnLogon,
   });
 
   const renderFields = (formState: UseRegisterFormResult) => {
@@ -193,6 +201,16 @@ export default function register_layout<TClient>({
                 submitAriaLabel="Submit registration form"
                 cancelAriaLabel="Cancel registration form"
               />
+              <div className="cls_register_layout_sign_in_link flex items-center justify-center gap-1 text-sm text-muted-foreground">
+                <span>Already have an account?</span>
+                <Link
+                  href={signInPath}
+                  className="cls_register_layout_sign_in_link_text text-primary underline-offset-4 hover:underline"
+                  aria-label="Go to sign in page"
+                >
+                  {signInLabel}
+                </Link>
+              </div>
               {form.isSubmitting && (
                 <div className="cls_register_submitting_indicator text-sm text-slate-600 text-center">
                   Registering...

package/src/components/layouts/shared/components/auth_page_shell.tsx

@@ -0,0 +1,36 @@
+// file_description: server component that chooses between sidebar shell and standalone shell
+// section: imports
+import type { ReactNode } from "react";
+import { SidebarLayoutWrapper } from "./sidebar_layout_wrapper";
+import { StandaloneLayoutWrapper } from "./standalone_layout_wrapper";
+import { get_ui_shell_config } from "../../../../lib/ui_shell_config.server";
+
+// section: types
+type AuthPageShellProps = {
+  children: ReactNode;
+};
+
+// section: component
+export function AuthPageShell({ children }: AuthPageShellProps) {
+  const uiShellConfig = get_ui_shell_config();
+
+  if (uiShellConfig.layout_mode === "standalone") {
+    return (
+      <StandaloneLayoutWrapper
+        heading={uiShellConfig.standalone_heading}
+        description={uiShellConfig.standalone_description}
+        wrapperClassName={uiShellConfig.standalone_wrapper_class}
+        contentClassName={uiShellConfig.standalone_content_class}
+        showHeading={uiShellConfig.standalone_show_heading}
+        showDescription={uiShellConfig.standalone_show_description}
+      >
+        {children}
+      </StandaloneLayoutWrapper>
+    );
+  }
+
+  return <SidebarLayoutWrapper>{children}</SidebarLayoutWrapper>;
+}
+
+
+

package/src/components/layouts/shared/components/standalone_layout_wrapper.tsx

@@ -0,0 +1,53 @@
+// file_description: renders a simple full-width shell without the developer sidebar
+// section: client_directive
+"use client";
+
+// section: imports
+import { cn } from "../../../../lib/utils";
+
+// section: types
+export type StandaloneLayoutWrapperProps = {
+  children: React.ReactNode;
+  heading?: string;
+  description?: string;
+  wrapperClassName?: string;
+  contentClassName?: string;
+  showHeading?: boolean;
+  showDescription?: boolean;
+};
+
+// section: component
+export function StandaloneLayoutWrapper({
+  children,
+  heading = "hazo auth",
+  description = "Drop-in authentication flows that inherit your existing theme.",
+  wrapperClassName,
+  contentClassName,
+  showHeading = true,
+  showDescription = true,
+}: StandaloneLayoutWrapperProps) {
+  return (
+    <div className={cn("cls_standalone_layout_wrapper min-h-screen w-full bg-background", wrapperClassName)}>
+      <div className={cn("cls_standalone_layout_content mx-auto flex w-full max-w-5xl flex-col gap-8 p-6", contentClassName)}>
+        {(showHeading || showDescription) && (
+          <div className="cls_standalone_layout_header text-center">
+            {showHeading && (
+              <h1 className="cls_standalone_layout_title text-2xl font-semibold tracking-tight text-foreground">
+                {heading}
+              </h1>
+            )}
+            {showDescription && (
+              <p className="cls_standalone_layout_description mt-2 text-sm text-muted-foreground">
+                {description}
+              </p>
+            )}
+          </div>
+        )}
+        <div className="cls_standalone_layout_body">{children}</div>
+      </div>
+    </div>
+  );
+}
+
+
+

package/src/lib/config/config_loader.server.ts

@@ -71,7 +71,12 @@ export function get_config_value(
   file_path?: string,
 ): string {
   const section = read_config_section(section_name, file_path);
-  return section?.[key]?.trim() || default_value;
+  // Optional chaining on section and section[key]
+  // If section is undefined, or key is undefined, fall back to default
+  if (!section || section[key] === undefined) {
+    return default_value;
+  }
+  return section[key].trim() || default_value;
 }
 
 /**
@@ -89,12 +94,12 @@ export function get_config_boolean(
   file_path?: string,
 ): boolean {
   const section = read_config_section(section_name, file_path);
-  const value = section?.[key]?.trim().toLowerCase();
   
-  if (value === undefined) {
+  if (!section || section[key] === undefined) {
     return default_value;
   }
   
+  const value = section[key].trim().toLowerCase();
   return value !== "false" && value !== "0" && value !== "";
 }
 
@@ -113,7 +118,12 @@ export function get_config_number(
   file_path?: string,
 ): number {
   const section = read_config_section(section_name, file_path);
-  const value = section?.[key]?.trim();
+  
+  if (!section || section[key] === undefined) {
+    return default_value;
+  }
+  
+  const value = section[key].trim();
   
   if (!value) {
     return default_value;
@@ -138,7 +148,12 @@ export function get_config_array(
   file_path?: string,
 ): string[] {
   const section = read_config_section(section_name, file_path);
-  const value = section?.[key]?.trim();
+  
+  if (!section || section[key] === undefined) {
+    return default_value;
+  }
+  
+  const value = section[key].trim();
   
   if (!value) {
     return default_value;

package/src/lib/login_config.server.ts

@@ -12,6 +12,10 @@ export type LoginConfig = {
   showReturnHomeButton: boolean;
   returnHomeButtonLabel: string;
   returnHomePath: string;
+  forgotPasswordPath: string;
+  forgotPasswordLabel: string;
+  createAccountPath: string;
+  createAccountLabel: string;
 };
 
 // section: helpers
@@ -30,6 +34,23 @@ export function get_login_config(): LoginConfig {
   // Read success message (defaults to "Successfully logged in")
   const successMessage = get_config_value(section, "success_message", "Successfully logged in");
 
+  const forgotPasswordPath = get_config_value(
+    section,
+    "forgot_password_path",
+    "/hazo_auth/forgot_password"
+  );
+  const forgotPasswordLabel = get_config_value(
+    section,
+    "forgot_password_label",
+    "Forgot password?"
+  );
+  const createAccountPath = get_config_value(section, "create_account_path", "/hazo_auth/register");
+  const createAccountLabel = get_config_value(
+    section,
+    "create_account_label",
+    "Create account"
+  );
+
   // Get shared already logged in config
   const alreadyLoggedInConfig = get_already_logged_in_config();
 
@@ -41,6 +62,10 @@ export function get_login_config(): LoginConfig {
     showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
     returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
     returnHomePath: alreadyLoggedInConfig.returnHomePath,
+    forgotPasswordPath,
+    forgotPasswordLabel,
+    createAccountPath,
+    createAccountLabel,
   };
 }
 

package/src/lib/register_config.server.ts

@@ -1,6 +1,6 @@
 // file_description: server-only helper to read register layout configuration from hazo_auth_config.ini
 // section: imports
-import { get_config_boolean, read_config_section } from "./config/config_loader.server";
+import { get_config_boolean, get_config_value, read_config_section } from "./config/config_loader.server";
 import { get_password_requirements_config } from "./password_requirements_config.server";
 import { get_already_logged_in_config } from "./already_logged_in_config.server";
 import { get_user_fields_config } from "./user_fields_config.server";
@@ -20,6 +20,8 @@ export type RegisterConfig = {
   showReturnHomeButton: boolean;
   returnHomeButtonLabel: string;
   returnHomePath: string;
+  signInPath: string;
+  signInLabel: string;
 };
 
 // section: helpers
@@ -44,6 +46,18 @@ export function get_register_config(): RegisterConfig {
   // Get shared already logged in config
   const alreadyLoggedInConfig = get_already_logged_in_config();
 
+  // Read sign in link configuration
+  const signInPath = get_config_value(
+    "hazo_auth__register_layout",
+    "sign_in_path",
+    "/hazo_auth/login"
+  );
+  const signInLabel = get_config_value(
+    "hazo_auth__register_layout",
+    "sign_in_label",
+    "Sign in"
+  );
+
   return {
     showNameField,
     passwordRequirements,
@@ -52,6 +66,8 @@ export function get_register_config(): RegisterConfig {
     showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
     returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
     returnHomePath: alreadyLoggedInConfig.returnHomePath,
+    signInPath,
+    signInLabel,
   };
 }
 

package/src/lib/services/login_service.ts

@@ -3,6 +3,9 @@
 import type { HazoConnectAdapter } from "hazo_connect";
 import { createCrudService } from "hazo_connect/server";
 import argon2 from "argon2";
+import { create_app_logger } from "../app_logger";
+import { sanitize_error_for_user } from "../utils/error_sanitizer";
+import { get_filename, get_line_number } from "../utils/api_route_helpers";
 
 // section: types
 export type LoginData = {
@@ -15,6 +18,7 @@ export type LoginResult = {
   user_id?: string;
   error?: string;
   email_not_verified?: boolean;
+  stored_url_on_logon?: string | null;
 };
 
 // section: helpers
@@ -98,20 +102,32 @@ export async function authenticate_user(
         last_logon: now,
         login_attempts: 0,
         changed_at: now,
+        url_on_logon: null, // Clear the stored redirect URL after successful login
       }
     );
 
     return {
       success: true,
       user_id: user.id as string,
+      stored_url_on_logon: user.url_on_logon as string | null | undefined,
     };
   } catch (error) {
-    const error_message =
-      error instanceof Error ? error.message : "Unknown error";
+    const logger = create_app_logger();
+    const user_friendly_error = sanitize_error_for_user(error, {
+      logToConsole: true,
+      logToLogger: true,
+      logger,
+      context: {
+        filename: "login_service.ts",
+        line_number: get_line_number(),
+        email: data.email,
+        operation: "authenticate_user",
+      },
+    });
 
     return {
       success: false,
-      error: error_message,
+      error: user_friendly_error,
     };
   }
 }

package/src/lib/services/registration_service.ts

@@ -10,12 +10,15 @@ import { get_profile_picture_config } from "../profile_picture_config.server";
 import { map_ui_source_to_db } from "./profile_picture_source_mapper";
 import { create_app_logger } from "../app_logger";
 import { send_template_email } from "./email_service";
+import { sanitize_error_for_user } from "../utils/error_sanitizer";
+import { get_filename, get_line_number } from "../utils/api_route_helpers";
 
 // section: types
 export type RegistrationData = {
   email: string;
   password: string;
   name?: string;
+  url_on_logon?: string;
 };
 
 export type RegistrationResult = {
@@ -36,7 +39,7 @@ export async function register_user(
   data: RegistrationData,
 ): Promise<RegistrationResult> {
   try {
-    const { email, password, name } = data;
+    const { email, password, name, url_on_logon } = data;
 
     // Create CRUD service for hazo_users table
     const users_service = createCrudService(adapter, "hazo_users");
@@ -77,6 +80,14 @@ export async function register_user(
       insert_data.name = name;
     }
 
+    // Validate and include url_on_logon if provided
+    if (url_on_logon) {
+      // Ensure it's a relative path starting with / but not //
+      if (url_on_logon.startsWith("/") && !url_on_logon.startsWith("//")) {
+        insert_data.url_on_logon = url_on_logon;
+      }
+    }
+
     // Set default profile picture if enabled
     const profile_picture_config = get_profile_picture_config();
     if (profile_picture_config.user_photo_default) {
@@ -151,12 +162,22 @@ export async function register_user(
       user_id,
     };
   } catch (error) {
-    const error_message =
-      error instanceof Error ? error.message : "Unknown error";
+    const logger = create_app_logger();
+    const user_friendly_error = sanitize_error_for_user(error, {
+      logToConsole: true,
+      logToLogger: true,
+      logger,
+      context: {
+        filename: "registration_service.ts",
+        line_number: get_line_number(),
+        email: data.email,
+        operation: "register_user",
+      },
+    });
 
     return {
       success: false,
-      error: error_message,
+      error: user_friendly_error,
     };
   }
 }