Remove persistent LDAP volumes so bootstrap.ldif always applies on startup

The osixia/openldap image only runs bootstrap LDIF when the database is empty. Named volumes (sail-ldap-data, sail-ldap-config) caused changes to bootstrap.ldif to be ignored after the first run. Removing these volumes ensures the test LDAP directory is always seeded fresh from the bootstrap file on each sail up.
Seed OpenLDAP with bootstrap users including email addresses
2026-03-06 04:02:18 +00:00 · 2026-03-06 02:47:54 +00:00 · 2026-03-06 10:35:45 +08:00 · 2026-03-06 02:34:46 +00:00 · 2026-03-06 10:17:48 +08:00 · 2026-03-06 02:16:45 +00:00
10 changed files with 94 additions and 25 deletions
--- a/.env.example
+++ b/.env.example
@@ -63,3 +63,10 @@ AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false

 VITE_APP_NAME="${APP_NAME}"
+
+LDAP_HOST=openldap
+LDAP_USERNAME="cn=admin,dc=travel,dc=local"
+LDAP_PASSWORD=adminpassword
+LDAP_PORT=389
+LDAP_BASE_DN="dc=travel,dc=local"
+LDAP_LOGGING=true
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -64,6 +64,16 @@ class User extends Authenticatable implements FilamentUser, LdapAuthenticatable
        return $this->hasRole('administrator');
    }

+    public function getLdapGuidColumn(): string
+    {
+        return 'ldap_guid';
+    }
+
+    public function getLdapDomainColumn(): string
+    {
+        return 'ldap_domain';
+    }
+
    public function emergencyContacts(): HasMany
    {
        return $this->hasMany(EmergencyContact::class);
--- a/compose.yaml
+++ b/compose.yaml
@@ -84,6 +84,7 @@ services:
            - sail
    openldap:
        image: 'osixia/openldap:1.5.0'
+        command: '--copy-service'
        ports:
            - '${FORWARD_LDAP_PORT:-389}:389'
            - '${FORWARD_LDAPS_PORT:-636}:636'
@@ -96,8 +97,7 @@ services:
            LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}'
            LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}'
        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'
        networks:
            - sail
        healthcheck:
@@ -115,6 +115,17 @@ services:
                - '${LDAP_ADMIN_PASSWORD:-adminpassword}'
            retries: 3
            timeout: 5s
+    phpldapadmin:
+        image: 'osixia/phpldapadmin:latest'
+        ports:
+            - '${FORWARD_PHPLDAPADMIN_PORT:-8085}:80'
+        environment:
+            PHPLDAPADMIN_LDAP_HOSTS: openldap
+            PHPLDAPADMIN_HTTPS: 'false'
+        networks:
+            - sail
+        depends_on:
+            - openldap
 networks:
    sail:
        driver: bridge
@@ -123,7 +134,3 @@ volumes:
        driver: local
    sail-redis:
        driver: local
-    sail-ldap-data:
-        driver: local
-    sail-ldap-config:
-        driver: local
--- a/database/migrations/2026_03_05_020958_create_approval_workflows_table.php
+++ b/database/migrations/2026_03_05_020958_create_approval_workflows_table.php
--- a/docker/openldap/bootstrap.ldif
+++ b/docker/openldap/bootstrap.ldif
@@ -0,0 +1,46 @@
+# People OU
+dn: ou=people,dc=travel,dc=local
+objectClass: organizationalUnit
+ou: people
+
+# Administrator
+dn: uid=admin,ou=people,dc=travel,dc=local
+objectClass: inetOrgPerson
+objectClass: posixAccount
+objectClass: shadowAccount
+cn: Administrator
+sn: Administrator
+uid: admin
+mail: admin@travel.local
+uidNumber: 1000
+gidNumber: 1000
+homeDirectory: /home/admin
+userPassword: password
+
+# Travel Approver
+dn: uid=approver,ou=people,dc=travel,dc=local
+objectClass: inetOrgPerson
+objectClass: posixAccount
+objectClass: shadowAccount
+cn: Travel Approver
+sn: Approver
+uid: approver
+mail: approver@travel.local
+uidNumber: 1001
+gidNumber: 1000
+homeDirectory: /home/approver
+userPassword: password
+
+# Staff Member
+dn: uid=staff,ou=people,dc=travel,dc=local
+objectClass: inetOrgPerson
+objectClass: posixAccount
+objectClass: shadowAccount
+cn: Staff Member
+sn: Member
+uid: staff
+mail: staff@travel.local
+uidNumber: 1002
+gidNumber: 1000
+homeDirectory: /home/staff
+userPassword: password
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,4 +1,3 @@
 import * as bootstrap from 'bootstrap';
-import './../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js';

 window.bootstrap = bootstrap;
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -1,8 +1,9 @@
 <!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" x-data x-init="
-    const saved = localStorage.getItem('theme');
-    if (saved) { document.documentElement.setAttribute('data-bs-theme', saved); }
-">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
+    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);"
+    :data-bs-theme="theme"
+>
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -43,16 +44,11 @@
                    <li class="nav-item me-2">
                        <button
                            class="btn btn-sm btn-outline-light"
