timmybee/travel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timmybee:89b3ddb7933b10d198a5a2e8d5adf1325e729eb1
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr
..
compare: timmybee:fix/ldap-admin-email
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr

1 Commits
89b3ddb793 ... fix/ldap-a

Author SHA1 Message Date
Tim Basten
66316328bb Fix seeder emails to match LDAP mail attributes
All checks were successful
linter / quality (pull_request) Successful in 1m27s
Details
security / Dependency Audit (pull_request) Successful in 2m20s
Details
security / Static Analysis (pull_request) Successful in 1m50s
Details
tests / ci (8.4) (pull_request) Successful in 1m33s
Details
tests / ci (8.5) (pull_request) Successful in 2m5s
Details 
Seeded user emails were using example.com domains which don't match
the LDAP mail attributes (travel.local). When users log in via LDAP,
LdapRecord syncs by email — a mismatch caused new DB records to be
created without roles, preventing admin access to the Filament panel.
 2026-03-06 07:11:08 +00:00
4 changed files with 14 additions and 8 deletions
Expand all files Collapse all files

6
compose.yaml
View File

@@ -97,6 +97,8 @@ services:
LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}' LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}'
LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}' LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}'
volumes: volumes:
- 'sail-ldap-data:/var/lib/ldap'
- 'sail-ldap-config:/etc/ldap/slapd.d'
- './docker/openldap/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/bootstrap.ldif' - './docker/openldap/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/bootstrap.ldif'
networks: networks:
- sail - sail
@@ -134,3 +136,7 @@ volumes:
driver: local driver: local
sail-redis: sail-redis:
driver: local driver: local
sail-ldap-data:
driver: local
sail-ldap-config:
driver: local

12
database/seeders/DatabaseSeeder.php
View File

@@ -16,28 +16,28 @@ class DatabaseSeeder extends Seeder
// Create roles // Create roles
$this->call(RoleSeeder::class); $this->call(RoleSeeder::class);
// Create admin user // Create admin user — email matches LDAP mail attribute
$admin = User::factory()->create([ $admin = User::factory()->create([
'name' => 'Administrator', 'name' => 'Administrator',
'email' => 'admin@example.com', 'email' => 'admin@travel.local',
'username' => 'admin', 'username' => 'admin',
'password' => Hash::make('password'), 'password' => Hash::make('password'),
]); ]);
$admin->assignRole('administrator'); $admin->assignRole('administrator');
// Create a travel approver // Create a travel approver — email matches LDAP mail attribute
$approver = User::factory()->create([ $approver = User::factory()->create([
'name' => 'Travel Approver', 'name' => 'Travel Approver',
'email' => 'approver@example.com', 'email' => 'approver@travel.local',
'username' => 'approver', 'username' => 'approver',
'password' => Hash::make('password'), 'password' => Hash::make('password'),
]); ]);
$approver->assignRole('travel_approver'); $approver->assignRole('travel_approver');
// Create a staff user // Create a staff user — email matches LDAP mail attribute
$staff = User::factory()->create([ $staff = User::factory()->create([
'name' => 'Staff Member', 'name' => 'Staff Member',
'email' => 'staff@example.com', 'email' => 'staff@travel.local',
'username' => 'staff', 'username' => 'staff',
'password' => Hash::make('password'), 'password' => Hash::make('password'),
]); ]);

2
resources/views/components/layouts/app.blade.php
View File

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'dark' }" x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);" x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme" :data-bs-theme="theme"
> >

2
resources/views/components/layouts/guest.blade.php
View File

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'dark' }" x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="document.documentElement.setAttribute('data-bs-theme', theme);" x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme" :data-bs-theme="theme"
> >