API methods to handle teams and users (#1384)

src/Form/API/TeamApiEditForm.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\TeamEditForm;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class TeamApiEditForm extends TeamEditForm
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'expand_users' => false,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/API/UserApiCreateForm.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\Type\UserRoleType;
+use App\Form\UserCreateType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class UserApiCreateForm extends UserCreateType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        $builder->remove('plainPassword');
+
+        $builder->add('plainPassword', PasswordType::class, [
+            'required' => true,
+            'label' => 'label.password',
+            'documentation' => [
+                'type' => 'string',
+                'description' => 'Plain text password',
+            ],
+        ]);
+
+        if ($options['include_roles']) {
+            $builder->add('roles', UserRoleType::class, [
+                'label' => 'label.roles',
+                'required' => false,
+                'multiple' => true,
+                'expanded' => false,
+            ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+            'include_roles' => true,
+            'include_add_more' => false,
+        ]);
+    }
+}

src/Form/API/UserApiEditForm.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\Type\UserRoleType;
+use App\Form\UserEditType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class UserApiEditForm extends UserEditType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        if ($options['include_roles']) {
+            $builder->add('roles', UserRoleType::class, [
+                'label' => 'label.roles',
+                'required' => false,
+                'multiple' => true,
+                'expanded' => false,
+            ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+            'include_roles' => true,
+        ]);
+    }
+}

src/Form/TeamEditForm.php

@@ -29,15 +29,25 @@ class TeamEditForm extends AbstractType
                 'attr' => [
                     'autofocus' => 'autofocus'
                 ],
+                // documentation is for NelmioApiDocBundle
+                'documentation' => [
+                    'type' => 'string',
+                    'description' => 'Name of the new team',
+                ],
             ])
             ->add('teamlead', UserType::class, [
                 'label' => 'label.teamlead',
                 'multiple' => false,
                 'expanded' => false,
+                // documentation is for NelmioApiDocBundle
+                'documentation' => [
+                    'type' => 'integer',
+                    'description' => 'User ID for the teamlead',
+                ],
             ])
             ->add('users', UserType::class, [
                 'multiple' => true,
-                'expanded' => true,
+                'expanded' => $options['expand_users'],
                 'by_reference' => false,
             ])
         ;
@@ -52,6 +62,7 @@ class TeamEditForm extends AbstractType
             'data_class' => Team::class,
             'csrf_protection' => true,
             'csrf_field_name' => '_token',
+            'expand_users' => true,
             'csrf_token_id' => 'admin_team_edit',
             'attr' => [
                 'data-form-event' => 'kimai.teamUpdate'

src/Form/UserCreateType.php

@@ -9,7 +9,6 @@
 
 namespace App\Form;
 
-use App\Entity\User;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
@@ -43,20 +42,21 @@ class UserCreateType extends UserEditType
 
         parent::buildForm($builder, $options);
 
-        $builder->add('create_more', CheckboxType::class, [
-            'label' => 'label.create_more',
-            'required' => false,
-            'mapped' => false,
-        ]);
+        if ($options['include_add_more'] === true) {
+            $builder->add('create_more', CheckboxType::class, [
+                'label' => 'label.create_more',
+                'required' => false,
+                'mapped' => false,
+            ]);
+        }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
+        parent::configureOptions($resolver);
+
         $resolver->setDefaults([
-            'class' => User::class,
+            'include_add_more' => false,
         ]);
     }
 }

src/Form/UserEditType.php

@@ -11,10 +11,12 @@ namespace App\Form;
 
 use App\Entity\User;
 use App\Form\Type\AvatarType;
+use App\Form\Type\LanguageType;
 use App\Form\Type\YesNoType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -45,6 +47,16 @@ class UserEditType extends AbstractType
             ])
         ;
 
+        if ($options['include_preferences']) {
+            $builder->add('language', LanguageType::class, [
+                'required' => true,
+            ]);
+
+            $builder->add('timezone', TimezoneType::class, [
+                'required' => true,
+            ]);
+        }
+
         if ($options['include_active_flag']) {
             $builder
                 ->add('enabled', YesNoType::class, [
@@ -64,7 +76,8 @@ class UserEditType extends AbstractType
             'csrf_protection' => true,
             'csrf_field_name' => '_token',
             'csrf_token_id' => 'edit_user_profile',
-            'include_active_flag' => false,
+            'include_active_flag' => true,
+            'include_preferences' => true,
         ]);
     }
 }