admin
fcf2f9d0bf
Backend: - New tenants table with PSGC-derived code, links to cities_municipalities, optional boundary_polygon override, theme color, contact info, timezone. - Adds nullable tenant_id to users / households / drop_off_points / dumpsites / partner_stores. Foreign-keyed, indexed. - Tenant model with deriveCode() helper + effectiveBoundary() fallback chain. - App\Tenancy\Tenancy — process-level current-tenant register with withTenant() / withoutScope() helpers for jobs + super-admin. - App\Tenancy\TenantScope — global Eloquent scope, no-op when no tenant is set (so seeders + super-admin reads still work). - App\Tenancy\HasTenant trait — applied to Household, DropOffPoint, Dumpsite, PartnerStore. Auto-fills tenant_id on create from Tenancy::current(). - ResolveTenant middleware — reads X-Tenant-Code (or X-Tenant-Id), validates tenant exists + active, sets Tenancy::current(). Falls back to authenticated user's tenant_id when header missing. Registered globally on the api group. - Login + register now require an active tenant (super-admin bypasses). Cross-tenant credential reuse is rejected with a 403 + clear message. - super_admin role added to RoleSeeder + users.role enum. - Public GET /api/v1/tenants/lookup?code= — no auth, returns tenant details for the pre-login screen. Seeders: - SuperAdminSeeder seeds super@verde.local (tenant_id = null). - SanPascualTenantSeeder seeds Region IV-A → Batangas → San Pascual municipality → sample Poblacion barangay → Tenant row with code SAN-PASCUAL-BAT, then backfills every existing tenant-aware row (13 users / 2 households / 5 DOPs / 1 dumpsite / 3 stores) so the dev environment keeps working end-to-end. - Wired into DatabaseSeeder so migrate:fresh --seed bootstraps cleanly. Customer-web: - New /tenant page — text input, calls public lookup, confirms with resolved tenant card, stores code + name in cookies (1 year). "Pilot users: SAN-PASCUAL-BAT" hint as a clickable shortcut. - /login + /register now redirect to /tenant?next= when no cookie, show a verde "signing in to <LGU>" pill with a Switch link, delegate the actual form to client components. - /api/tenant route — POST sets cookie, DELETE clears. - apiServer auto-attaches X-Tenant-Code on every API call when the cookie is present. - Tenant cookies are non-httpOnly so the client can echo them; the session token stays httpOnly. Build: 23 routes (added /tenant), 196 backend tests still pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
83 lines
2.8 KiB
PHP
83 lines
2.8 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Api\V1\Auth;
|
|
|
|
use App\Http\Controllers\Api\V1\ApiController;
|
|
use App\Http\Requests\Auth\RegisterRequest;
|
|
use App\Http\Resources\UserResource;
|
|
use App\Models\NotificationPreference;
|
|
use App\Models\OtpCode;
|
|
use App\Models\User;
|
|
use App\Services\Otp\OtpService;
|
|
use App\Tenancy\Tenancy;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Hash;
|
|
|
|
class RegisterController extends ApiController
|
|
{
|
|
public function __invoke(RegisterRequest $request, OtpService $otp): JsonResponse
|
|
{
|
|
$data = $request->validated();
|
|
|
|
// Tenant gate. New residents always belong to one LGU; the
|
|
// ResolveTenant middleware sets it from the X-Tenant-Code header.
|
|
$tenant = Tenancy::current();
|
|
if (! $tenant) {
|
|
return $this->fail('Pick your LGU first.', ['tenant' => ['LGU code required']], 400);
|
|
}
|
|
|
|
$user = DB::transaction(function () use ($data, $tenant) {
|
|
$user = User::create([
|
|
'tenant_id' => $tenant->id,
|
|
'first_name' => $data['first_name'],
|
|
'middle_name' => $data['middle_name'] ?? null,
|
|
'last_name' => $data['last_name'],
|
|
'email' => $data['email'],
|
|
'phone' => $data['phone'],
|
|
'password' => Hash::make($data['password']),
|
|
'role' => $data['role'],
|
|
'status' => User::STATUS_PENDING,
|
|
'preferred_language' => $data['preferred_language'] ?? 'en',
|
|
]);
|
|
|
|
$user->assignRole($data['role']);
|
|
|
|
$profileClass = User::profileModelForRole($data['role']);
|
|
if ($profileClass) {
|
|
$profileClass::create(['user_id' => $user->id]);
|
|
}
|
|
|
|
NotificationPreference::create([
|
|
'user_id' => $user->id,
|
|
'language' => $data['preferred_language'] ?? 'en',
|
|
]);
|
|
|
|
return $user;
|
|
});
|
|
|
|
$issue = $otp->issue(
|
|
destination: $user->phone,
|
|
purpose: OtpCode::PURPOSE_REGISTER,
|
|
user: $user,
|
|
);
|
|
|
|
// Fire-and-forget email verification link. If the mail backend is
|
|
// misconfigured we don't block registration.
|
|
try {
|
|
$user->sendEmailVerificationNotification();
|
|
} catch (\Throwable $e) {
|
|
\Log::warning('Failed to send verification email', [
|
|
'user_id' => $user->id, 'error' => $e->getMessage(),
|
|
]);
|
|
}
|
|
|
|
return $this->created([
|
|
'user' => new UserResource($user),
|
|
'otp_sent' => $issue->issued,
|
|
'otp_destination' => $user->phone,
|
|
'debug_code' => app()->environment('local', 'testing') ? $issue->plainCode : null,
|
|
], 'Registration successful. Verify the OTP sent to your phone.');
|
|
}
|
|
}
|