hazo_auth 1.0.4 → 1.1.0

package/src/app/api/hazo_auth/library_photos/route.ts

@@ -1,9 +1,9 @@
 // file_description: API route for listing library photo categories and photos in categories
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_library_categories, get_library_photos } from "@/lib/services/profile_picture_service";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_library_categories, get_library_photos } from "../../../../lib/services/profile_picture_service";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/login/route.ts

@@ -1,11 +1,12 @@
 // file_description: API route for user login authentication using hazo_connect
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { authenticate_user } from "@/lib/services/login_service";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { authenticate_user } from "../../../../lib/services/login_service";
 import { createCrudService } from "hazo_connect/server";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
+import { get_login_config } from "../../../../lib/login_config.server";
 
 // section: api_handler
 export async function POST(request: NextRequest) {
@@ -13,7 +14,7 @@ export async function POST(request: NextRequest) {
 
   try {
     const body = await request.json();
-    const { email, password } = body;
+    const { email, password, url_on_logon } = body;
 
     // Validate input
     if (!email || !password) {
@@ -106,6 +107,30 @@ export async function POST(request: NextRequest) {
     const user = users && users.length > 0 ? users[0] : null;
     const user_name = user?.name as string | undefined;
 
+    // Determine redirect URL priority:
+    // 1. url_on_logon from request body (if valid)
+    // 2. stored_url_on_logon from database (if available)
+    // 3. redirect_route_on_successful_login from config
+    // 4. Default to "/"
+
+    let redirectUrl = "/";
+
+    // Check priority 1: Request body
+    if (url_on_logon && typeof url_on_logon === "string" && url_on_logon.startsWith("/") && !url_on_logon.startsWith("//")) {
+      redirectUrl = url_on_logon;
+    } 
+    // Check priority 2: Stored URL from DB
+    else if (result.stored_url_on_logon && typeof result.stored_url_on_logon === "string") {
+      redirectUrl = result.stored_url_on_logon;
+    } 
+    // Check priority 3: Config
+    else {
+      const loginConfig = get_login_config();
+      if (loginConfig.redirectRoute) {
+        redirectUrl = loginConfig.redirectRoute;
+      }
+    }
+
     // Create response with cookies
     const response = NextResponse.json(
       {
@@ -114,6 +139,7 @@ export async function POST(request: NextRequest) {
         user_id: user_id,
         email,
         name: user_name,
+        redirectUrl,
       },
       { status: 200 }
     );

package/src/app/api/hazo_auth/logout/route.ts

@@ -1,10 +1,10 @@
 // file_description: API route for user logout
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { get_auth_cache } from "@/lib/auth/auth_cache";
-import { get_auth_utility_config } from "@/lib/auth_utility_config.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
+import { get_auth_cache } from "../../../../lib/auth/auth_cache";
+import { get_auth_utility_config } from "../../../../lib/auth_utility_config.server";
 
 // section: api_handler
 export async function POST(request: NextRequest) {

package/src/app/api/hazo_auth/me/route.ts

@@ -1,7 +1,7 @@
 // file_description: API route to get current authenticated user information
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_authenticated_user_with_response } from "@/lib/auth/auth_utils.server";
+import { get_authenticated_user_with_response } from "../../../../lib/auth/auth_utils.server";
 
 // section: api_handler
 export async function GET(request: NextRequest) {

package/src/app/api/hazo_auth/profile_picture/[filename]/route.ts

@@ -1,7 +1,7 @@
 // file_description: API route to serve uploaded profile pictures
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_profile_picture_config } from "@/lib/profile_picture_config.server";
+import { get_profile_picture_config } from "../../../../../lib/profile_picture_config.server";
 import fs from "fs";
 import path from "path";
 

package/src/app/api/hazo_auth/register/route.ts

@@ -1,10 +1,11 @@
 // file_description: API route for user registration using hazo_connect to insert into hazo_users table
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { register_user } from "@/lib/services/registration_service";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { register_user } from "../../../../lib/services/registration_service";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
+import { sanitize_error_for_user } from "../../../../lib/utils/error_sanitizer";
 
 // section: api_handler
 export async function POST(request: NextRequest) {
@@ -12,7 +13,7 @@ export async function POST(request: NextRequest) {
 
   try {
     const body = await request.json();
-    const { name, email, password } = body;
+    const { name, email, password, url_on_logon } = body;
 
     // Validate input
     if (!email || !password) {
@@ -52,6 +53,7 @@ export async function POST(request: NextRequest) {
       email,
       password,
       name,
+      url_on_logon,
     });
 
     if (!result.success) {
@@ -87,18 +89,19 @@ export async function POST(request: NextRequest) {
       { status: 201 }
     );
   } catch (error) {
-    const error_message = error instanceof Error ? error.message : "Unknown error";
-    const error_stack = error instanceof Error ? error.stack : undefined;
-
-    logger.error("registration_error", {
-      filename: get_filename(),
-      line_number: get_line_number(),
-      error_message,
-      error_stack,
+    const user_friendly_error = sanitize_error_for_user(error, {
+      logToConsole: true,
+      logToLogger: true,
+      logger,
+      context: {
+        filename: get_filename(),
+        line_number: get_line_number(),
+        operation: "register_api_route",
+      },
     });
 
     return NextResponse.json(
-      { error: "Registration failed. Please try again." },
+      { error: user_friendly_error },
       { status: 500 }
     );
   }

package/src/app/api/hazo_auth/remove_profile_picture/route.ts

@@ -1,10 +1,10 @@
 // file_description: API route for removing profile pictures
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { remove_user_profile_picture } from "@/lib/services/profile_picture_remove_service";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { remove_user_profile_picture } from "../../../../lib/services/profile_picture_remove_service";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: api_handler
 export async function DELETE(request: NextRequest) {
@@ -14,7 +14,7 @@ export async function DELETE(request: NextRequest) {
     // Use centralized auth check
     let user_id: string;
     try {
-      const { require_auth } = await import("@/lib/auth/auth_utils.server");
+      const { require_auth } = await import("../../../../lib/auth/auth_utils.server");
       const user = await require_auth(request);
       user_id = user.user_id;
     } catch (error) {

package/src/app/api/hazo_auth/resend_verification/route.ts

@@ -1,10 +1,10 @@
 // file_description: API route for resending email verification using hazo_connect
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { resend_verification_email } from "@/lib/services/email_verification_service";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { resend_verification_email } from "../../../../lib/services/email_verification_service";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: api_handler
 export async function POST(request: NextRequest) {

package/src/app/api/hazo_auth/reset_password/route.ts

@@ -1,11 +1,11 @@
 // file_description: API route for resetting user password using a reset token
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { reset_password } from "@/lib/services/password_reset_service";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_password_requirements_config } from "@/lib/password_requirements_config.server";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { reset_password } from "../../../../lib/services/password_reset_service";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { get_password_requirements_config } from "../../../../lib/password_requirements_config.server";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: api_handler
 export async function POST(request: NextRequest) {

package/src/app/api/hazo_auth/update_user/route.ts

@@ -1,11 +1,11 @@
 // file_description: API route for updating user profile information
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { update_user_profile } from "@/lib/services/user_update_service";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { require_auth } from "@/lib/auth/auth_utils.server";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { update_user_profile } from "../../../../lib/services/user_update_service";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
+import { require_auth } from "../../../../lib/auth/auth_utils.server";
 
 // section: api_handler
 export async function PATCH(request: NextRequest) {

package/src/app/api/hazo_auth/upload_profile_picture/route.ts

@@ -1,14 +1,14 @@
 // file_description: API route for uploading profile pictures
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_profile_picture_config } from "@/lib/profile_picture_config.server";
-import { get_file_types_config } from "@/lib/file_types_config.server";
-import { update_user_profile_picture } from "@/lib/services/profile_picture_service";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { get_profile_picture_config } from "../../../../lib/profile_picture_config.server";
+import { get_file_types_config } from "../../../../lib/file_types_config.server";
+import { update_user_profile_picture } from "../../../../lib/services/profile_picture_service";
 import { createCrudService } from "hazo_connect/server";
-import { map_db_source_to_ui } from "@/lib/services/profile_picture_source_mapper";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { map_db_source_to_ui } from "../../../../lib/services/profile_picture_source_mapper";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 import fs from "fs";
 import path from "path";
 
@@ -20,7 +20,7 @@ export async function POST(request: NextRequest) {
     // Use centralized auth check
     let user_id: string;
     try {
-      const { require_auth } = await import("@/lib/auth/auth_utils.server");
+      const { require_auth } = await import("../../../../lib/auth/auth_utils.server");
       const user = await require_auth(request);
       user_id = user.user_id;
     } catch (error) {

package/src/app/api/hazo_auth/user_management/permissions/route.ts

@@ -1,11 +1,11 @@
 // file_description: API route for permissions management operations (list, migrate from config, update, delete)
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server";
 import { createCrudService } from "hazo_connect/server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { get_user_management_config } from "@/lib/user_management_config.server";
+import { create_app_logger } from "../../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../../lib/utils/api_route_helpers";
+import { get_user_management_config } from "../../../../../lib/user_management_config.server";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/user_management/roles/route.ts

@@ -1,12 +1,12 @@
 // file_description: API route for roles management operations (list roles with permissions, create role, update role permissions)
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server";
 import { createCrudService, getSqliteAdminService } from "hazo_connect/server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { get_auth_cache } from "@/lib/auth/auth_cache";
-import { get_auth_utility_config } from "@/lib/auth_utility_config.server";
+import { create_app_logger } from "../../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../../lib/utils/api_route_helpers";
+import { get_auth_cache } from "../../../../../lib/auth/auth_cache";
+import { get_auth_utility_config } from "../../../../../lib/auth_utility_config.server";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/user_management/users/roles/route.ts

@@ -1,12 +1,12 @@
 // file_description: API route for managing user roles (assigning roles to users)
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
+import { get_hazo_connect_instance } from "../../../../../../lib/hazo_connect_instance.server";
 import { createCrudService, getSqliteAdminService } from "hazo_connect/server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { get_auth_cache } from "@/lib/auth/auth_cache";
-import { get_auth_utility_config } from "@/lib/auth_utility_config.server";
+import { create_app_logger } from "../../../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../../../lib/utils/api_route_helpers";
+import { get_auth_cache } from "../../../../../../lib/auth/auth_cache";
+import { get_auth_utility_config } from "../../../../../../lib/auth_utility_config.server";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/user_management/users/route.ts

@@ -1,13 +1,13 @@
 // file_description: API route for user management operations (list users, deactivate, reset password)
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
+import { get_hazo_connect_instance } from "../../../../../lib/hazo_connect_instance.server";
 import { createCrudService } from "hazo_connect/server";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
-import { request_password_reset } from "@/lib/services/password_reset_service";
-import { get_auth_cache } from "@/lib/auth/auth_cache";
-import { get_auth_utility_config } from "@/lib/auth_utility_config.server";
+import { create_app_logger } from "../../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../../lib/utils/api_route_helpers";
+import { request_password_reset } from "../../../../../lib/services/password_reset_service";
+import { get_auth_cache } from "../../../../../lib/auth/auth_cache";
+import { get_auth_utility_config } from "../../../../../lib/auth_utility_config.server";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/validate_reset_token/route.ts

@@ -1,10 +1,10 @@
 // file_description: API route for validating password reset token without resetting password
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { validate_password_reset_token } from "@/lib/services/password_reset_service";
-import { create_app_logger } from "@/lib/app_logger";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { validate_password_reset_token } from "../../../../lib/services/password_reset_service";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/hazo_auth/verify_email/route.ts

@@ -1,10 +1,10 @@
 // file_description: API route for email verification using hazo_connect
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
-import { verify_email_token } from "@/lib/services/email_verification_service";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
+import { verify_email_token } from "../../../../lib/services/email_verification_service";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: route_config
 export const dynamic = 'force-dynamic';

package/src/app/api/migrations/apply/route.ts

@@ -1,11 +1,11 @@
 // file_description: API route to manually apply database migrations
 // section: imports
 import { NextRequest, NextResponse } from "next/server";
-import { get_hazo_connect_instance } from "@/lib/hazo_connect_instance.server";
-import { create_app_logger } from "@/lib/app_logger";
+import { get_hazo_connect_instance } from "../../../../lib/hazo_connect_instance.server";
+import { create_app_logger } from "../../../../lib/app_logger";
 import fs from "fs";
 import path from "path";
-import { get_filename, get_line_number } from "@/lib/utils/api_route_helpers";
+import { get_filename, get_line_number } from "../../../../lib/utils/api_route_helpers";
 
 // section: api_handler
 export async function POST(request: NextRequest) {

package/src/app/hazo_auth/forgot_password/forgot_password_page_client.tsx

@@ -4,10 +4,10 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import forgot_password_layout from "@/components/layouts/forgot_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 forgot_password_layout from "../../../components/layouts/forgot_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 ForgotPasswordPageClientProps = {

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

@@ -1,8 +1,8 @@
 // file_description: render the forgot password page shell and mount the forgot 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 { ForgotPasswordPageClient } from "./forgot_password_page_client";
-import { get_forgot_password_config } from "@/lib/forgot_password_config.server";
+import { get_forgot_password_config } from "../../../lib/forgot_password_config.server";
 
 // section: component
 export default function forgot_password_page() {
@@ -10,7 +10,7 @@ export default function forgot_password_page() {
   const forgotPasswordConfig = get_forgot_password_config();
 
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <ForgotPasswordPageClient
         alreadyLoggedInMessage={forgotPasswordConfig.alreadyLoggedInMessage}
         showLogoutButton={forgotPasswordConfig.showLogoutButton}
@@ -18,7 +18,7 @@ export default function forgot_password_page() {
         returnHomeButtonLabel={forgotPasswordConfig.returnHomeButtonLabel}
         returnHomePath={forgotPasswordConfig.returnHomePath}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/app/hazo_auth/login/login_page_client.tsx

@@ -4,11 +4,11 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import login_layout from "@/components/layouts/login";
-import { createLayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import { create_sqlite_hazo_connect } from "@/lib/hazo_connect_setup";
-import { create_app_logger } from "@/lib/app_logger";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
+import login_layout from "../../../components/layouts/login";
+import { createLayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
+import { create_sqlite_hazo_connect } from "../../../lib/hazo_connect_setup";
+import { create_app_logger } from "../../../lib/app_logger";
+import type { LayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
 
 // section: types
 type LoginPageClientProps = {
@@ -19,6 +19,11 @@ type LoginPageClientProps = {
   showReturnHomeButton?: boolean;
   returnHomeButtonLabel?: string;
   returnHomePath?: string;
+  forgotPasswordPath?: string;
+  forgotPasswordLabel?: string;
+  createAccountPath?: string;
+  createAccountLabel?: string;
+  urlOnLogon?: string;
 };
 
 // section: component
@@ -30,6 +35,11 @@ export function LoginPageClient({
   showReturnHomeButton,
   returnHomeButtonLabel,
   returnHomePath,
+  forgotPasswordPath,
+  forgotPasswordLabel,
+  createAccountPath,
+  createAccountLabel,
+  urlOnLogon,
 }: LoginPageClientProps) {
   const [dataClient, setDataClient] = useState<LayoutDataClient<unknown> | null>(null);
   const [logger, setLogger] = useState<ReturnType<typeof create_app_logger> | null>(null);
@@ -65,6 +75,11 @@ export function LoginPageClient({
       showReturnHomeButton={showReturnHomeButton}
       returnHomeButtonLabel={returnHomeButtonLabel}
       returnHomePath={returnHomePath}
+      forgot_password_path={forgotPasswordPath}
+      forgot_password_label={forgotPasswordLabel}
+      create_account_path={createAccountPath}
+      create_account_label={createAccountLabel}
+      urlOnLogon={urlOnLogon}
     />
   );
 }

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

@@ -1,16 +1,23 @@
 // file_description: render the login page shell and mount the login 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 { LoginPageClient } from "./login_page_client";
-import { get_login_config } from "@/lib/login_config.server";
+import { get_login_config } from "../../../lib/login_config.server";
 
 // section: component
-export default function login_page() {
+export default function login_page({
+  searchParams,
+}: {
+  searchParams: { [key: string]: string | string[] | undefined };
+}) {
   // Read login configuration from hazo_auth_config.ini (server-side)
   const loginConfig = get_login_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>
       <LoginPageClient
         redirectRoute={loginConfig.redirectRoute}
         successMessage={loginConfig.successMessage}
@@ -19,8 +26,13 @@ export default function login_page() {
         showReturnHomeButton={loginConfig.showReturnHomeButton}
         returnHomeButtonLabel={loginConfig.returnHomeButtonLabel}
         returnHomePath={loginConfig.returnHomePath}
+        forgotPasswordPath={loginConfig.forgotPasswordPath}
+        forgotPasswordLabel={loginConfig.forgotPasswordLabel}
+        createAccountPath={loginConfig.createAccountPath}
+        createAccountLabel={loginConfig.createAccountLabel}
+        urlOnLogon={urlOnLogon}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }
 

package/src/app/hazo_auth/my_settings/my_settings_page_client.tsx

@@ -4,9 +4,9 @@
 
 // section: imports
 import { useEffect, useState } from "react";
-import my_settings_layout from "@/components/layouts/my_settings";
-import type { LayoutDataClient } from "@/components/layouts/shared/data/layout_data_client";
-import type { PasswordRequirementOptions } from "@/components/layouts/shared/config/layout_customization";
+import my_settings_layout from "../../../components/layouts/my_settings";
+import type { LayoutDataClient } from "../../../components/layouts/shared/data/layout_data_client";
+import type { PasswordRequirementOptions } from "../../../components/layouts/shared/config/layout_customization";
 
 // section: types
 type MySettingsPageClientProps = {

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

@@ -1,8 +1,8 @@
 // file_description: render the my settings page shell and mount the my settings 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 { MySettingsPageClient } from "./my_settings_page_client";
-import { get_my_settings_config } from "@/lib/my_settings_config.server";
+import { get_my_settings_config } from "../../../lib/my_settings_config.server";
 
 // section: component
 export default function my_settings_page() {
@@ -10,7 +10,7 @@ export default function my_settings_page() {
   const mySettingsConfig = get_my_settings_config();
 
   return (
-    <SidebarLayoutWrapper>
+    <AuthPageShell>
       <MySettingsPageClient
         userFields={mySettingsConfig.userFields}
         passwordRequirements={mySettingsConfig.passwordRequirements}
@@ -34,7 +34,7 @@ export default function my_settings_page() {
         uiSizes={mySettingsConfig.uiSizes}
         fileTypes={mySettingsConfig.fileTypes}
       />
-    </SidebarLayoutWrapper>
+    </AuthPageShell>
   );
 }