-                            x-on:click="
-                                const current = document.documentElement.getAttribute('data-bs-theme');
-                                const next = current === 'dark' ? 'light' : 'dark';
-                                document.documentElement.setAttribute('data-bs-theme', next);
-                                localStorage.setItem('theme', next);
-                            "
+                            x-on:click="theme = theme === 'dark' ? 'light' : 'dark'"
                            title="Toggle dark/light mode"
                        >
-                            <span x-show="document.documentElement.getAttribute('data-bs-theme') !== 'dark'">🌙</span>
-                            <span x-show="document.documentElement.getAttribute('data-bs-theme') === 'dark'">☀️</span>
+                            <span x-show="theme !== 'dark'">🌙</span>
+                            <span x-show="theme === 'dark'">☀️</span>
                        </button>
                    </li>
                    @auth
--- a/resources/views/components/layouts/guest.blade.php
+++ b/resources/views/components/layouts/guest.blade.php
@@ -1,5 +1,9 @@
 <!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
+    x-data="{ theme: localStorage.getItem('theme') || 'light' }"
+    x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
+    :data-bs-theme="theme"
+>
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,7 +12,7 @@
    @vite(['resources/css/app.css', 'resources/js/app.js'])
    @livewireStyles
 </head>
-<body class="bg-light">
+<body>
    {{ $slot }}
    @livewireScripts
 </body>
