{% if config('ifsg_enabled') %}
-
{% endif %}
diff --git a/resources/views/pages/settings/settings.twig b/resources/views/pages/settings/settings.twig
index 35034ee3..bf54bbb5 100644
--- a/resources/views/pages/settings/settings.twig
+++ b/resources/views/pages/settings/settings.twig
@@ -8,7 +8,12 @@
{% block container_title %}
{{ __('settings.settings') }}
- {{ block('title') }}
+
+ {{ block('title') }}
+ {% if is_admin|default(false) %}
+ ({{ admin_user.name }})
+ {% endif %}
+
{% endblock %}
@@ -16,12 +21,14 @@
diff --git a/src/Controllers/Admin/UserSettingsController.php b/src/Controllers/Admin/UserSettingsController.php
new file mode 100644
index 00000000..0b753f9e
--- /dev/null
+++ b/src/Controllers/Admin/UserSettingsController.php
@@ -0,0 +1,142 @@
+checkPermission('user.ifsg.edit', $this->isIfsgSupporter());
+ $user = $this->getUser($request);
+
+ return $this->view(
+ $user,
+ 'pages/settings/certificates-admin',
+ [
+ 'certificates' => $user->license,
+ ]
+ );
+ }
+
+ public function saveIfsgCertificate(Request $request): Response
+ {
+ if (!config('ifsg_enabled')) {
+ throw new HttpNotFound();
+ }
+
+ $this->checkPermission('user.ifsg.edit', $this->isIfsgSupporter());
+ $user = $this->getUser($request);
+
+ $data = $this->validate($request, [
+ 'ifsg_certificate_light' => 'optional|checked',
+ 'ifsg_certificate' => 'optional|checked',
+ 'ifsg_confirmed' => 'optional|checked',
+ ]);
+
+ if (config('ifsg_light_enabled')) {
+ $user->license->ifsg_certificate_light = !$data['ifsg_certificate'] && $data['ifsg_certificate_light'];
+ }
+ $user->license->ifsg_certificate = (bool) $data['ifsg_certificate'];
+ $user->license->ifsg_confirmed = $data['ifsg_confirmed']
+ && ($user->license->ifsg_certificate || $user->license->ifsg_certificate_light);
+
+ $user->license->save();
+ $this->addNotification('settings.certificates.success');
+ $this->log->info('Certificate "{certificate}" of user {user} ({id}) is {confirmation}.', [
+ 'certificate' => $user->license->ifsg_certificate_light
+ ? 'IfSG light'
+ : ($user->license->ifsg_certificate
+ ? 'IfSG'
+ : 'no IfSG'
+ ),
+ 'user' => $user->name,
+ 'id' => $user->id,
+ 'confirmation' => $user->license->ifsg_confirmed ? 'confirmed' : 'unconfirmed',
+ ]);
+
+ return $this->redirect->to('/users/' . $user->id . '/certificates');
+ }
+
+ public function settingsMenu(User $user): array
+ {
+ $menu = [
+ url('/users', ['action' => 'view', 'user_id' => $user->id]) => [
+ 'title' => 'general.back', 'icon' => 'chevron-left',
+ ],
+ ];
+
+ if (config('ifsg_enabled')) {
+ $menu[url('/users/' . $user->id . '/certificates')] = [
+ 'title' => 'settings.certificates',
+ 'icon' => 'card-checklist',
+ 'permission' => $this->isIfsgSupporter() ? null : 'user.ifsg.edit',
+ ];
+ }
+
+ return $menu;
+ }
+
+ protected function checkPermission(string | array $abilities, bool $overwrite = false): void
+ {
+ if (!$overwrite && !$this->auth->can($abilities)) {
+ throw new HttpForbidden();
+ }
+ }
+
+ protected function view(User $user, string $view, array $data = []): Response
+ {
+ return $this->response->withView(
+ $view,
+ array_merge([
+ 'settings_menu' => $this->settingsMenu($user),
+ 'is_admin' => true,
+ 'admin_user' => $user,
+ ], $data)
+ );
+ }
+
+ protected function getUser(Request $request): User
+ {
+ $userId = $request->getAttribute('user_id');
+ return User::findOrFail($userId);
+ }
+
+ public function isIfsgSupporter(): bool
+ {
+ return (bool) AngelType::whereRequiresIfsgCertificate(true)
+ ->leftJoin('user_angel_type', 'user_angel_type.angel_type_id', 'angel_types.id')
+ ->where('user_angel_type.user_id', $this->auth->user()?->id)
+ ->where('user_angel_type.supporter', true)
+ ->count();
+ }
+}
diff --git a/src/Controllers/SettingsController.php b/src/Controllers/SettingsController.php
index a6fbc8e4..e0c9697b 100644
--- a/src/Controllers/SettingsController.php
+++ b/src/Controllers/SettingsController.php
@@ -242,29 +242,28 @@ class SettingsController extends BaseController
public function certificate(): Response
{
- $user = $this->auth->user();
-
if (!config('ifsg_enabled') && !$this->checkDrivingLicense()) {
throw new HttpNotFound();
}
+ $user = $this->auth->user();
return $this->response->withView(
'pages/settings/certificates',
[
- 'settings_menu' => $this->settingsMenu(),
- 'driving_license' => $this->checkDrivingLicense(),
- 'certificates' => $user->license,
+ 'settings_menu' => $this->settingsMenu(),
+ 'driving_license' => $this->checkDrivingLicense(),
+ 'certificates' => $user->license,
]
);
}
public function saveIfsgCertificate(Request $request): Response
{
- if (!config('ifsg_enabled')) {
+ $user = $this->auth->user();
+ if (!config('ifsg_enabled') || $user->license->ifsg_confirmed) {
throw new HttpNotFound();
}
- $user = $this->auth->user();
$data = $this->validate($request, [
'ifsg_certificate_light' => 'optional|checked',
'ifsg_certificate' => 'optional|checked',
@@ -274,8 +273,8 @@ class SettingsController extends BaseController
$user->license->ifsg_certificate_light = !$data['ifsg_certificate'] && $data['ifsg_certificate_light'];
}
$user->license->ifsg_certificate = (bool) $data['ifsg_certificate'];
- $user->license->save();
+ $user->license->save();
$this->addNotification('settings.certificates.success');
return $this->redirect->to('/settings/certificates');
diff --git a/src/Models/AngelType.php b/src/Models/AngelType.php
index 3fdca538..1db06014 100644
--- a/src/Models/AngelType.php
+++ b/src/Models/AngelType.php
@@ -42,6 +42,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @method static QueryBuilder|AngelType[] whereContactEmail($value)
* @method static QueryBuilder|AngelType[] whereRestricted($value)
* @method static QueryBuilder|AngelType[] whereRequiresDriverLicense($value)
+ * @method static QueryBuilder|AngelType[] whereRequiresIfsgCertificate($value)
* @method static QueryBuilder|AngelType[] whereNoSelfSignup($value)
* @method static QueryBuilder|AngelType[] whereShowOnDashboard($value)
* @method static QueryBuilder|AngelType[] whereHideRegister($value)
diff --git a/src/Models/User/License.php b/src/Models/User/License.php
index a25102bb..565ef292 100644
--- a/src/Models/User/License.php
+++ b/src/Models/User/License.php
@@ -16,6 +16,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @property bool $drive_12t
* @property bool $ifsg_certificate_light
* @property bool $ifsg_certificate
+ * @property bool $ifsg_confirmed
*
* @method static QueryBuilder|License[] whereHasCar($value)
* @method static QueryBuilder|License[] whereDriveForklift($value)
@@ -25,6 +26,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @method static QueryBuilder|License[] whereDrive12T($value)
* @method static QueryBuilder|License[] whereIfsgCertificateLight($value)
* @method static QueryBuilder|License[] whereIfsgCertificate($value)
+ * @method static QueryBuilder|License[] whereIfsgConfirmed($value)
*/
class License extends HasUserModel
{
@@ -35,14 +37,15 @@ class License extends HasUserModel
/** @var array
Default attributes */
protected $attributes = [ // phpcs:ignore
- 'has_car' => false,
- 'drive_forklift' => false,
- 'drive_car' => false,
- 'drive_3_5t' => false,
- 'drive_7_5t' => false,
- 'drive_12t' => false,
+ 'has_car' => false,
+ 'drive_forklift' => false,
+ 'drive_car' => false,
+ 'drive_3_5t' => false,
+ 'drive_7_5t' => false,
+ 'drive_12t' => false,
'ifsg_certificate_light' => false,
- 'ifsg_certificate' => false,
+ 'ifsg_certificate' => false,
+ 'ifsg_confirmed' => false,
];
/**
@@ -60,18 +63,20 @@ class License extends HasUserModel
'drive_12t',
'ifsg_certificate_light',
'ifsg_certificate',
+ 'ifsg_confirmed',
];
/** @var array */
protected $casts = [ // phpcs:ignore
- 'has_car' => 'boolean',
- 'drive_forklift' => 'boolean',
- 'drive_car' => 'boolean',
- 'drive_3_5t' => 'boolean',
- 'drive_7_5t' => 'boolean',
- 'drive_12t' => 'boolean',
+ 'has_car' => 'boolean',
+ 'drive_forklift' => 'boolean',
+ 'drive_car' => 'boolean',
+ 'drive_3_5t' => 'boolean',
+ 'drive_7_5t' => 'boolean',
+ 'drive_12t' => 'boolean',
'ifsg_certificate_light' => 'boolean',
- 'ifsg_certificate' => 'boolean',
+ 'ifsg_certificate' => 'boolean',
+ 'ifsg_confirmed' => 'boolean',
];
/**
diff --git a/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php b/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php
new file mode 100644
index 00000000..96b9d42a
--- /dev/null
+++ b/tests/Unit/Controllers/Admin/UserSettingsControllerTest.php
@@ -0,0 +1,235 @@
+ false]);
+
+ $this->expectException(HttpNotFound::class);
+ $this->controller->certificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ */
+ public function testCertificateNotAllowed(): void
+ {
+ config(['ifsg_enabled' => true]);
+
+ $this->expectException(HttpForbidden::class);
+ $this->controller->certificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::__construct
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::certificate
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::getUser
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::view
+ */
+ public function testCertificateByPermission(): void
+ {
+ config(['ifsg_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.ifsg.edit'], true, $this->atLeastOnce());
+
+ $this->response->expects($this->once())
+ ->method('withView')
+ ->willReturnCallback(function (string $view, array $data): Response {
+ $this->assertArrayHasKey('certificates', $data);
+ $this->assertArrayHasKey('settings_menu', $data);
+ $this->assertArrayHasKey('is_admin', $data);
+ $this->assertTrue($data['is_admin']);
+ $this->assertArrayHasKey('admin_user', $data);
+ $this->assertEquals($this->userChanged->id, $data['admin_user']->id);
+ return $this->response;
+ });
+
+ $this->controller->certificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::certificate
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::checkPermission
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::isIfsgSupporter
+ */
+ public function testCertificateByAngelTypeSupporter(): void
+ {
+ config(['ifsg_enabled' => true]);
+ $this->setExpects($this->response, 'withView', null, $this->response);
+
+ $angelType = AngelType::factory()->create(['requires_ifsg_certificate' => true]);
+ $this->user->userAngelTypes()->attach($angelType, ['supporter' => true]);
+
+ $this->controller->certificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ */
+ public function testSaveIfsgCertificateDisabled(): void
+ {
+ config(['ifsg_enabled' => false]);
+
+ $this->expectException(HttpNotFound::class);
+ $this->controller->saveIfsgCertificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ */
+ public function testSaveIfsgCertificateNotAllowed(): void
+ {
+ config(['ifsg_enabled' => true]);
+
+ $this->expectException(HttpForbidden::class);
+ $this->controller->saveIfsgCertificate($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ */
+ public function testSaveIfsgCertificateConfirmed(): void
+ {
+ config(['ifsg_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.ifsg.edit'], true, $this->atLeastOnce());
+
+ $body = [
+ 'ifsg_certificate' => true,
+ 'ifsg_confirmed' => true,
+ ];
+ $this->request = $this->request->withParsedBody($body);
+
+ $this->response->expects($this->once())
+ ->method('redirectTo')
+ ->with('http://localhost/users/' . $this->userChanged->id . '/certificates')
+ ->willReturn($this->response);
+
+ $this->controller->saveIfsgCertificate($this->request);
+ $this->assertTrue($this->log->hasInfoThatContains('Certificate'));
+
+ $this->assertFalse($this->userChanged->license->ifsg_certificate_light);
+ $this->assertTrue($this->userChanged->license->ifsg_certificate);
+ $this->assertTrue($this->userChanged->license->ifsg_confirmed);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ */
+ public function testSaveIfsgCertificate(): void
+ {
+ config(['ifsg_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.ifsg.edit'], true, $this->atLeastOnce());
+
+ $body = [
+ 'ifsg_certificate' => true,
+ ];
+ $this->request = $this->request->withParsedBody($body);
+
+ $this->response->expects($this->once())
+ ->method('redirectTo')
+ ->with('http://localhost/users/' . $this->userChanged->id . '/certificates')
+ ->willReturn($this->response);
+
+ $this->controller->saveIfsgCertificate($this->request);
+
+ $this->assertFalse($this->userChanged->license->ifsg_certificate_light);
+ $this->assertTrue($this->userChanged->license->ifsg_certificate);
+ $this->assertFalse($this->userChanged->license->ifsg_confirmed);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::saveIfsgCertificate
+ */
+ public function testSaveIfsgCertificateLite(): void
+ {
+ config(['ifsg_enabled' => true, 'ifsg_light_enabled' => true]);
+ $this->setExpects($this->auth, 'can', ['user.ifsg.edit'], true, $this->atLeastOnce());
+
+ $body = [
+ 'ifsg_certificate_light' => true,
+ ];
+ $this->request = $this->request->withParsedBody($body);
+
+ $this->response->expects($this->once())
+ ->method('redirectTo')
+ ->with('http://localhost/users/' . $this->userChanged->id . '/certificates')
+ ->willReturn($this->response);
+
+ $this->controller->saveIfsgCertificate($this->request);
+
+ $this->assertTrue($this->userChanged->license->ifsg_certificate_light);
+ $this->assertFalse($this->userChanged->license->ifsg_certificate);
+ $this->assertFalse($this->userChanged->license->ifsg_confirmed);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserSettingsController::settingsMenu
+ */
+ public function testSettingsMenu(): void
+ {
+ $menu = $this->controller->settingsMenu($this->userChanged);
+ $this->assertArrayHasKey('http://localhost/users?action=view&user_id=' . $this->userChanged->id, $menu);
+
+ config(['ifsg_enabled' => true]);
+ $menu = $this->controller->settingsMenu($this->userChanged);
+ $this->assertArrayHasKey('http://localhost/users/' . $this->userChanged->id . '/certificates', $menu);
+ }
+
+ /**
+ * Setup environment
+ */
+ public function setUp(): void
+ {
+ parent::setUp();
+
+ $this->app->bind('http.urlGenerator', UrlGenerator::class);
+
+ $this->user = User::factory()->create();
+
+ $this->userChanged = User::factory()
+ ->has(License::factory())
+ ->create();
+
+ $this->auth = $this->createMock(Authenticator::class);
+ $this->app->instance(Authenticator::class, $this->auth);
+
+ $this->setExpects($this->auth, 'user', null, $this->user, $this->any());
+
+ $this->request = $this->request->withAttribute('user_id', $this->userChanged->id);
+
+ $this->controller = $this->app->make(UserSettingsController::class);
+ $this->controller->setValidator(new Validator());
+ }
+}
diff --git a/tests/Unit/Controllers/SettingsControllerTest.php b/tests/Unit/Controllers/SettingsControllerTest.php
index af961809..8aabac29 100644
--- a/tests/Unit/Controllers/SettingsControllerTest.php
+++ b/tests/Unit/Controllers/SettingsControllerTest.php
@@ -805,7 +805,7 @@ class SettingsControllerTest extends ControllerTest
$this->setExpects($this->auth, 'user', null, $this->user, $this->once());
$body = [
- 'ifsg_certificate' => true,
+ 'ifsg_certificate' => true,
];
$this->request = $this->request->withParsedBody($body);