v1.22.0

app/AppKernel.php

@@ -67,6 +67,7 @@ public function registerBundles()
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new Snc\RedisBundle\SncRedisBundle(),
             new Http\HttplugBundle\HttplugBundle(),
+            new LoginCidadao\SupportBundle\LoginCidadaoSupportBundle(),
 
             // PROCERGS
             new PROCERGS\LoginCidadao\CoreBundle\PROCERGSLoginCidadaoCoreBundle(),

app/Resources/translations/messages.pt_BR.yml

@@ -1,4 +1,6 @@
 password_hint:
     range:
-        with_reqs: Senha de %min% ou mais %reqs%.
-        no_reqs: Senha de %min% ou mais caracteres.
+        with_reqs: "Senha de %min% ou mais %reqs%."
+        no_reqs: "Senha de %min% ou mais caracteres."
+
+support.person.view.connections.nfg.label: "Nota Fiscal Gaúcha"

app/config/config.yml

@@ -6,6 +6,7 @@ imports:
     - { resource: logstash.yml }
     - { resource: "@LoginCidadaoTOSBundle/Resources/config/config.yml" }
     - { resource: 'workflows/*.{yml,yaml}' }
+    - { resource: "@LoginCidadaoSupportBundle/Resources/config/services.yml" }
 
 framework:
     #esi:             ~
@@ -296,6 +297,7 @@ simple_things_entity_audit:
 
         - LoginCidadao\PhoneVerificationBundle\Entity\PhoneVerification
         - LoginCidadao\PhoneVerificationBundle\Entity\SentVerification
+        - LoginCidadao\PhoneVerificationBundle\Entity\BlockedPhoneNumber
 
         - PROCERGS\LoginCidadao\CoreBunde\Entity\PersonMeuRS
         - PROCERGS\LoginCidadao\NfgBunde\Entity\NfgProfile
@@ -605,6 +607,14 @@ services:
     fos_user.doctrine_registry:
         alias: doctrine
 
+    # Extend Third Party Connections in the Support Page
+    PROCERGS\LoginCidadao\CoreBundle\Service\SupportHandlerDecorator:
+        decorates: 'LoginCidadao\SupportBundle\Service\SupportHandler'
+        arguments:
+            - '@PROCERGS\LoginCidadao\CoreBundle\Service\SupportHandlerDecorator.inner'
+            - '@meurs.helper'
+            - '@lc.person.repository'
+
 donato_path_well:
     enabled: '%check_pathwell_topologies%'
 

app/config/routing.yml

@@ -7,6 +7,11 @@ procergs_nfg:
     type:     annotation
     prefix:   /nfg
 
+support:
+    resource: "@LoginCidadaoSupportBundle/Controller/"
+    type:     annotation
+    prefix:   /
+
 # Remote Claims
 lc_remote_claims_remote_claim:
     type:     rest

app/config/security.yml

@@ -36,6 +36,8 @@ security:
             - ROLE_PERSON_EDIT
             - ROLE_VIEW_3RD_PARTY_CONNECTIONS
             - ROLE_EDIT_CLIENT_SUBJECT_TYPE
+            - ROLE_EDIT_BLOCKED_PHONES
+            - ROLE_SUPPORT_MANAGER
             - ROLE_ACCOUNTANT
         ROLE_SUPER_ADMIN:
             - ROLE_ADMIN
@@ -52,6 +54,7 @@ security:
             - ROLE_AUDIT_PROFILE_VIEWS
             - ROLE_VIEW_3RD_PARTY_CONNECTIONS_USERNAMES
             - ROLE_PERSON_BLOCK
+            - ROLE_SKIP_SUPPORT_TOKEN_VALIDATION
 
         ROLE_ALLOWED_TO_SWITCH: FEATURE_IMPERSONATION_REPORTS
         ROLE_EDIT_CLIENT_ALLOWED_RESTRICTED_SCOPES: ROLE_EDIT_CLIENT_ALLOWED_SCOPES
