hazo_auth 1.0.4 → 1.1.0

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

@@ -1,16 +1,23 @@
 // file_description: render the register page shell and mount the register 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 { RegisterPageClient } from "./register_page_client";
-import { get_register_config } from "@/lib/register_config.server";
+import { get_register_config } from "../../../lib/register_config.server";
 
 // section: component
-export default function register_page() {
+export default function register_page({
+  searchParams,
+}: {
+  searchParams: { [key: string]: string | string[] | undefined };
+}) {
   // Read register configuration from hazo_auth_config.ini (server-side)
   const registerConfig = get_register_config();
 
+  // Get url_on_logon from query params (if any)
+  const urlOnLogon = typeof searchParams.url_on_logon === "string" ? searchParams.url_on_logon : undefined;
+
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <RegisterPageClient
         showNameField={registerConfig.showNameField}
         passwordRequirements={registerConfig.passwordRequirements}
@@ -19,8 +26,11 @@ export default function register_page() {
         showReturnHomeButton={registerConfig.showReturnHomeButton}
         returnHomeButtonLabel={registerConfig.returnHomeButtonLabel}
         returnHomePath={registerConfig.returnHomePath}
+        signInPath={registerConfig.signInPath}
+        signInLabel={registerConfig.signInLabel}
+        urlOnLogon={urlOnLogon}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/app/hazo_auth/register/register_page_client.tsx

@@ -4,10 +4,10 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import register_layout from "@/components/layouts/register";
-import { createLayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { create_sqlite_hazo_connect } from "@/lib/hazo_connect_setup";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+import register_layout from "../../../components/layouts/register";
+import { createLayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
+import { create_sqlite_hazo_connect } from "../../../lib/hazo_connect_setup";
+import type { LayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
 
 // section: types
 type RegisterPageClientProps = {
@@ -24,6 +24,9 @@ type RegisterPageClientProps = {
   showReturnHomeButton?: boolean;
   returnHomeButtonLabel?: string;
   returnHomePath?: string;
+  signInPath?: string;
+  signInLabel?: string;
+  urlOnLogon?: string;
 };
 
 // section: component
@@ -35,6 +38,9 @@ export function RegisterPageClient({
   showReturnHomeButton,
   returnHomeButtonLabel,
   returnHomePath,
+  signInPath,
+  signInLabel,
+  urlOnLogon,
 }: RegisterPageClientProps) {
   const [dataClient, setDataClient] = useState<LayoutDataClient<unknown> | null>(null);
 
@@ -66,6 +72,9 @@ export function RegisterPageClient({
       showReturnHomeButton={showReturnHomeButton}
       returnHomeButtonLabel={returnHomeButtonLabel}
       returnHomePath={returnHomePath}
+      signInPath={signInPath}
+      signInLabel={signInLabel}
+      urlOnLogon={urlOnLogon}
     />
   );
 }

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

@@ -1,8 +1,8 @@
 // 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";
+import { get_reset_password_config } from "../../../lib/reset_password_config.server";
 
 // section: component
 export default function reset_password_page() {
@@ -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/reset_password/reset_password_page_client.tsx

@@ -4,10 +4,10 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import reset_password_layout from "@/components/layouts/reset_password";
-import { createLayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { create_sqlite_hazo_connect } from "@/lib/hazo_connect_setup";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+import reset_password_layout from "../../../components/layouts/reset_password";
+import { createLayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
+import { create_sqlite_hazo_connect } from "../../../lib/hazo_connect_setup";
+import type { LayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
 
 // section: types
 type ResetPasswordPageClientProps = {

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/user_management/user_management_page_client.tsx

@@ -3,7 +3,7 @@
 "use client";
 
 // section: imports
-import { UserManagementLayout } from "@/components/layouts/user_management";
+import { UserManagementLayout } from "../../../components/layouts/user_management";
 
 // section: component
 /**

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

@@ -1,8 +1,8 @@
 // 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";
+import { get_email_verification_config } from "../../../lib/email_verification_config.server";
 
 // section: component
 export default function verify_email_page() {
@@ -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/app/hazo_auth/verify_email/verify_email_page_client.tsx

@@ -4,10 +4,10 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import email_verification_layout from "@/components/layouts/email_verification";
-import { createLayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { create_sqlite_hazo_connect } from "@/lib/hazo_connect_setup";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+import email_verification_layout from "../../../components/layouts/email_verification";
+import { createLayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
+import { create_sqlite_hazo_connect } from "../../../lib/hazo_connect_setup";
+import type { LayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
 
 // section: types
 type VerifyEmailPageClientProps = {

package/src/app/hazo_connect/api/sqlite/data/route.ts

@@ -6,7 +6,7 @@ import {
   type SqliteFilterOperator,
   type SqliteWhereFilter
 } from "hazo_connect/server"
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server"
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server"
 
 export const dynamic = "force-dynamic"
 const allowedOperators: SqliteFilterOperator[] = [

package/src/app/hazo_connect/api/sqlite/schema/route.ts

@@ -1,7 +1,7 @@
 // file_description: API route to get SQLite table schema for admin UI
 import { NextRequest, NextResponse } from "next/server"
 import { getSqliteAdminService } from "hazo_connect/server"
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server"
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server"
 
 export const dynamic = "force-dynamic"
 

package/src/app/hazo_connect/api/sqlite/tables/route.ts

@@ -1,7 +1,7 @@
 // file_description: API route to list SQLite tables for admin UI
 import { NextResponse } from "next/server"
 import { getSqliteAdminService } from "hazo_connect/server"
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server"
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server"
 
 export const dynamic = "force-dynamic"
 

package/src/app/layout.tsx

@@ -1,7 +1,7 @@
 // file_description: define the root layout wrapper for the hazo_auth project
 import type { Metadata } from "next";
 import local_font from "next/font/local";
-import { Toaster } from "@/components/ui/sonner";
+import { Toaster } from "../components/ui/sonner";
 import "./globals.css";
 
 // section: typography_setup

package/src/app/page.tsx

@@ -16,7 +16,7 @@ import {
   SidebarProvider,
   SidebarTrigger,
   SidebarInset,
-} from "@/components/ui/sidebar";
+} from "../components/ui/sidebar";
 import { LogIn, UserPlus, BookOpen, ExternalLink, Database, KeyRound, MailCheck } from "lucide-react";
 
 // section: page_component

package/src/components/layouts/email_verification/config/email_verification_field_config.ts

@@ -1,6 +1,6 @@
 // file_description: email verification layout specific configuration helpers
 // section: imports
-import type { LayoutFieldMap, LayoutFieldMapOverrides } from "@/components/layouts/shared/config/layout_customization";
+import type { LayoutFieldMap, LayoutFieldMapOverrides } from "../../shared/config/layout_customization";
 import {
   resolveButtonPalette,
   resolveFieldDefinitions,
@@ -9,7 +9,7 @@ import {
   type ButtonPaletteOverrides,
   type LayoutLabelDefaults,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../../shared/config/layout_customization";
 
 // section: field_identifiers
 export const EMAIL_VERIFICATION_FIELD_IDS = {

package/src/components/layouts/email_verification/hooks/use_email_verification.ts

@@ -3,9 +3,9 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { toast } from "sonner";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { EMAIL_VERIFICATION_FIELD_IDS, type EmailVerificationFieldId } from "@/components/layouts/email_verification/config/email_verification_field_config";
-import { validateEmail } from "@/components/layouts/shared/utils/validation";
+import type { LayoutDataClient } from "../../shared/data/layout_data_client";
+import { EMAIL_VERIFICATION_FIELD_IDS, type EmailVerificationFieldId } from "../config/email_verification_field_config";
+import { validateEmail } from "../../shared/utils/validation";
 
 // section: types
 export type EmailVerificationFormValues = Record<EmailVerificationFieldId, string>;

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

@@ -3,17 +3,17 @@
 "use client";
 
 // section: imports
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-import { FormFieldWrapper } from "@/components/layouts/shared/components/form_field_wrapper";
-import { FormHeader } from "@/components/layouts/shared/components/form_header";
-import { FormActionButtons } from "@/components/layouts/shared/components/form_action_buttons";
-import { TwoColumnAuthLayout } from "@/components/layouts/shared/components/two_column_auth_layout";
+import { Input } from "../../ui/input";
+import { Button } from "../../ui/button";
+import { FormFieldWrapper } from "../shared/components/form_field_wrapper";
+import { FormHeader } from "../shared/components/form_header";
+import { FormActionButtons } from "../shared/components/form_action_buttons";
+import { TwoColumnAuthLayout } from "../shared/components/two_column_auth_layout";
 import {
   type ButtonPaletteOverrides,
   type LayoutFieldMapOverrides,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../shared/config/layout_customization";
 import {
   EMAIL_VERIFICATION_FIELD_IDS,
   createEmailVerificationFieldDefinitions,
@@ -23,14 +23,14 @@ import {
   EMAIL_VERIFICATION_ERROR_LABEL_DEFAULTS,
   type EmailVerificationSuccessLabels,
   type EmailVerificationErrorLabels,
-} from "@/components/layouts/email_verification/config/email_verification_field_config";
+} from "./config/email_verification_field_config";
 import {
   use_email_verification,
   type UseEmailVerificationResult,
-} from "@/components/layouts/email_verification/hooks/use_email_verification";
-import { type LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+} from "./hooks/use_email_verification";
+import { type LayoutDataClient } from "../shared/data/layout_data_client";
 import { CheckCircle, XCircle, Loader2 } from "lucide-react";
-import { AlreadyLoggedInGuard } from "@/components/layouts/shared/components/already_logged_in_guard";
+import { AlreadyLoggedInGuard } from "../shared/components/already_logged_in_guard";
 
 // section: types
 export type EmailVerificationLayoutProps<TClient = unknown> = {

package/src/components/layouts/forgot_password/config/forgot_password_field_config.ts

@@ -1,6 +1,6 @@
 // file_description: forgot password layout specific configuration helpers
 // section: imports
-import type { LayoutFieldMap, LayoutFieldMapOverrides } from "@/components/layouts/shared/config/layout_customization";
+import type { LayoutFieldMap, LayoutFieldMapOverrides } from "../../shared/config/layout_customization";
 import {
   resolveButtonPalette,
   resolveFieldDefinitions,
@@ -9,7 +9,7 @@ import {
   type ButtonPaletteOverrides,
   type LayoutLabelDefaults,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../../shared/config/layout_customization";
 
 // section: field_identifiers
 export const FORGOT_PASSWORD_FIELD_IDS = {

package/src/components/layouts/forgot_password/hooks/use_forgot_password_form.ts

@@ -2,9 +2,9 @@
 // section: imports
 import { useCallback, useMemo, useState } from "react";
 import { toast } from "sonner";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { FORGOT_PASSWORD_FIELD_IDS, type ForgotPasswordFieldId } from "@/components/layouts/forgot_password/config/forgot_password_field_config";
-import { validateEmail } from "@/components/layouts/shared/utils/validation";
+import type { LayoutDataClient } from "../../shared/data/layout_data_client";
+import { FORGOT_PASSWORD_FIELD_IDS, type ForgotPasswordFieldId } from "../config/forgot_password_field_config";
+import { validateEmail } from "../../shared/utils/validation";
 
 // section: types
 export type ForgotPasswordFormValues = Record<ForgotPasswordFieldId, string>;

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

@@ -3,28 +3,28 @@
 "use client";
 
 // section: imports
-import { Input } from "@/components/ui/input";
-import { FormFieldWrapper } from "@/components/layouts/shared/components/form_field_wrapper";
-import { FormHeader } from "@/components/layouts/shared/components/form_header";
-import { FormActionButtons } from "@/components/layouts/shared/components/form_action_buttons";
-import { TwoColumnAuthLayout } from "@/components/layouts/shared/components/two_column_auth_layout";
-import { AlreadyLoggedInGuard } from "@/components/layouts/shared/components/already_logged_in_guard";
+import { Input } from "../../ui/input";
+import { FormFieldWrapper } from "../shared/components/form_field_wrapper";
+import { FormHeader } from "../shared/components/form_header";
+import { FormActionButtons } from "../shared/components/form_action_buttons";
+import { TwoColumnAuthLayout } from "../shared/components/two_column_auth_layout";
+import { AlreadyLoggedInGuard } from "../shared/components/already_logged_in_guard";
 import {
   type ButtonPaletteOverrides,
   type LayoutFieldMapOverrides,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../shared/config/layout_customization";
 import {
   FORGOT_PASSWORD_FIELD_IDS,
   createForgotPasswordFieldDefinitions,
   resolveForgotPasswordButtonPalette,
   resolveForgotPasswordLabels,
-} from "@/components/layouts/forgot_password/config/forgot_password_field_config";
+} from "./config/forgot_password_field_config";
 import {
   use_forgot_password_form,
   type UseForgotPasswordFormResult,
-} from "@/components/layouts/forgot_password/hooks/use_forgot_password_form";
-import { type LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+} from "./hooks/use_forgot_password_form";
+import { type LayoutDataClient } from "../shared/data/layout_data_client";
 
 // section: types
 export type ForgotPasswordLayoutProps<TClient = unknown> = {

package/src/components/layouts/login/config/login_field_config.ts

@@ -1,6 +1,6 @@
 // file_description: login layout specific configuration helpers
 // section: imports
-import type { LayoutFieldMap, LayoutFieldMapOverrides } from "@/components/layouts/shared/config/layout_customization";
+import type { LayoutFieldMap, LayoutFieldMapOverrides } from "../../shared/config/layout_customization";
 import {
   resolveButtonPalette,
   resolveFieldDefinitions,
@@ -9,7 +9,7 @@ import {
   type ButtonPaletteOverrides,
   type LayoutLabelDefaults,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../../shared/config/layout_customization";
 
 // section: field_identifiers
 export const LOGIN_FIELD_IDS = {

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

@@ -2,11 +2,11 @@
 // section: imports
 import { useCallback, useMemo, useState, useEffect } from "react";
 import { useRouter } from "next/navigation";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { LOGIN_FIELD_IDS, type LoginFieldId } from "@/components/layouts/login/config/login_field_config";
-import { validateEmail } from "@/components/layouts/shared/utils/validation";
-import { get_client_ip } from "@/components/layouts/shared/utils/ip_address";
-import { trigger_auth_status_refresh } from "@/components/layouts/shared/hooks/use_auth_status";
+import type { LayoutDataClient } from "../../shared/data/layout_data_client";
+import { LOGIN_FIELD_IDS, type LoginFieldId } from "../config/login_field_config";
+import { validateEmail } from "../../shared/utils/validation";
+import { get_client_ip } from "../../shared/utils/ip_address";
+import { trigger_auth_status_refresh } from "../../shared/hooks/use_auth_status";
 
 // section: types
 export type LoginFormValues = Record<LoginFieldId, string>;
@@ -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,30 +3,31 @@
 "use client";
 
 // section: imports
-import { Input } from "@/components/ui/input";
-import { PasswordField } from "@/components/layouts/shared/components/password_field";
-import { FormFieldWrapper } from "@/components/layouts/shared/components/form_field_wrapper";
-import { FormHeader } from "@/components/layouts/shared/components/form_header";
-import { FormActionButtons } from "@/components/layouts/shared/components/form_action_buttons";
-import { TwoColumnAuthLayout } from "@/components/layouts/shared/components/two_column_auth_layout";
+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";
+import { FormHeader } from "../shared/components/form_header";
+import { FormActionButtons } from "../shared/components/form_action_buttons";
+import { TwoColumnAuthLayout } from "../shared/components/two_column_auth_layout";
 import { CheckCircle } from "lucide-react";
-import { AlreadyLoggedInGuard } from "@/components/layouts/shared/components/already_logged_in_guard";
+import { AlreadyLoggedInGuard } from "../shared/components/already_logged_in_guard";
 import {
   type ButtonPaletteOverrides,
   type LayoutFieldMapOverrides,
   type LayoutLabelOverrides,
-} from "@/components/layouts/shared/config/layout_customization";
+} from "../shared/config/layout_customization";
 import {
   LOGIN_FIELD_IDS,
   createLoginFieldDefinitions,
   resolveLoginButtonPalette,
   resolveLoginLabels,
-} from "@/components/layouts/login/config/login_field_config";
+} from "./config/login_field_config";
 import {
   use_login_form,
   type UseLoginFormResult,
-} from "@/components/layouts/login/hooks/use_login_form";
-import { type LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+} from "./hooks/use_login_form";
+import { type LayoutDataClient } from "../shared/data/layout_data_client";
 
 // section: types
 export type LoginLayoutProps<TClient = unknown> = {
@@ -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/my_settings/components/editable_field.tsx

@@ -4,9 +4,9 @@
 
 // section: imports
 import { useState } from "react";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Button } from "@/components/ui/button";
+import { Input } from "../../../ui/input";
+import { Label } from "../../../ui/label";
+import { Button } from "../../../ui/button";
 import { Pencil, CheckCircle2, XCircle } from "lucide-react";
 
 // section: types

package/src/components/layouts/my_settings/components/password_change_dialog.tsx

@@ -10,11 +10,11 @@ import {
   DialogHeader,
   DialogTitle,
   DialogDescription,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { PasswordField } from "@/components/layouts/shared/components/password_field";
-import { FormFieldWrapper } from "@/components/layouts/shared/components/form_field_wrapper";
-import type { PasswordRequirementOptions } from "@/components/layouts/shared/config/layout_customization";
+} from "../../../ui/dialog";
+import { Button } from "../../../ui/button";
+import { PasswordField } from "../../shared/components/password_field";
+import { FormFieldWrapper } from "../../shared/components/form_field_wrapper";
+import type { PasswordRequirementOptions } from "../../shared/config/layout_customization";
 
 // section: types
 export type ButtonPalette = {