From f3f4b31bb40f3c46c4c5e0d7454cbef56b0e4c3a Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Wed, 14 Dec 2016 02:35:05 +0100
Subject: [PATCH] fix bootstrap

---
 lib/User/Bootstrap.php | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/lib/User/Bootstrap.php b/lib/User/Bootstrap.php
index db455bf..b84e179 100644
--- a/lib/User/Bootstrap.php
+++ b/lib/User/Bootstrap.php
@@ -83,6 +83,8 @@ class Bootstrap implements BootstrapInterface
             $di->set(Service\UserCreateService::class);
             $di->set(Service\UserRegisterService::class);
             $di->set(Service\UserConfirmationService::class);
+            $di->set(Service\AuthItemEditionService::class);
+            $di->set(Service\UpdateAuthAssignmentsService::class);
 
             // email change strategy
             $di->set(Strategy\DefaultEmailChangeStrategy::class);
@@ -111,11 +113,18 @@ class Bootstrap implements BootstrapInterface
             }
             $di->setSingleton(ClassMapHelper::class, ClassMapHelper::class, [$modelClassMap]);
 
-            // search class
-            $di->set(Search\UserSearch::class, [$di->get(Query\UserQuery::class)]);
+            // search classes
+            if (!$di->has(Search\UserSearch::class)) {
+                $di->set(Search\UserSearch::class, [$di->get(Query\UserQuery::class)]);
+            }
+            if (!$di->has(Search\PermissionSearch::class)) {
+                $di->set(Search\PermissionSearch::class);
+            }
+            if (!$di->has(Search\RoleSearch::class)) {
+                $di->set(Search\RoleSearch::class);
+            }
 
             if ($app instanceof WebApplication) {
-
                 // override Yii
                 $di->set(
                     'yii\web\User',
@@ -152,7 +161,7 @@ class Bootstrap implements BootstrapInterface
      *
      * @param Application $app
      */
-    protected function initAuthModule(Application $app)
+    protected function initAuthManager(Application $app)
     {
         if (!($app->getAuthManager() instanceof AuthManagerInterface)) {
             $app->set(
@@ -256,8 +265,13 @@ class Bootstrap implements BootstrapInterface
             'SocialNetworkAccount' => 'Da\User\Model\SocialNetworkAccount',
             'Profile' => 'Da\User\Model\Profile',
             'Token' => 'Da\User\Model\Token',
+            'Assignment' => 'Da\User\Model\Assignment',
+            'Permission' => 'Da\User\Model\Permission',
+            'Role' => 'Da\User\Model\Role',
             // --- search
             'UserSearch' => 'Da\User\Search\UserSearch',
+            'PermissionSearch' => 'Da\User\Search\PermissionSearch',
+            'RoleSearch' => 'Da\User\Search\RoleSearch',
             // --- forms
             'RegistrationForm' => 'Da\User\Form\RegistrationForm',
             'ResendForm' => 'Da\User\Form\ResendForm',
@@ -271,10 +285,15 @@ class Bootstrap implements BootstrapInterface
                 'User',
                 'SocialNetworkAccount',
                 'Profile',
-                'Token'
+                'Token',
+                'Assignment',
+                'Permission',
+                'Role'
             ],
             'Da\User\Search' => [
-                'UserSearch'
+                'UserSearch',
+                'PermissionSearch',
+                'RoleSearch'
             ],
             'Da\UserForm' => [
                 'RegistrationForm',