--- a/resources/views/livewire/auth/login.blade.php
+++ b/resources/views/livewire/auth/login.blade.php
@@ -18,7 +18,7 @@ new #[Layout('components.layouts.guest')] class extends Component {
    {
        $this->validate();

-        if (Auth::attempt(['username' => $this->username, 'password' => $this->password], $this->rememberMe)) {
+        if (Auth::attempt(['uid' => $this->username, 'password' => $this->password], $this->rememberMe)) {
            session()->regenerate();
            $this->redirectIntended(route('dashboard'), navigate: true);
            return;
@@ -29,7 +29,7 @@ new #[Layout('components.layouts.guest')] class extends Component {
 }
 ?>

-<div class="min-vh-100 d-flex align-items-center justify-content-center bg-light">
+<div class="min-vh-100 d-flex align-items-center justify-content-center">
    <div class="card shadow-sm" style="width: 100%; max-width: 420px;">
        <div class="card-body p-4">
            <div class="text-center mb-4">
--- a/resources/views/livewire/travel-request/create.blade.php
+++ b/resources/views/livewire/travel-request/create.blade.php
@@ -318,7 +318,7 @@ new #[Layout('components.layouts.app')] class extends Component {
                @error('journeys') <div class="alert alert-danger">{{ $message }}</div> @enderror

                @foreach ($journeys as $i => $journey)
-                    <div class="border rounded p-3 mb-3 bg-light" wire:key="journey-{{ $i }}">
+                    <div class="border rounded p-3 mb-3" wire:key="journey-{{ $i }}">
                        <div class="d-flex justify-content-between align-items-center mb-2">
                            <strong class="small">Journey {{ $i + 1 }}</strong>
                            @if (count($journeys) > 1)
@@ -413,7 +413,7 @@ new #[Layout('components.layouts.app')] class extends Component {
            </div>
            <div class="card-body">
                @foreach ($costCodes as $i => $code)
-                    <div class="border rounded p-3 mb-3 bg-light" wire:key="code-{{ $i }}">
+                    <div class="border rounded p-3 mb-3" wire:key="code-{{ $i }}">
                        <div class="d-flex justify-content-between align-items-center mb-2">
                            <strong class="small">Cost Code {{ $i + 1 }}</strong>
                            @if (count($costCodes) > 1)
Author	SHA1	Message	Date
Tim Basten	d59ec55999	Remove persistent LDAP volumes so bootstrap.ldif always applies on startup All checks were successful linter / quality (pull_request) Successful in 1m45s Details security / Dependency Audit (pull_request) Successful in 1m21s Details security / Static Analysis (pull_request) Successful in 2m11s Details tests / ci (8.4) (pull_request) Successful in 1m27s Details tests / ci (8.5) (pull_request) Successful in 2m21s Details The osixia/openldap image only runs bootstrap LDIF when the database is empty. Named volumes (sail-ldap-data, sail-ldap-config) caused changes to bootstrap.ldif to be ignored after the first run. Removing these volumes ensures the test LDAP directory is always seeded fresh from the bootstrap file on each sail up.	2026-03-06 04:02:18 +00:00
Tim Basten	9f47e6e2c8	Seed OpenLDAP with bootstrap users including email addresses All checks were successful linter / quality (pull_request) Successful in 1m20s Details security / Dependency Audit (pull_request) Successful in 2m22s Details security / Static Analysis (pull_request) Successful in 1m42s Details tests / ci (8.4) (pull_request) Successful in 1m25s Details tests / ci (8.5) (pull_request) Successful in 1m24s Details Add docker/openldap/bootstrap.ldif which creates an ou=people OU and three test users (admin, approver, staff) each with a mail attribute, matching the database seeder. Mount the LDIF into the openldap container and add --copy-service so it is loaded on first boot.	2026-03-06 02:47:54 +00:00
timmybee	fd53a28f03	Merge pull request 'Fix LDAP authentication failures' (#7 ) from worktree-ldap-issues into master Some checks failed linter / quality (push) Successful in 1m23s Details security / Dependency Audit (push) Successful in 1m29s Details security / Static Analysis (push) Successful in 1m42s Details tests / ci (8.5) (push) Has been cancelled Details tests / ci (8.4) (push) Has been cancelled Details Reviewed-on: #7	2026-03-06 10:35:45 +08:00
Tim Basten	bbcffe64b7	Fix LDAP authentication failures All checks were successful linter / quality (pull_request) Successful in 1m35s Details security / Dependency Audit (pull_request) Successful in 1m19s Details security / Static Analysis (pull_request) Successful in 1m32s Details tests / ci (8.4) (pull_request) Successful in 2m36s Details tests / ci (8.5) (pull_request) Successful in 1m37s Details - Add missing LDAP env vars to .env.example (host, base DN, bind credentials) - Use 'uid' instead of 'username' as the LDAP lookup attribute in Auth::attempt - Override getLdapGuidColumn/getLdapDomainColumn in User model to match migration column names (ldap_guid/ldap_domain vs default guid/domain)	2026-03-06 02:34:46 +00:00
timmybee	98abc637c8	Merge pull request 'Fix Bootstrap light/dark theming' (#6 ) from feature/bootstrap-theming into master All checks were successful linter / quality (push) Successful in 1m15s Details security / Dependency Audit (push) Successful in 1m29s Details security / Static Analysis (push) Successful in 1m25s Details tests / ci (8.4) (push) Successful in 1m58s Details tests / ci (8.5) (push) Successful in 1m28s Details Reviewed-on: #6	2026-03-06 10:17:48 +08:00
Tim Basten	236ba9558c	Fix Bootstrap light/dark theming across all layouts All checks were successful linter / quality (pull_request) Successful in 1m52s Details security / Dependency Audit (pull_request) Successful in 1m27s Details security / Static Analysis (pull_request) Successful in 1m44s Details tests / ci (8.4) (pull_request) Successful in 1m40s Details tests / ci (8.5) (pull_request) Successful in 1m49s Details - Make dark mode toggle reactive using Alpine x-data theme property - Apply saved theme on page load via data-bs-theme attribute binding - Remove hardcoded bg-light classes that broke dark mode styling - Fix duplicate/broken Bootstrap bundle import in app.js	2026-03-06 02:16:45 +00:00
timmybee	5f0b4218ae	Merge pull request 'Add phpLDAPadmin for LDAP user management' (#5 ) from feature/phpldapadmin into master All checks were successful linter / quality (push) Successful in 1m20s Details security / Dependency Audit (push) Successful in 1m30s Details security / Static Analysis (push) Successful in 1m37s Details tests / ci (8.4) (push) Successful in 1m27s Details tests / ci (8.5) (push) Successful in 1m29s Details Reviewed-on: #5	2026-03-06 09:43:41 +08:00
Tim Basten	38b1dd0f4d	Add phpLDAPadmin service for LDAP user management All checks were successful linter / quality (pull_request) Successful in 1m23s Details security / Dependency Audit (pull_request) Successful in 1m20s Details security / Static Analysis (pull_request) Successful in 1m26s Details tests / ci (8.4) (pull_request) Successful in 1m37s Details tests / ci (8.5) (pull_request) Successful in 1m30s Details Accessible at localhost:8085 (configurable via FORWARD_PHPLDAPADMIN_PORT). Login with cn=admin,dc=travel,dc=local and the LDAP admin password.	2026-03-06 01:42:03 +00:00
timmybee	2b9b2fd32d	Merge pull request 'Fix migration order for approval tables' (#4 ) from fix/migration-order into master Some checks failed linter / quality (push) Successful in 1m23s Details security / Static Analysis (push) Has been cancelled Details security / Dependency Audit (push) Has been cancelled Details tests / ci (8.4) (push) Has been cancelled Details tests / ci (8.5) (push) Has been cancelled Details Reviewed-on: #4	2026-03-06 09:38:00 +08:00
Tim Basten	35f3af9efe	Fix migration order so approval_workflows runs before approval_steps All checks were successful linter / quality (pull_request) Successful in 1m21s Details tests / ci (8.4) (pull_request) Successful in 1m25s Details tests / ci (8.5) (pull_request) Successful in 1m28s Details The approval_steps migration references approval_workflows via a foreign key, but both had the same timestamp (020959), causing steps to run first alphabetically and fail. Moved workflows to 020958 so it runs first.	2026-03-06 01:37:11 +00:00