@@ -61,15 +64,33 @@ security:
         ROLE_VIEW_3RD_PARTY_CONNECTIONS:
         ROLE_PERSON_BLOCK:
         ROLE_EDIT_CLIENT_SUBJECT_TYPE:
+        ROLE_EDIT_BLOCKED_PHONES:
+        ROLE_SKIP_SUPPORT_TOKEN_VALIDATION:
         FEATURE_ALPHA:  FEATURE_BETA, FEATURE_SHOW_PROFILE_VIEWS
         FEATURE_BETA:   FEATURE_PROD, FEATURE_ORGANIZATIONS
-        FEATURE_PROD:   FEATURE_2FACTOR_AUTH, FEATURE_INVALIDATE_SESSIONS, FEATURE_REMOTE_CLAIMS
+        FEATURE_PROD:   FEATURE_2FACTOR_AUTH, FEATURE_INVALIDATE_SESSIONS, FEATURE_REMOTE_CLAIMS, FEATURE_PHONE_BLOCKLIST
         FEATURE_IGP_VALIDATION:
         FEATURE_ORGANIZATIONS:
         FEATURE_IMPERSONATION_REPORTS:
         FEATURE_EDIT_USERNAME:
         FEATURE_SHOW_PROFILE_VIEWS:
         FEATURE_REMOTE_CLAIMS:
+        FEATURE_PHONE_BLOCKLIST:
+
+        # Support Roles
+        ROLE_SUPPORT_AGENT:
+            - ROLE_SUPPORT_SEARCH_USERS
+        ROLE_SUPPORT_MANAGER:
+            - ROLE_SUPPORT_AGENT
+            - ROLE_SUPPORT_MANAGE_AGENTS
+            - ROLE_SUPPORT_VIEW_EMAIL
+            - ROLE_SUPPORT_VIEW_PHONE
+            - ROLE_SUPPORT_VIEW_BIRTHDAY
+        ROLE_SUPPORT_MANAGE_AGENTS:
+        ROLE_SUPPORT_SEARCH_USERS:
+        ROLE_SUPPORT_VIEW_EMAIL:
+        ROLE_SUPPORT_VIEW_PHONE:
+        ROLE_SUPPORT_VIEW_BIRTHDAY:
 
     providers:
         chainprovider:
@@ -164,7 +185,7 @@ security:
         - { path: ^/api/v1/address/(cities|states|countries)/search, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
         - { path: ^/api/v1/public/lc_consultaCep2, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
         - { path: ^/api/v1/statistics, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
-        - { path: ^/api/v1/phone-verification/(update-status|average-delivery-time|not-delivered), role: IS_AUTHENTICATED_ANONYMOUSLY, ip: %allowed_monitors%, requires_channel: https }
+        - { path: ^/api/v1/phone-verification/(update-status|average-delivery-time|not-delivered), role: IS_AUTHENTICATED_ANONYMOUSLY, ips: "%allowed_monitors%", requires_channel: https }
         - { path: ^/api/v1/accounting, role: IS_AUTHENTICATED_ANONYMOUSLY, ip: %allowed_accounting%, requires_channel: https }
         - { path: ^/api, roles: [ IS_AUTHENTICATED_FULLY ], requires_channel: https }
 

src/LoginCidadao/APIBundle/Controller/PersonController.php

@@ -145,15 +145,13 @@ public function getLogoutKeyAction($id)
         $em->persist($logoutKey);
         $em->flush();
 
-        $result = [
+        return [
             'key' => $logoutKey->getKey(),
             'url' => $this->generateUrl(
                 'lc_logout_not_remembered_safe',
                 ['key' => $logoutKey->getKey()],
                 UrlGeneratorInterface::ABSOLUTE_URL
             ),
         ];
-
-        return $result;
     }
 }

src/LoginCidadao/APIBundle/Security/Audit/ActionLogger.php

@@ -10,6 +10,7 @@
 
 namespace LoginCidadao\APIBundle\Security\Audit;
 
+use LoginCidadao\CoreBundle\Model\IdentifiablePersonInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -188,14 +189,14 @@ public function registerImpersonate(
 
     /**
      * @param Request $request
-     * @param PersonInterface $person
-     * @param PersonInterface $viewer
+     * @param IdentifiablePersonInterface $person
+     * @param IdentifiablePersonInterface $viewer
      * @param array $controllerAction
      */
     public function registerProfileView(
         Request $request,
-        PersonInterface $person,
-        PersonInterface $viewer,
+        IdentifiablePersonInterface $person,
+        IdentifiablePersonInterface $viewer,
         array $controllerAction
     ) {
         $auditUsername = $this->auditConfig->getCurrentUsername();
@@ -206,8 +207,8 @@ public function registerProfileView(
 
     private function registerActionLog(
         Request $request,
-        PersonInterface $person,
-        PersonInterface $actor,
+        IdentifiablePersonInterface $person,
+        IdentifiablePersonInterface $actor,
         array $controllerAction,
         $auditUsername,
         $actionType

src/LoginCidadao/CoreBundle/Controller/Admin/PersonController.php

@@ -1,11 +1,20 @@
 <?php
+/**
+ * This file is part of the login-cidadao project or it's bundles.
+ *
+ * (c) Guilherme Donato <guilhermednt on github>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace LoginCidadao\CoreBundle\Controller\Admin;
 
 use Doctrine\ORM\NonUniqueResultException;
 use libphonenumber\PhoneNumber;
 use LoginCidadao\APIBundle\Security\Audit\ActionLogger;
 use LoginCidadao\CoreBundle\Entity\PersonRepository;
+use LoginCidadao\CoreBundle\Form\Type\PersonFilterFormType;
 use LoginCidadao\CoreBundle\Form\Type\PersonResumeFormType;
 use LoginCidadao\CoreBundle\Security\User\Manager\UserManager;
 use LoginCidadao\PhoneVerificationBundle\Service\PhoneVerificationServiceInterface;
@@ -39,7 +48,7 @@ public function indexAction(Request $request)
         if ($request->get('search') !== null) {
             $data = ['username' => $request->get('search')];
         }
-        $form = $this->createForm('LoginCidadao\CoreBundle\Form\Type\PersonFilterFormType', $data);
+        $form = $this->createForm(PersonFilterFormType::class, $data);
         $form = $form->createView();
 
         return compact('form');
@@ -114,7 +123,7 @@ public function blockAction(Request $request, $id, $token)
      */
     public function gridAction(Request $request)
     {
-        $form = $this->createForm('LoginCidadao\CoreBundle\Form\Type\PersonFilterFormType');
+        $form = $this->createForm(PersonFilterFormType::class);
         $form->handleRequest($request);
         $gridView = null;
         if ($form->isValid()) {

src/LoginCidadao/CoreBundle/Controller/DefaultController.php

@@ -92,19 +92,20 @@ public function dashboardAction()
         // logs
         $em = $this->getDoctrine()->getManager();
 
+        $showProfileViews = $this->isGranted('FEATURE_SHOW_PROFILE_VIEWS');
         /** @var ActionLogRepository $logRepo */
         $logRepo = $em->getRepository('LoginCidadaoAPIBundle:ActionLog');
         $logs['logins'] = $logRepo->findLoginsByPerson($this->getUser(), 5);
-        $logs['activity'] = $logRepo->getActivityLogsByTarget($this->getUser(), 4);
+        $logs['activity'] = $logRepo->getActivityLogsByTarget($this->getUser(), 4, $showProfileViews);
 
         $defaultClientUid = $this->container->getParameter('oauth_default_client.uid');
 
-        return array(
+        return [
             'allBadges' => $badges,
             'userBadges' => $userBadges,
             'logs' => $logs,
             'defaultClientUid' => $defaultClientUid,
-        );
+        ];
     }
 
     /**
@@ -170,9 +171,10 @@ private function getEmail(SupportMessage $supportMessage, TranslatorInterface $t
     {
         $message = $supportMessage->getFormattedMessage($translator);
 
-        $email = (new SentEmail())
+        $email = new SentEmail();
+        $email
             ->setType('contact-mail')
-            ->setSubject('Fale conosco - '.$supportMessage->getName())
+            ->setSubject('Fale conosco - '.$supportMessage->getName()." - Ticket: {$email->getSupportTicket()}")
             ->setSender($supportMessage->getEmail())
             ->setReceiver($this->container->getParameter('contact_form.email'))
             ->setMessage($message);

src/LoginCidadao/CoreBundle/Controller/TaskController.php

@@ -8,6 +8,7 @@
 use FOS\UserBundle\Util\TokenGenerator;
 use FOS\UserBundle\Event\GetResponseUserEvent;
 use LoginCidadao\CoreBundle\Entity\Person;
+use LoginCidadao\CoreBundle\Form\Type\EmailFormType;
 use LoginCidadao\CoreBundle\Model\ConfirmEmailTask;
 use LoginCidadao\CoreBundle\Model\PersonInterface;
 use LoginCidadao\TaskStackBundle\Model\RouteTaskTarget;
@@ -57,7 +58,7 @@ public function confirmEmailAction(Request $request)
         $event = new GetResponseUserEvent($person, $request);
         $dispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_INITIALIZE, $event);
 
-        $form = $this->createForm('LoginCidadao\CoreBundle\Form\Type\EmailFormType', $person);
+        $form = $this->createForm(EmailFormType::class, $person);
 
         $response = null;
         $form->handleRequest($request);

src/LoginCidadao/CoreBundle/Entity/PersonRepository.php

@@ -18,6 +18,7 @@
 use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
+use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 
 class PersonRepository extends EntityRepository
 {
@@ -222,6 +223,20 @@ public function getNameSearchQuery($name)
             ->setParameter('name', "%{$sanitized}%");
     }
 
+    public function getPhoneSearchQuery(PhoneNumber $phoneNumber)
+    {
+        return $this->getBaseSearchQuery()
+            ->where('p.mobile = :mobile')
+            ->setParameter('mobile', $phoneNumber, PhoneNumberType::NAME);
+    }
+
+    public function getPartialPhoneSearchQuery(string $phoneNumber)
+    {
+        return $this->getBaseSearchQuery()
+            ->where('p.mobile LIKE :mobile')
+            ->setParameter('mobile', "{$phoneNumber}%");
+    }
+
     /**
      * This will return the appropriate query for the input given.
      * @param $query
@@ -249,6 +264,10 @@ public function getSmartSearchQuery($query)
             return $this->getEmailSearchQuery($query);
         }
 
+        if ($query[0] === '+') {
+            return $this->getPartialPhoneSearchQuery($query);
+        }
+
         // Defaults to name search
         return $this->getNameSearchQuery($query);
     }

src/LoginCidadao/CoreBundle/Entity/SentEmail.php

@@ -11,6 +11,7 @@
 namespace LoginCidadao\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Ramsey\Uuid\Uuid;
 
 /**
  * SentEmail
@@ -71,9 +72,21 @@ class SentEmail
      */
     private $type;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="support_ticket", type="string", length=255, unique=true)
+     */
+    private $supportTicket;
+
     public function __construct()
     {
         $this->setDate(new \DateTime());
+        try {
+            $this->supportTicket = Uuid::uuid4();
+        } catch (\Exception $e) {
+            $this->supportTicket = bin2hex(random_bytes(4));
+        }
     }
 
     /**
@@ -224,6 +237,14 @@ public function getType()
         return $this->type;
     }
 
+    /**
+     * @return string
+     */
+    public function getSupportTicket(): string
+    {
+        return $this->supportTicket;
+    }
+
     public function getSwiftMail()
     {
         return (new \Swift_Message($this->getSubject()))