Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- **User Language Preference** (#86)
- New `preferred_locale` column in `users` table (VARCHAR(5), nullable)
- PATCH `/v1/me/language` endpoint to update user's preferred language
- Supports `en` (English) and `de` (German)
- Can be set to `null` to use default/Accept-Language header
- Form request validation via `UpdateUserLanguageRequest`
- 8 comprehensive feature tests
- Database migration: `2025_11_16_192506_add_preferred_locale_to_users_table`

- **Secret Sharing & Access Control (Phase 3)** (#182)
- **Secret CRUD API**: Full REST API for password manager functionality
- Create secrets with encrypted title, username, password, URL, notes (POST `/v1/secrets`)
Expand Down
23 changes: 23 additions & 0 deletions app/Http/Controllers/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use App\Http\Requests\PasswordResetRequest;
use App\Http\Requests\PasswordResetRequestRequest;
use App\Http\Requests\TokenRequest;
use App\Http\Requests\UpdateUserLanguageRequest;
use App\Mail\PasswordResetMail;
use App\Models\User;
use Illuminate\Http\JsonResponse;
Expand Down Expand Up @@ -103,6 +104,28 @@ public function me(Request $request): JsonResponse
]);
}

/**
* Update the authenticated user's language preference.
*/
public function updateLanguage(UpdateUserLanguageRequest $request): JsonResponse
{
/** @var User $user */
$user = $request->user();

/** @var array{locale: string|null} $validated */
$validated = $request->validated();

$user->update([
'preferred_locale' => $validated['locale'],
]);

return response()->json([
'data' => [
'preferred_locale' => $user->preferred_locale,
],
]);
}

/**
* Request a password reset email.
*
Expand Down
50 changes: 50 additions & 0 deletions app/Http/Requests/UpdateUserLanguageRequest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

declare(strict_types=1);

// SPDX-FileCopyrightText: 2025 SecPal Contributors
// SPDX-License-Identifier: AGPL-3.0-or-later

namespace App\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;

class UpdateUserLanguageRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'locale' => [
'present',
'nullable',
Rule::in(['en', 'de']),
],
];
}

/**
* Get the custom error messages for validation rules.
*
* @return array<string, string>
*/
public function messages(): array
{
return [
'locale.in' => 'Language must be either English (en) or German (de).',
];
}
}
2 changes: 2 additions & 0 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* @property string $password
* @property ?\Illuminate\Support\Carbon $email_verified_at
* @property string|null $remember_token
* @property string|null $preferred_locale
* @property \Illuminate\Support\Carbon $created_at
* @property \Illuminate\Support\Carbon $updated_at
*/
Expand All @@ -52,6 +53,7 @@ class User extends Authenticatable
'name',
'email',
'password',
'preferred_locale',
];

/**
Expand Down
1 change: 1 addition & 0 deletions database/factories/UserFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public function definition(): array
'email_verified_at' => now(),
'password' => static::$password ??= Hash::make('password'),
'remember_token' => Str::random(10),
'preferred_locale' => null,
];
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

declare(strict_types=1);

// SPDX-FileCopyrightText: 2025 SecPal Contributors
// SPDX-License-Identifier: AGPL-3.0-or-later

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->string('preferred_locale', 5)->nullable()->after('remember_token');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('preferred_locale');
});
}
};
1 change: 1 addition & 0 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
Route::post('/auth/logout', [AuthController::class, 'logout']);
Route::post('/auth/logout-all', [AuthController::class, 'logoutAll']);
Route::get('/me', [AuthController::class, 'me']);
Route::patch('/me/language', [AuthController::class, 'updateLanguage']);

// Role Management CRUD API
// Authorization: Route-level permission middleware + Policy (defense-in-depth)
Expand Down
119 changes: 119 additions & 0 deletions tests/Feature/Controllers/Api/V1/UserLanguagePreferenceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?php

declare(strict_types=1);

// SPDX-FileCopyrightText: 2025 SecPal Contributors
// SPDX-License-Identifier: AGPL-3.0-or-later

use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

uses(RefreshDatabase::class);

describe('User Language Preference API', function () {
test('user can update their language preference to German', function () {
/** @var User $user */
$user = User::factory()->create(['preferred_locale' => null]);

$response = $this->actingAs($user)
->patchJson('/v1/me/language', [
'locale' => 'de',
]);

$response->assertOk()
->assertJson([
'data' => [
'preferred_locale' => 'de',
],
]);

expect($user->fresh()->preferred_locale)->toBe('de');
});

test('user can update their language preference to English', function () {
/** @var User $user */
$user = User::factory()->create(['preferred_locale' => 'de']);

$response = $this->actingAs($user)
->patchJson('/v1/me/language', [
'locale' => 'en',
]);

$response->assertOk();
expect($user->fresh()->preferred_locale)->toBe('en');
});

test('user can reset language preference to null', function () {
/** @var User $user */
$user = User::factory()->create(['preferred_locale' => 'de']);

$response = $this->actingAs($user)
->patchJson('/v1/me/language', [
'locale' => null,
]);

$response->assertOk();
expect($user->fresh()->preferred_locale)->toBeNull();
});

test('validation rejects invalid locale codes', function () {
/** @var User $user */
$user = User::factory()->create();

$response = $this->actingAs($user)
->patchJson('/v1/me/language', [
'locale' => 'fr', // French not supported
]);

$response->assertStatus(422)
->assertJsonValidationErrors(['locale']);
});

test('empty string is treated as null and accepted', function () {
/** @var User $user */
$user = User::factory()->create(['preferred_locale' => 'de']);

$response = $this->actingAs($user)
->patchJson('/v1/me/language', [
'locale' => '',
]);

$response->assertOk();
expect($user->fresh()->preferred_locale)->toBeNull();
});

test('validation requires locale field', function () {
/** @var User $user */
$user = User::factory()->create();

$response = $this->actingAs($user)
->patchJson('/v1/me/language', []);

$response->assertStatus(422)
->assertJsonValidationErrors(['locale']);
});

test('unauthenticated users cannot update language preference', function () {
$response = $this->patchJson('/v1/me/language', [
'locale' => 'de',
]);

$response->assertStatus(401);
});

test('endpoint only affects authenticated user', function () {
/** @var User $user1 */
$user1 = User::factory()->create(['preferred_locale' => null]);
/** @var User $user2 */
$user2 = User::factory()->create(['preferred_locale' => null]);

$response = $this->actingAs($user1)
->patchJson('/v1/me/language', [
'locale' => 'de',
]);

$response->assertOk();
expect($user1->fresh()->preferred_locale)->toBe('de');
expect($user2->fresh()->preferred_locale)->toBeNull();
});
});