From 38a3cc4819bf4550cea7ab15c0fb64f91df410e4 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Fri, 14 Mar 2025 16:51:39 -0300
Subject: [PATCH 01/36] =?UTF-8?q?Cria=20componente=20para=20integra=C3=A7?=
 =?UTF-8?q?=C3=A3o=20do=20gov-br=20/=20apenas=20front?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sass/4-components/_c-login-govbr.scss     | 20 ++++++++++
 assets-src/sass/plugin-MultiplLocalAuth.scss  |  1 +
 components/login-govbr/script.js              | 28 ++++++++++++++
 components/login-govbr/template.php           | 38 +++++++++++++++++++
 components/login/template.php                 |  3 ++
 5 files changed, 90 insertions(+)
 create mode 100644 assets-src/sass/4-components/_c-login-govbr.scss
 create mode 100644 components/login-govbr/script.js
 create mode 100644 components/login-govbr/template.php

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
new file mode 100644
index 0000000..71d4d43
--- /dev/null
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -0,0 +1,20 @@
+.login-govbr {
+
+
+    &__content {
+        display: grid;
+        gap: 20px;
+        max-width: 520px;
+    }
+
+    .govbr {
+        background-color: #1351b4;
+        color: #FFFFFF;
+        margin-top: 23px;
+
+        > img {
+            width: 50px;
+            height: 100%;
+        }
+    }
+}
\ No newline at end of file
diff --git a/assets-src/sass/plugin-MultiplLocalAuth.scss b/assets-src/sass/plugin-MultiplLocalAuth.scss
index cfa0541..54c7ac5 100755
--- a/assets-src/sass/plugin-MultiplLocalAuth.scss
+++ b/assets-src/sass/plugin-MultiplLocalAuth.scss
@@ -16,6 +16,7 @@
 /* ----- 4: COMPONENTS ------- */
 @import '4-components/c-change-password';
 @import '4-components/c-create-account';
+@import '4-components/c-login-govbr';
 @import '4-components/c-login';
 
 
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
new file mode 100644
index 0000000..1440d97
--- /dev/null
+++ b/components/login-govbr/script.js
@@ -0,0 +1,28 @@
+app.component('login-govbr', {
+    template: $TEMPLATES['login-govbr'],
+
+    setup() {
+    },
+
+    data() {
+    },
+
+    props: {
+        config: {
+            type: String,
+            required: true
+        }
+    },
+
+    mounted() {
+    },
+
+    computed: {
+        configs() {
+            return JSON.parse(this.config);
+        },
+    },
+
+    methods: {
+    },
+});
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
new file mode 100644
index 0000000..1455239
--- /dev/null
+++ b/components/login-govbr/template.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @var \MapasCulturais\Themes\BaseV2\Theme $this
+ * @var \MapasCulturais\App $app
+ * 
+ */
+
+use MapasCulturais\i;
+?>
+
+<div v-if="configs.strategies.govbr?.visible" class="login-govbr">
+    <mc-modal title="<?= I::esc_attr_e('Boas vindas!') ?>" subtitle="<?= i::esc_attr_e('Entre em sua conta do Mapas Culturais.') ?>" classes="login-govbr__modal">
+        <template #default>
+            <div class="login-govbr__content">
+                <p class="login-govbr__explain">
+                    <?= i::__('O Mapas Culturais está integrado ao') ." <a href='#'>Gov.br</a> ". i::__('porque garante segurança ao seu acesso, respeitando os ') ." <a href='#'>termos de uso</a> ". i::__('e as') ." <a href='#'>políticas de privacidade</a>". i::__('.') ?>
+                </p>
+                    
+                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
+                    <?= i::__('Entrar com') ?>                            
+                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
+                </a>
+
+                <p> <?= i::__('Ao prosseguir você será direcionado ao site') ." <a href='#'>Gov.br</a> ". i::__('para identificação e autenticação digital do cidadão através do seu navegador de internet.') ?></p>
+            </div>
+        </template>
+
+        <template #button="modal">
+            <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" @click="modal.open()">                                
+                <?= i::__('Entrar com') ?>                            
+                <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
+            </a>
+            <span v-else></span>
+        </template>
+    </mc-modal>
+</div>
+
+<!--  -->
\ No newline at end of file
diff --git a/components/login/template.php b/components/login/template.php
index 1ddbe24..3df1343 100644
--- a/components/login/template.php
+++ b/components/login/template.php
@@ -9,6 +9,7 @@
 
 $this->import('
     mc-card
+    login-govbr
     password-strongness
 ');
 ?>
@@ -43,6 +44,8 @@
                     <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" @render="expiredCaptcha" class="g-recaptcha"></VueRecaptcha>
                     
                     <div class="login__buttons">
+                        <login-govbr :config="config"></login-govbr>
+
                         <button class=" button button--primary button--large button--md" type="submit"> <?= i::__('Entrar') ?> </button>
 
                         <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="divider"> 

From bade7df35ff2ec7d7d9fa9afd0903362199a5cc9 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 17 Mar 2025 15:50:28 -0300
Subject: [PATCH 02/36] =?UTF-8?q?Ajustes=20no=20componente=20de=20vincula?=
 =?UTF-8?q?=C3=A7=C3=A3o=20ao=20gov-br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets-src/sass/4-components/_c-login-govbr.scss |  2 --
 components/login-govbr/script.js                 | 12 ------------
 components/login-govbr/template.php              |  4 +---
 components/login/template.php                    |  8 ++++----
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 71d4d43..06a9e00 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -1,6 +1,4 @@
 .login-govbr {
-
-
     &__content {
         display: grid;
         gap: 20px;
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
index 1440d97..d3be01a 100644
--- a/components/login-govbr/script.js
+++ b/components/login-govbr/script.js
@@ -1,12 +1,6 @@
 app.component('login-govbr', {
     template: $TEMPLATES['login-govbr'],
 
-    setup() {
-    },
-
-    data() {
-    },
-
     props: {
         config: {
             type: String,
@@ -14,15 +8,9 @@ app.component('login-govbr', {
         }
     },
 
-    mounted() {
-    },
-
     computed: {
         configs() {
             return JSON.parse(this.config);
         },
     },
-
-    methods: {
-    },
 });
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 1455239..62a7a7d 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -33,6 +33,4 @@
             <span v-else></span>
         </template>
     </mc-modal>
-</div>
-
-<!--  -->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/components/login/template.php b/components/login/template.php
index 3df1343..f619f73 100644
--- a/components/login/template.php
+++ b/components/login/template.php
@@ -44,8 +44,6 @@
                     <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" @render="expiredCaptcha" class="g-recaptcha"></VueRecaptcha>
                     
                     <div class="login__buttons">
-                        <login-govbr :config="config"></login-govbr>
-
                         <button class=" button button--primary button--large button--md" type="submit"> <?= i::__('Entrar') ?> </button>
 
                         <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="divider"> 
@@ -53,10 +51,12 @@
                         </div>
 
                         <div class="login__social-buttons" :class="{'login__social-buttons--multiple': multiple}">
-                            <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
+                            <login-govbr :config="config"></login-govbr>
+                            
+                            <!-- <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
                                 <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
                                 <?= i::__('Entrar com Gov.br') ?>                            
-                            </a>
+                            </a> -->
 
                             <a v-if="configs.strategies.Google?.visible" class="social-login--button button button--icon button--large button--md google" href="<?php echo $app->createUrl('auth', 'google') ?>">                                
                                 <div class="img"> <img height="16" src="<?php $this->asset('img/g.png'); ?>" /> </div>                                

From 735e799014c6fdbe09af446940b10330f4b48278 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 17 Mar 2025 15:51:06 -0300
Subject: [PATCH 03/36] =?UTF-8?q?Cria=C3=A7=C3=A3o=20e=20estiliza=C3=A7?=
 =?UTF-8?q?=C3=A3o=20do=20certificado=20do=20selo=20gov-br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets-src/sass/1-settings/_s-mixins.scss     |  13 ++
 .../sass/3-layouts/_l_govbr-certificate.scss  | 175 ++++++++++++++++++
 assets-src/sass/plugin-MultiplLocalAuth.scss  |   2 +-
 assets/img/certificate/govbr-logo.svg         |  23 +++
 views/seal/certificado-govbr.php              | 109 +++++++++++
 5 files changed, 321 insertions(+), 1 deletion(-)
 create mode 100644 assets-src/sass/1-settings/_s-mixins.scss
 create mode 100644 assets-src/sass/3-layouts/_l_govbr-certificate.scss
 create mode 100644 assets/img/certificate/govbr-logo.svg
 create mode 100644 views/seal/certificado-govbr.php

diff --git a/assets-src/sass/1-settings/_s-mixins.scss b/assets-src/sass/1-settings/_s-mixins.scss
new file mode 100644
index 0000000..d67c737
--- /dev/null
+++ b/assets-src/sass/1-settings/_s-mixins.scss
@@ -0,0 +1,13 @@
+@use 'sass:math';
+
+@function size($value, $unit: 'px') {
+    @if $unit == 'rem' {
+        @return #{$value}rem;
+    }
+    @else if $unit == 'px' {
+        @return #{math.div($value, 16)}rem;
+    }
+    @else {
+        @return #{$value}#{$unit};
+    }
+}
\ No newline at end of file
diff --git a/assets-src/sass/3-layouts/_l_govbr-certificate.scss b/assets-src/sass/3-layouts/_l_govbr-certificate.scss
new file mode 100644
index 0000000..62f4cc4
--- /dev/null
+++ b/assets-src/sass/3-layouts/_l_govbr-certificate.scss
@@ -0,0 +1,175 @@
+@use '../1-settings/s-mixins' as *;
+
+@media print {
+    * {
+        -webkit-print-color-adjust: exact; /* Preserva as cores exatas */
+    }
+
+    @page {
+        size: landscape; 
+        margin: 1cm; 
+    }
+
+    body, html {
+        orientation: landscape;
+        background-color: white;
+        margin: 0;
+        padding: 0;
+    }
+    .main-footer {
+        display: none;
+    }
+    .main-footer__reg {
+        display: none;
+    }
+    .main-footer__content--links {
+        display: none;
+    }
+    .theme-logo__logo--img {
+        display: none;
+    }
+    .main-header {
+        display: none;
+    }
+    .govbr-certificate {
+        margin: 0 !important;
+        max-width: 100% !important;
+        max-height: 100% !important;
+        height: 100vh !important;
+
+        &__footer {
+            justify-content: space-between !important;
+        }
+    }
+    #print {
+        aspect-ratio: 1.414 / 1 !important;
+    }
+}
+
+.govbr-certificate {
+    aspect-ratio: 1.414 / 1;
+    align-content: space-between;
+    background: var(--mc-gray-100);
+    background: linear-gradient(
+                    180deg, 
+                    var(--mc-gray-300) 0%, 
+                    var(--mc-gray-100) 20%, 
+                    var(--mc-white) 100%
+                );
+    padding: size(35);
+    display: grid;
+    gap: size(15);
+    position: relative;
+    overflow: hidden;
+    max-width: size(900);
+    border: var(--mc-border-hairline) var(--mc-gray-300);
+    margin: size(32) auto;
+
+    &__quote {
+        display: grid;
+        gap: 8px;
+        border-left: 2px solid var(--mc-warning-500);
+        padding-left: 16px;
+        padding-bottom: 25px;
+    }
+    
+    &__date {
+        font-size: var(--mc-font-size-xxxs);
+    }
+
+    &__header {
+        display: flex;
+        align-items: center;
+        gap: size(25);
+        justify-items: end;
+        z-index: 1;
+        grid-template-columns: size(195) 1fr;
+        width: 100%;
+        justify-content: space-between;
+    }
+
+
+    &__cadastro {
+        font-size: size(16);
+        text-transform: uppercase;;
+    }
+    
+    &__header-left {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        .iconify {
+            font-size: var(--mc-font-size-xl);
+            color: var(--mc-success-500);
+        }
+    }
+
+    &__header-right {
+        img {
+            max-width: 150px;
+        }
+    }
+
+    &__content {
+        display: grid;
+        z-index: 1;
+        gap: size(20);
+        margin: 0 size(5);
+    }
+
+    &__text {
+        text-align: justify;
+        font-weight: var(--mc-font-regular);
+        font-size: var(--mc-font-size-sm);
+    }
+
+
+    &__footer {
+        display: flex;
+        justify-content: space-between;
+        z-index: 1;
+        padding: size(25) 0 size(0);
+        flex-wrap: wrap;
+        gap: size(10);
+        align-items: flex-end;
+
+        @media (max-width: size(785)) {
+            justify-content: center;
+        }
+    }
+
+    &__profile-link {
+        align-items: flex-end;
+        color: var(--mc-low-700);
+        display: flex;
+        gap: size(15);
+    }
+
+    &__profile-click {
+        align-items: center;
+        background-color: var(--mc-primary-500);
+        color: white;
+        display: flex;
+        height: size(60);
+        justify-content: center;
+        width: size(60);
+
+        .iconify {
+            font-size: size(30);
+        }
+    }
+
+    &__profile-qrcode {
+        display: grid;
+    }
+
+    &__profile-text {
+        font-size: var(--mc-font-size-xxxs);
+        line-height: var(--mc-font-size-xxxs);
+    }
+
+    &__footer-right {
+        width: 200px;
+    }
+}
\ No newline at end of file
diff --git a/assets-src/sass/plugin-MultiplLocalAuth.scss b/assets-src/sass/plugin-MultiplLocalAuth.scss
index 54c7ac5..f3d1b30 100755
--- a/assets-src/sass/plugin-MultiplLocalAuth.scss
+++ b/assets-src/sass/plugin-MultiplLocalAuth.scss
@@ -11,7 +11,7 @@
 
 
 /* ----- 3: LAYOUT ------- */
-
+@import '3-layouts/l_govbr-certificate';
 
 /* ----- 4: COMPONENTS ------- */
 @import '4-components/c-change-password';
diff --git a/assets/img/certificate/govbr-logo.svg b/assets/img/certificate/govbr-logo.svg
new file mode 100644
index 0000000..0cf1f4c
--- /dev/null
+++ b/assets/img/certificate/govbr-logo.svg
@@ -0,0 +1,23 @@
+<svg width="495" height="178" xmlns="http://www.w3.org/2000/svg">
+ <style type="text/css">.st0{fill:#2864AE;}
+	.st1{fill:#48AD45;}
+	.st2{fill:#FABD14;}</style>
+
+ <g>
+  <title>background</title>
+  <rect fill="none" id="canvas_background" height="180" width="497" y="-1" x="-1"/>
+ </g>
+ <g>
+  <title>Layer 1</title>
+  <g id="Grupo_17695">
+   <g id="Grupo_17695-2">
+    <path d="m53.424995,111.720003c11.77,0 21.15,-9.93 21.15,-24.63c0.91,-11.54 -7.7,-21.63 -19.24,-22.55c-0.63,-0.05 -1.27,-0.07 -1.91,-0.06c-12.3,0 -18.74,10.85 -18.74,23.9c-0.01,14.89 8.81,23.34 18.74,23.34zm53.12,14.15c0,39.33 -19.1,52.01 -57.71,52.01c-12.44,0.03 -24.81,-2.01 -36.58,-6.06l1.65,-26.11c9.93,5.37 21.07,8.09 32.36,7.91c19.12,0 29.41,-9 29.41,-27.75l0,-5.16l-0.37,0c-7.2,10.62 -19.35,16.8 -32.17,16.36c-26.29,0 -42.64,-19.84 -42.64,-48.17c0,-28.5 13.41,-49.81 43.19,-49.81c13.58,0.11 26.03,7.57 32.53,19.49l0.38,0l0,-17.26l29.95,0l0,84.54l0,0.01z" class="st0" id="Caminho_4108"/>
+    <path d="m239.934995,136.960003l36.81,0l34.61,-95.17l-32.15,0l-19.52,67.8l-0.36,0l-19.37,-67.8l-34.7,0l34.68,95.17z" class="st1" id="Caminho_4109"/>
+    <path d="m183.754995,89.400003c0,-14.24 -6.21,-26.84 -21.37,-26.84s-21.36,12.6 -21.36,26.84c0,14.06 6.21,26.66 21.36,26.66s21.37,-12.6 21.37,-26.66zm-76.69,0c0,-31.59 23.91,-49.83 55.32,-49.83s55.32,18.26 55.32,49.83c0,31.41 -23.91,49.66 -55.32,49.66s-55.32,-18.25 -55.32,-49.66z" class="st2" id="Caminho_4110"/>
+    <path d="m315.074995,123.510003c0,8.62 -6.99,15.6 -15.61,15.6c-8.62,0 -15.6,-6.99 -15.6,-15.61c0,-8.61 6.98,-15.59 15.6,-15.6c8.61,-0.01 15.6,6.97 15.61,15.58c0,0.01 0,0.02 0,0.03z" class="st0" id="Caminho_4111"/>
+    <path d="m371.014995,64.840003c-12.05,0 -20.09,10.58 -20.09,24.83c0,13.88 9.14,24.3 20.09,24.3c12.42,0 19.91,-10.42 19.91,-25.58c0,-12.59 -7.12,-23.55 -19.91,-23.55zm-52.96,-64.84l33.07,0l0,54.07l0.37,0c7.91,-9.84 20.1,-15.22 32.7,-14.42c26.3,0 40.71,25.01 40.71,48.03c0,28.12 -15.15,51.51 -43.47,51.51c-13.7,0.53 -26.47,-6.96 -32.69,-19.18l-0.37,0l0,17l-30.34,0l0,-137l0.02,0l0,-0.01z" class="st0" id="Caminho_4112"/>
+    <path d="m492.834995,68.130003c-3.64,-0.91 -7.39,-1.28 -11.14,-1.09c-15.34,0 -23.91,11.14 -23.91,29.77l0,40.19l-32.89,0l0,-95.21l29.98,0l0,17.54l0.37,0c4.15,-11.95 15.48,-19.89 28.12,-19.72c3.74,0.06 7.46,0.43 11.14,1.09l-1.67,27.43z" class="st2" id="Caminho_4113"/>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/seal/certificado-govbr.php b/views/seal/certificado-govbr.php
new file mode 100644
index 0000000..6bd47f3
--- /dev/null
+++ b/views/seal/certificado-govbr.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @var MapasCulturais\Entities\SealRelation $relation
+ */
+use MapasCulturais\i;
+
+$this->layout = 'seal-relation';
+
+$user = $relation->owner;
+// eval(\psy\sh());
+// $creationDate = $relation->createTimestamp->format('d/m/Y');
+// $updateDate = $pontao->updateTimestamp->format('d/m/Y');
+
+// $address = "";
+// $pais = $pontao->En_Pais ?: $app->config['app.defaultCountry'];
+// $pais = $pais == 'BR' ? 'Brasil' : $pais;
+
+// if ($pontao->En_Pais && $pontao->En_Municipio && $pontao->En_Estado) {
+//     $address = "
+//         <p>{$pais}</p>
+//         <p>{$pontao->En_Municipio}</p>
+//         <p>{$pontao->En_Estado}</p>
+//     ";
+// } else {
+//     $address = "<p>".i::__('Não se aplica')."</p>";
+// }
+
+// $app->disableAccessControl();
+// $cnpj = trim($pontao->cnpj ?: '');
+// $app->enableAccessControl();
+
+// if (is_string($cnpj) && empty($cnpj)) {
+//     $cnpj = I::__("Não se aplica");
+// }
+
+$this->import(' 
+    mc-icon
+    theme-logo
+');
+
+?>
+<div class="main-app">
+    <div id="print">
+        <div class="govbr-certificate">
+            <div class="govbr-certificate__header">
+                <div class="govbr-certificate__header-left">
+                    <mc-icon name="check"></mc-icon>
+                    <h3><?= i::__('Certificado de Vinculação ao gov.br') ?></h3>
+                </div>
+                <div class="govbr-certificate__header-right">
+                    <img src="<?php $this->asset('img/certificate/govbr-logo.svg'); ?>" />
+                </div>
+            </div>
+
+            <div class="govbr-certificate__content">
+                <p class="govbr-certificate__text">
+                    <b><?= i::__('Olá') . ' ' .$user->name . '!' ?></b>
+
+                    <br><br>
+                    
+                    <?= i::__(' É com grande satisfação que reconhecemos a vinculação da sua conta ao gov.br, a plataforma oficial do Governo Federal. 
+                                Ao obter o Selo gov.br, você demonstrou compromisso com a segurança, praticidade e transparência no acesso aos serviços públicos digitais.');?>
+                </p>
+            </div>
+
+            <div class="govbr-certificate__quote">
+                <p><?= i::__('Parabéns por dar mais um passo em direção à cidadania digital!') ?></p>
+                <q><i><?= i::__('A inovação e a tecnologia estão a serviço de um governo mais próximo do cidadão.') ?></i></q>
+                <br>
+                <p class="govbr-certificate__date">
+                    <b><?= i::__('Data de emissão:') ?></b>
+                    <?= date_format($relation->createTimestamp, "d/m/Y") ?>
+                </p>
+            </div>
+
+            <div class="govbr-certificate__footer">
+                <div class="govbr-certificate__profile-link">
+                    <a href="<?= $app->createUrl('agent', 'single', [$user->id]) ?>" class="govbr-certificate__profile-click hide">
+                        <mc-icon name="cursor-click" />
+                    </a>
+
+                    <div class="govbr-certificate__profile-qrcode">
+                    <vue-qrcode 
+                        value="<?= $app->createUrl('agent', 'single', [$user->id]) ?>" 
+                        :options="{
+                            color: {
+                                dark: '#000000',
+                                light: '#FFFFFF',
+                            },
+                            width: 60, 
+                            margin: 0,
+                        }"
+                        tag="svg">
+                    </vue-qrcode>
+                    </div>
+
+                    <div class="govbr-certificate__profile-text">
+                        <?= i::__('<span class="hide">Clique no botão <br> ou</span> escaneie o QR-Code <br> para ver o perfil completo.') ?>
+                    </div>
+                </div>
+
+                <div class="govbr-certificate__footer-right">
+                    <theme-logo href="<?= $app->createUrl('site', 'index') ?>"></theme-logo>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file

From c747ae75d5ccd5b61247ca236b7ab8f43386c544 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 17 Mar 2025 15:51:44 -0300
Subject: [PATCH 04/36] Exibe certificado do govbr na single do selo

---
 Plugin.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index 9ad2020..0df8013 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -17,9 +17,11 @@ public function _init() {
         
         // register translation text domain
         i::load_textdomain( 'multipleLocal', __DIR__ . "/translations" );
-        
+
+        $app->config['govbr.seal'] = '1';
+
         // Load JS & CSS
-        $app->hook('GET(<<auth|panel>>.<<*>>):before', function() use ($app) {
+        $app->hook('GET(<<auth|panel|seal>>.<<*>>):before', function() use ($app) {
             $app->view->enqueueStyle('app-v2', 'multipleLocal-v2', 'css/plugin-MultiplLocalAuth.css');
         });
 
@@ -42,6 +44,19 @@ public function _init() {
             $labels['changePassword'] = i::__('modificar senha');
         });
 
+        $app->hook("controller(seal).render(sealrelation)", function(&$template, $seal) use ($app) {
+            $govbr_seal = $app->config['govbr.seal'];
+
+            if ($seal['relation']->seal->id == $govbr_seal) {
+                $template = "certificado-govbr";
+            }
+        });
+
+        // Carrega novos ícones 'iconfy' na estrutura default
+        $app->hook('component(mc-icon).iconset', function(&$iconset){
+            $iconset['cursor-click'] = "mynaui:click-solid";
+        });
+
         if (php_sapi_name() == "cli") {
             if (!isset($_SERVER['HTTP_HOST'])) {
                 $_SERVER['HTTP_HOST'] = 'localhost';

From 141740664573ac8c66e2f546a2708abe8222451a Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Tue, 18 Mar 2025 16:34:57 -0300
Subject: [PATCH 05/36] =?UTF-8?q?Ajustes=20na=20modal=20de=20vincula=C3=A7?=
 =?UTF-8?q?=C3=A3o=20do=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets-src/sass/4-components/_c-login-govbr.scss | 1 -
 components/login-govbr/script.js                 | 4 +++-
 components/login-govbr/template.php              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 06a9e00..7db3ef2 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -8,7 +8,6 @@
     .govbr {
         background-color: #1351b4;
         color: #FFFFFF;
-        margin-top: 23px;
 
         > img {
             width: 50px;
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
index d3be01a..5274a0e 100644
--- a/components/login-govbr/script.js
+++ b/components/login-govbr/script.js
@@ -5,7 +5,9 @@ app.component('login-govbr', {
         config: {
             type: String,
             required: true
-        }
+        },
+        small: Boolean,
+        large: Boolean,
     },
 
     computed: {
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 62a7a7d..5986cd8 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -26,7 +26,7 @@
         </template>
 
         <template #button="modal">
-            <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" @click="modal.open()">                                
+            <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="[{'button--sm' : small}, {'button--large': large}]" @click="modal.open()">                                
                 <?= i::__('Entrar com') ?>                            
                 <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
             </a>

From 0e429f3bb4c575f9c0c7614874ee7d21486988b6 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Tue, 18 Mar 2025 16:35:26 -0300
Subject: [PATCH 06/36] =?UTF-8?q?Adi=C3=A7=C3=A3o=20da=20modal=20de=20vinc?=
 =?UTF-8?q?ula=C3=A7=C3=A3o=20na=20tela=20'conta=20e=20privacidade'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php                         |  7 +++++++
 layouts/parts/govbr/govbr-data.php | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 layouts/parts/govbr/govbr-data.php

diff --git a/Plugin.php b/Plugin.php
index 0df8013..78d8eea 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -36,6 +36,13 @@ public function _init() {
             $this->part('password/change-password');
         });
 
+        $app->hook('template(panel.<<my-account|user-detail>>.user-mail):end ', function() use ($app) {
+            /** @var \MapasCulturais\Theme $this */
+            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
+                $this->part('govbr/govbr-data');
+            }
+        });
+
         $app->hook('entity(User).permissionsList,doctrine.emum(permission_action).values', function (&$permissions) {
             $permissions[] = 'changePassword';
         });
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
new file mode 100644
index 0000000..cd6f4aa
--- /dev/null
+++ b/layouts/parts/govbr/govbr-data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @var \MapasCulturais\Themes\BaseV2\Theme $this
+ * @var \MapasCulturais\App $app
+ * 
+ */
+
+use MapasCulturais\i;
+
+$configs = json_encode($app->config['auth.config']);
+
+$this->import('
+    login-govbr
+');
+?>
+
+<div class="user-mail__config">
+    <div class="user-mail__config-title">
+        <?= i::__('Gov.br') ?> :
+    </div>
+    <div class="user-mail__config-content">
+        <!-- TODO: Adicionar verificação se usuário já está vinculado com o gov.br -->
+        <login-govbr config='<?= $configs; ?>' small></login-govbr>
+        <b><mc-icon name="check"></mc-icon> Usuário vinculado ao Gov.br</b>
+    </div>
+</div>
\ No newline at end of file

From 9c67f87a0b40b68142fd749a559a2f646be8cdf9 Mon Sep 17 00:00:00 2001
From: Welington De Lima Olegario <wolegario49@gmail.com>
Date: Wed, 19 Mar 2025 15:38:06 -0300
Subject: [PATCH 07/36] =?UTF-8?q?Renova=20a=20data=20de=20verifica=C3=A7?=
 =?UTF-8?q?=C3=A3o=20sempre=20que=20o=20usu=C3=A1rio=20se=20autentica=20pe?=
 =?UTF-8?q?lo=20Gov.br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index 65d80d3..4e814e9 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -284,6 +284,15 @@ public static function verifyUpdateData($user, $response)
 		$user->profile->save(true);
 		$app->enableAccessControl();
 
+		$seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
+        $sealRelation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $user->profile->id]);
+
+        if ($sealRelation) {
+            $sealRelation->validateDate = new DateTime();
+            $app->em->persist($sealRelation);
+            $app->em->flush();
+        }
+
 		if($allAgents = $app->repo("Agent")->findBy(['userId' => $user->id, '_type' => 1])){
 			
 			if(count($allAgents) == 1){

From 1a5d846a42710b9aa6f0b35fbf1956760bbef5da Mon Sep 17 00:00:00 2001
From: Welington De Lima Olegario <wolegario49@gmail.com>
Date: Wed, 19 Mar 2025 15:41:03 -0300
Subject: [PATCH 08/36] =?UTF-8?q?Renova=20a=20data=20de=20verifica=C3=A7?=
 =?UTF-8?q?=C3=A3o=20sempre=20que=20o=20usu=C3=A1rio=20se=20autentica=20pe?=
 =?UTF-8?q?lo=20Gov.br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php                         |  4 +---
 layouts/parts/govbr/govbr-data.php | 12 +++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index 78d8eea..d5a8ef5 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -18,8 +18,6 @@ public function _init() {
         // register translation text domain
         i::load_textdomain( 'multipleLocal', __DIR__ . "/translations" );
 
-        $app->config['govbr.seal'] = '1';
-
         // Load JS & CSS
         $app->hook('GET(<<auth|panel|seal>>.<<*>>):before', function() use ($app) {
             $app->view->enqueueStyle('app-v2', 'multipleLocal-v2', 'css/plugin-MultiplLocalAuth.css');
@@ -52,7 +50,7 @@ public function _init() {
         });
 
         $app->hook("controller(seal).render(sealrelation)", function(&$template, $seal) use ($app) {
-            $govbr_seal = $app->config['govbr.seal'];
+            $govbr_seal = $app->config['auth.config']['strategies']['govbr']['applySealId'];
 
             if ($seal['relation']->seal->id == $govbr_seal) {
                 $template = "certificado-govbr";
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index cd6f4aa..a20157e 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -8,6 +8,10 @@
 use MapasCulturais\i;
 
 $configs = json_encode($app->config['auth.config']);
+$seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
+$seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $app->user->profile->id]);
+$has_govbr_seal = $seal_relation ? true : false;
+
 
 $this->import('
     login-govbr
@@ -19,8 +23,10 @@
         <?= i::__('Gov.br') ?> :
     </div>
     <div class="user-mail__config-content">
-        <!-- TODO: Adicionar verificação se usuário já está vinculado com o gov.br -->
-        <login-govbr config='<?= $configs; ?>' small></login-govbr>
-        <b><mc-icon name="check"></mc-icon> Usuário vinculado ao Gov.br</b>
+        <?php if ($has_govbr_seal): ?>
+            <login-govbr config='<?= $configs; ?>' small></login-govbr>
+        <?php else: ?>
+            <b><mc-icon name="check"></mc-icon> Usuário vinculado ao Gov.br</b>
+        <?php endif; ?>
     </div>
 </div>
\ No newline at end of file

From 05c6d12f10e780690dd33dcbe1bda0b9560bc1ec Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Thu, 20 Mar 2025 17:10:18 -0300
Subject: [PATCH 09/36] =?UTF-8?q?W.I.P.=20Atualiza=C3=A7=C3=A3o=20do=20com?=
 =?UTF-8?q?ponente=20de=20cadastro=20para=20vicula=C3=A7=C3=A3o=20com=20o?=
 =?UTF-8?q?=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sass/4-components/_c-create-account.scss  | 100 +++++++++++++---
 components/create-account/script.js           |  25 +++-
 components/create-account/template.php        | 111 ++++++++++++++++--
 3 files changed, 204 insertions(+), 32 deletions(-)

diff --git a/assets-src/sass/4-components/_c-create-account.scss b/assets-src/sass/4-components/_c-create-account.scss
index e4765b6..34253a0 100644
--- a/assets-src/sass/4-components/_c-create-account.scss
+++ b/assets-src/sass/4-components/_c-create-account.scss
@@ -1,3 +1,5 @@
+@use '../1-settings/s-mixins' as *;
+
 .mc-breadcrumb {
     li {
         display: flex;
@@ -18,6 +20,10 @@
     margin: 32px auto;
     padding: 0 16px;
 
+    hr {
+        width: 100%;
+    }
+
     .mc-card {
         padding: 24px;
         
@@ -25,6 +31,11 @@
             margin: 80px 0;
         }
     }
+
+    &__button {
+        max-width: size(473);
+        margin: 0 auto;
+    }
     
     &__title {
         margin: 35px 0;
@@ -47,13 +58,51 @@
     }
 
     &__timeline {
-        margin-bottom: 24px;
-        width: 100%;
-        
+        margin-inline: auto;
+        margin-bottom: 31px;
+        width: 80%;
+
         .stepper {
             overflow: hidden;
             margin: 0px -3.7%;
             width: 108%;
+
+            .count {
+                width: 40px;
+                height: 40px;
+            }
+
+            .step {
+                & .label {
+                    width: 40px;
+                    position: relative;
+                    top: -33px;
+                    z-index: 2;
+                    left: 0px;
+                }
+
+                &.active {
+                    & .label {
+                        color: var(--mc-white);
+                    }
+
+                    &:first-child {
+                        .label {
+                            text-align: center;
+                        }
+                    }
+                }
+
+                &::before {
+                    top: size(20);
+                }
+
+                &.passedby {
+                    & .label {
+                        color: var(--mc-white);
+                    }
+                }
+            }
         }
 
         @media (max-width: 560px) {
@@ -75,20 +124,6 @@
     }
 
     &__step {
-        .title {
-            font-weight: 700;
-            font-size: 18px;
-            line-height: 25px;
-            margin: 8px 0 4px;
-
-            .subtitle {
-                font-weight: 400;
-                font-size: 14px;
-                line-height: 19px;
-                margin-top: 16px;
-            }
-        }
-
         .document-label {
             display: flex;
             align-items: center;
@@ -241,6 +276,37 @@
         }
     }
 
+    &__step-title {
+        border-bottom: var(--mc-border-hairline) var(--mc-gray-300);
+        padding-bottom: size(11);
+        display: grid;
+        gap: size(16);
+
+        .subtitle {
+            font-weight: 400;
+            font-size: var(--mc-font-size-xxs);
+        }
+    }
+
+    &__modal {
+        max-width: size(992);
+        margin: 0 auto;
+
+        .modal__content {
+            padding: 0 0 0 size(25);
+            overflow-y: auto;
+            margin-right: size(25);
+        }
+    }
+
+    &__modal-content {
+        padding: 0 size(5);
+    }
+
+    &__term-link {
+        cursor: pointer;
+    }
+
     &__created {
         .title {
             align-items: center;
diff --git a/components/create-account/script.js b/components/create-account/script.js
index bc83102..5bb6aa2 100644
--- a/components/create-account/script.js
+++ b/components/create-account/script.js
@@ -17,7 +17,7 @@ app.component('create-account', {
 
         return {
             actualStep: globalState['stepper'] ?? 0,
-            totalSteps: termsQtd + 2,
+            totalSteps: termsQtd > 0 ? 3 : 2,
             terms,
             passwordRules: {},
             strongness: 0,
@@ -31,6 +31,13 @@ app.component('create-account', {
             recaptchaResponse: '',
             created: false,
             emailSent: false,
+            govbr: {
+                nome: '',
+                nascimento: '',
+                cpf: '',
+                email: '',
+                telefone: '',
+            }
         }
     },
 
@@ -54,7 +61,7 @@ app.component('create-account', {
 
     computed: {
         arraySteps() {
-            let steps = Object.entries(this.terms).length + 2;
+            let steps = this.totalSteps;
             let totalSteps = [];
             for (let i = 0; i < steps; i++) {
                 totalSteps.push(i);
@@ -70,6 +77,14 @@ app.component('create-account', {
             return JSON.parse(this.config);
         },
 
+        isTermsAccepted() {
+            const allTerms = Object.keys(this.terms);
+                
+            return this.slugs.length === allTerms.length &&
+            this.slugs.every((item) => allTerms.includes(item)) &&
+            allTerms.every((item) => this.slugs.includes(item));
+        },
+
         passwordStrongness() {
             if (this.password) {
                 let passwordMustHaveCapitalLetters = /[A-Z]/;
@@ -149,7 +164,7 @@ app.component('create-account', {
         async goToStep(step) {
             const globalState = useGlobalState();
 
-            if (this.actualStep == 0) {
+            if (this.actualStep == 0 && false) {
                 if (await this.validateFields()) {
                     this.actualStep = step;
                     if (step == this.totalSteps - 1) {
@@ -175,7 +190,9 @@ app.component('create-account', {
 
         /* Terms */
         acceptTerm(slug) {
-            this.slugs.push(slug);
+            if (!this.slugs.includes(slug)) {
+                this.slugs.push(slug);
+            }
         },
 
         /* Do register */
diff --git a/components/create-account/template.php b/components/create-account/template.php
index a776a64..3e7d608 100644
--- a/components/create-account/template.php
+++ b/components/create-account/template.php
@@ -28,16 +28,17 @@
     <mc-card v-if="!created" class="no-title">        
         <template #content> 
             <div class="create-account__timeline">
-                <mc-stepper :steps="arraySteps" disable-navigation no-labels></mc-stepper>
+                <mc-stepper :steps="arraySteps" :step="step" disable-navigation></mc-stepper>
             </div>
 
             <!-- First step -->
-            <div v-if="step==0" class="create-account__step grid-12">
+            <!-- <div v-if="step==0" class="create-account__step grid-12">
                 <form class="col-12 grid-12" @submit.prevent="nextStep();">
                     <div class="field col-12">
                         <label for="email"> <?= i::__('E-mail') ?> </label>
                         <input type="text" name="email" id="email" v-model="email" />
                     </div>
+                    
                     <div class="field col-12">
                         <label class="document-label" for="cpf"> 
                             <?= i::__('CPF') ?> 
@@ -52,11 +53,13 @@
                         </label>
                         <input type="text" name="cpf" id="cpf" v-model="cpf" v-maska data-maska="###.###.###-##" maxlength="14" /> 
                     </div>
+
                     <div class="field col-12 password">
                         <label for="pwd"> <?= i::__('Senha'); ?> </label>
                         <input autocomplete="off" id="pwd" type="password" name="password" v-model="password" />
                         <div class="seePassword" @click="togglePassword('pwd', $event)"></div>
                     </div>
+
                     <div class="field col-12 password">
                         <label for="pwd-check">
                             <?= i::__('Confirme sua senha'); ?>
@@ -64,9 +67,11 @@
                         <input autocomplete="off" id="pwd-check" type="password" name="confirm_password" v-model="confirmPassword" />
                         <div class="seePassword" @click="togglePassword('pwd-check', $event)"></div>
                     </div>
+
                     <div class="col-12">
                         <password-strongness :password="password"></password-strongness>
                     </div>
+
                     <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" class="g-recaptcha col-12"></VueRecaptcha>
                     <button class="col-12 button button--primary button--large button--md" type="submit"> <?= i::__('Continuar') ?> </button>
                 </form>
@@ -83,23 +88,107 @@
                         <?= i::__('Entrar com Google') ?>
                     </a>
                 </div>
+            </div> -->
+
+            <div v-if="step==0" class="create-account__step grid-12">
+                <label class="create-account__step-title col-12">
+                    <div class="title col-12">
+                        <h4 class="bold"> <?= i::__('Revise seus dados') ?> </h4>
+                    </div>
+                    <div class="subtitle col-12">
+                        <span> 
+                            <?= i::__('Seu cadastro foi criado. Agora é necessário criar seu Perfil de Agente Cultural na plataforma, confirme se os seus dados estão corretos para seguir. Esses dados não serão divulgados.') ?> 
+                        </span>
+                    </div>
+                </label>
+
+                <form class="col-12 grid-12" @submit.prevent="nextStep();">
+                    <div class="field col-12">
+                        <label for="nomeCompleto"> <?= i::__('Nome completo') ?> </label>
+                        <input type="text" name="nomeCompleto" id="nomeCompleto" v-model="govbr.nome" disabled />
+                    </div>
+                    
+                    <div class="field col-12">
+                        <label for="dataNascimento"> <?= i::__('Data de nasciento') ?> </label>
+                        <input type="text" name="dataNascimento" id="dataNascimento" v-model="govbr.nascimento" disabled />
+                    </div>
+
+                    <div class="field col-12">
+                        <label for="cpf"> <?= i::__('CPF') ?> </label>
+                        <input type="text" name="cpf" id="cpf" v-model="govbr.cpf" v-maska data-maska="###.###.###-##" maxlength="14"  disabled/> 
+                    </div>
+                    
+                    <div class="field col-12">
+                        <label for="email"> <?= i::__('E-mail') ?> </label>
+                        <input type="text" name="email" id="email" v-model="govbr.email" disabled />
+                    </div>
+
+                    <div class="field col-12">
+                        <label for="telefone"> <?= i::__('Telefone') ?> </label>
+                        <input type="text" name="telefone" id="telefone" v-model="govbr.telefone" disabled />
+                    </div>
+
+                    <div class="col-12">&nbsp;</div>
+
+                    <button class="col-12 create-account__button button button--primary button--large button--md" type="submit"> <?= i::__('Continuar') ?> </button>
+
+                    <small class="col-12"> 
+                        <?= i::__('*Caso seus dados estejam incorretos, será necessário alterá-los em sua conta Gov.br.') ?>
+                        <br>
+                        <a href="#"><?= i::__('Saiba mais.') ?></a>
+                    </small>
+                </form>
             </div>
 
             <!-- Terms steps -->
-            <div v-show="step==index+1" v-for="(value, name, index) in terms" class="create-account__step grid-12">
-                <label class="title col-12"> {{value.title}} </label>
-                <div class="term col-12" v-html="value.text" :id="'term'+index" ref="terms"></div>
-                <div class="divider col-12"></div>                
-                <button class="col-12 button button--primary button--large button--md" :id="'acceptTerm'+index" @click="nextStep(); acceptTerm(name)"> {{value.buttonText}} </button>
-                <button class="col-12 button button--text" @click="cancel()"> <?= i::__('Voltar e excluir minhas informações') ?> </button>
+            <div v-show="step==1" class="create-account__step grid-12">
+                <label class="create-account__step-title col-12 grid-12">
+                    <div class="title col-12">
+                        <h4 class="bold"> <?= i::__('Aceite de políticas') ?> </h4>
+                    </div>
+                    <div class="subtitle col-12">
+                        <span> 
+                            <?= i::__('Para criar o seu perfil é necessário ler e aceitar os termos, políticas e autorizações para utilização da plataforma, que serão encaminhados a você por e-mail. Ao aceitar, você estará concordando com todos.') ?> 
+                        </span>
+                    </div>
+                </label>
+
+                <div v-for="(value, name, index) in terms" class="col-12">
+                    <mc-modal classes="create-account__modal" :title="value.title">
+                        <template #default="modal">
+                            <div class="create-account__modal-content grid-12">
+                                <div class="term col-12" v-html="value.text" :id="'term'+index" ref="terms"></div>
+                                <div class="divider col-12"></div>                
+                                <button class="col-12 button button--primary button--large button--md" :id="'acceptTerm'+index" @click="modal.close(); acceptTerm(name)"> {{value.buttonText}} </button>
+                                <button class="col-12 button button--text" @click="modal.close(); cancel()"> <?= i::__('Voltar e excluir minhas informações') ?> </button>
+                            </div>
+                        </template>
+
+                        <template #button="modal">
+                            <a class="create-account__term-link" @click="modal.open()"> <mc-icon v-if="slugs.includes(name)" name="check"></mc-icon> {{value.title}}</a>
+                        </template>
+                    </mc-modal>
+                </div>
+
+                <div class="col-12"></div>
+                <button class="col-12 create-account__button button button--primary button--large button--md" :class="[{'disabled': !isTermsAccepted}]" :disabled="!isTermsAccepted" type="button" @click="nextStep()"> <?= i::__('Aceitar') ?> </button>
+                <button class="col-12 create-account__button button button--text button--large button--md" type="button" @click="previousStep()"> <?= i::__('Voltar') ?> </button>
             </div>
 
             <!-- Last step -->
             <div v-if="step==totalSteps-1" class="create-account__step grid-12">
-                <label class="title col-12">
+                <label class="create-account__step-title col-12">
+                    <div class="title col-12">
+                        <h4 class="bold"> <?= i::__('Criação do Perfil') ?> </h4>
+                    </div>
                     <div class="subtitle col-12">
-                        <span> <?= i::__('Falta pouco para finalizar o seu cadastro!') ?> </span>
-                        <span> <?= i::__('Dê um nome e faça uma breve descrição sua.') ?> </span>
+                        <span> 
+                            <?= i::__(' Para finalizar o seu cadastro, é necessário criar seu Perfil de Agente Cultural. 
+                                        Um Agente Cultural é qualquer pessoa que tenha envolvimento com a área da cultura. 
+                                        Este perfil será público e integrará o Mapa da Cultura brasileira, onde será possível acessar informações e projetos culturais relacionados.
+                                        Dê um nome, faça uma breve descrição sobre sua relação com a cultura e selecione suas principais áreas de atuação, para completar o seu cadastro. 
+                                        Será possível editar as informações posteriormente.') ?> 
+                        </span>
                     </div>
                 </label>
                 

From d424e9ab97ce98a346e074a8fb4346e78b42a7c8 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 25 Mar 2025 16:04:01 -0300
Subject: [PATCH 10/36] =?UTF-8?q?Inverte=20ordem=20de=20exibi=C3=A7=C3=A3o?=
 =?UTF-8?q?=20do=20bot=C3=A3o=20de=20vincula=C3=A7=C3=A3o=20do=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/parts/govbr/govbr-data.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index a20157e..39afd20 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -24,9 +24,9 @@
     </div>
     <div class="user-mail__config-content">
         <?php if ($has_govbr_seal): ?>
-            <login-govbr config='<?= $configs; ?>' small></login-govbr>
-        <?php else: ?>
             <b><mc-icon name="check"></mc-icon> Usuário vinculado ao Gov.br</b>
+        <?php else: ?>
+            <login-govbr config='<?= $configs; ?>' small></login-govbr>
         <?php endif; ?>
     </div>
 </div>
\ No newline at end of file

From f906312a062a49d0921dbf96c424a682b6fff9c3 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 25 Mar 2025 16:15:30 -0300
Subject: [PATCH 11/36] =?UTF-8?q?Adiciona=20valida=C3=A7=C3=B5es=20de=20er?=
 =?UTF-8?q?ros=20relacionados=20aos=20cpfs=20duplicados=20e=20diferentes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php             | 42 +++++++++++++++++++++++++++++
 Provider.php                        | 28 +++++++++++++++++--
 components/login-govbr/template.php | 37 +++++++++++++++++++++++--
 3 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index 4e814e9..f71473b 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -319,4 +319,46 @@ public static function  mask($val, $mask) {
         }
         return $maskared;
     }
+
+	public static function validateErrors($response, $user)
+  	{
+		$app = App::i();
+		$errors = [];
+
+		if($agents_meta = self::getAgentsByDocumento($response)) {
+			if(count($agents_meta) > 1) {
+				$errors['cpf-duplicado'] = 'cpf-duplicado';
+				return $errors;
+			}
+		}
+		
+		if($agents_meta = self::getUsersByEmail($response)) {
+			if(count($agents_meta) > 1) {
+				$errors['email-duplicado'] = 'email-duplicado';
+			}
+		}
+
+		$metadataFieldCpf = $app->config['auth.config']['metadataFieldCPF']; 
+		if($agents_meta[0]->owner->user->profile->{$metadataFieldCpf} !== $user->profile->{$metadataFieldCpf}){
+			$errors['cpf-diferente'] = 'cpf-diferente';
+		}
+
+		return $errors;
+  	}
+
+  	public static function getAgentsByDocumento($response)
+	{
+		$app = App::i();
+		$metadataFieldCpf = $app->config['auth.config']['metadataFieldCPF']; 
+		$cpf = self::mask($response['auth']['raw']['cpf'],'###.###.###-##');
+		return $cpf ? $app->repo('AgentMeta')->findBy(["key" => $metadataFieldCpf, "value" => $cpf]) : [];
+
+	}
+
+	public static function getUsersByEmail($response)
+    {
+        $app = App::i();
+        $email = $response['auth']['info']['email'];
+        return $email ? $app->repo('User')->findBy(['email' => $email]) : [];
+    }
 }
diff --git a/Provider.php b/Provider.php
index e668e95..54e6144 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1296,8 +1296,10 @@ protected function _validateResponse(){
 
         $valid = false;
         // o usuário ainda não tentou se autenticar
-        if(!is_array($response))
+        if(!is_array($response)) {
             return false;
+        }
+
         // verifica se a resposta é um erro
         if (array_key_exists('error', $response)) {
 
@@ -1372,11 +1374,33 @@ public function _getAuthenticatedUser() {
      * @return boolean true if the response is valid or false if the response is not valid
      */
     public function processResponse(){
+        $app = App::i();
+        
         // se autenticou
         if($this->_validateResponse()){
             // e ainda não existe um usuário no sistema
             $user = $this->_getAuthenticatedUser();
             $response = $this->_getResponse();
+
+            if($response && $provider_class = $response['auth']['provider']."Strategy"){
+                if(method_exists($provider_class, "validateErrors")){
+                    if($errors = $provider_class::validateErrors($response, $user)){
+                        $_SESSION['strategy-error'] = $errors;
+
+                        if(in_array('cpf-diferente', array_keys($errors))) {
+                            header('Location: '. $app->createUrl('panel', 'my-account'));
+                            exit;
+                        } else {
+                            session_unset();
+                            $_SESSION['strategy-error'] = $errors;
+                            http_response_code(302);
+                            header('Location: '.$app->createUrl('auth', 'index'));
+                            exit;
+                        }
+                    }
+                }
+            }
+
             if(!$user){
                 $user = $this->createUser($response);
 
@@ -1438,7 +1462,7 @@ protected function _createUser($response) {
         $config = $this->_config;
 
         $user = null;
-        if($provider_class = $response['auth']['provider']."Strategy"){
+        if($response && $provider_class = $response['auth']['provider']."Strategy"){
             if(method_exists($provider_class, "newAccountCheck")){
                 if($user = $provider_class::newAccountCheck($response)){
                     $agent = $user->profile;
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 5986cd8..410cedb 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -6,10 +6,32 @@
  */
 
 use MapasCulturais\i;
+
+$cpf_duplicado = false;
+$cpf_diferente = false;
+
+if(isset($_SESSION['strategy-error'])) {
+    foreach($_SESSION['strategy-error'] as $key => $value) {
+        if('cpf-duplicado' == ($key ?? false)) {
+            $cpf_duplicado = true;
+            unset($_SESSION['strategy-error'][$key]);
+        }
+        
+        if('cpf-diferente' == ($key ?? false)) {
+            $cpf_diferente = true;
+            unset($_SESSION['strategy-error'][$key]);
+        }
+    }
+}
+
+$this->import('
+    mc-alert
+');
+
 ?>
 
 <div v-if="configs.strategies.govbr?.visible" class="login-govbr">
-    <mc-modal title="<?= I::esc_attr_e('Boas vindas!') ?>" subtitle="<?= i::esc_attr_e('Entre em sua conta do Mapas Culturais.') ?>" classes="login-govbr__modal">
+    <mc-modal title="<?= i::esc_attr_e('Boas vindas!') ?>" subtitle="<?= i::esc_attr_e('Entre em sua conta do Mapas Culturais.') ?>" classes="login-govbr__modal">
         <template #default>
             <div class="login-govbr__content">
                 <p class="login-govbr__explain">
@@ -30,7 +52,18 @@
                 <?= i::__('Entrar com') ?>                            
                 <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
             </a>
-            <span v-else></span>
+
+            <?php if($cpf_duplicado): ?>
+                <mc-alert class="col-12" type="warning">
+                    <?= i::__('Ops! seu CPF está duplicado na plataforma. Por favor, entre em contato com o suporte.') ?>
+                </mc-alert>
+            <?php endif; ?>
+
+            <?php if($cpf_diferente): ?>
+                <mc-alert class="col-12" type="warning">
+                    <?= i::__('Ops! seu CPF está diferente na plataforma. Por favor, entre em contato com o suporte.') ?>
+                </mc-alert>
+            <?php endif; ?>
         </template>
     </mc-modal>
 </div>
\ No newline at end of file

From 9b8960a5e8864ffafa379abdfde7bbfdc85a069c Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 25 Mar 2025 16:27:29 -0300
Subject: [PATCH 12/36] =?UTF-8?q?Ajusta=20visualiza=C3=A7=C3=A3o=20do=20al?=
 =?UTF-8?q?ert=20na=20p=C3=A1gina=20de=20Conta=20e=20Privacidade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/login-govbr/template.php | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 410cedb..64c258d 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -48,22 +48,26 @@
         </template>
 
         <template #button="modal">
-            <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="[{'button--sm' : small}, {'button--large': large}]" @click="modal.open()">                                
-                <?= i::__('Entrar com') ?>                            
-                <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
-            </a>
-
-            <?php if($cpf_duplicado): ?>
-                <mc-alert class="col-12" type="warning">
-                    <?= i::__('Ops! seu CPF está duplicado na plataforma. Por favor, entre em contato com o suporte.') ?>
-                </mc-alert>
-            <?php endif; ?>
+            <div>
+                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="[{'button--sm' : small}, {'button--large': large}]" @click="modal.open()">                                
+                    <?= i::__('Entrar com') ?>                            
+                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
+                </a>
+            </div>
 
-            <?php if($cpf_diferente): ?>
-                <mc-alert class="col-12" type="warning">
-                    <?= i::__('Ops! seu CPF está diferente na plataforma. Por favor, entre em contato com o suporte.') ?>
-                </mc-alert>
-            <?php endif; ?>
+            <div>
+                <?php if($cpf_duplicado): ?>
+                    <mc-alert class="col-12" type="warning">
+                        <?= i::__('Ops! seu CPF está duplicado na plataforma. Por favor, entre em contato com o suporte.') ?>
+                    </mc-alert>
+                <?php endif; ?>
+    
+                <?php if($cpf_diferente): ?>
+                    <mc-alert class="col-12" type="warning">
+                        <?= i::__('Ops! seu CPF está diferente na plataforma. Por favor, entre em contato com o suporte.') ?>
+                    </mc-alert>
+                <?php endif; ?>
+            </div>
         </template>
     </mc-modal>
 </div>
\ No newline at end of file

From 272c221e675eba8dbc6990d11516d6a0919c268d Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 25 Mar 2025 17:24:17 -0300
Subject: [PATCH 13/36] =?UTF-8?q?Corrige=20valida=C3=A7=C3=A3o=20para=20cp?=
 =?UTF-8?q?f=20diferente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index f71473b..b5fe7b0 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -339,10 +339,10 @@ public static function validateErrors($response, $user)
 		}
 
 		$metadataFieldCpf = $app->config['auth.config']['metadataFieldCPF']; 
-		if($agents_meta[0]->owner->user->profile->{$metadataFieldCpf} !== $user->profile->{$metadataFieldCpf}){
+		if($agents_meta[0]->profile->{$metadataFieldCpf} != $user->profile->{$metadataFieldCpf}){
 			$errors['cpf-diferente'] = 'cpf-diferente';
 		}
-
+		
 		return $errors;
   	}
 

From 557bcbe20196584b28cc46c9e040d22e013c9e86 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 25 Mar 2025 17:28:53 -0300
Subject: [PATCH 14/36] =?UTF-8?q?Comenta=20partes=20do=20c=C3=B3digo=20que?=
 =?UTF-8?q?=20est=C3=A3o=20causando=20erro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Provider.php | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/Provider.php b/Provider.php
index 54e6144..b2f17a2 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1300,26 +1300,28 @@ protected function _validateResponse(){
             return false;
         }
 
-        // verifica se a resposta é um erro
-        if (array_key_exists('error', $response)) {
+        return true;
 
-            $app->flash('auth error', 'Opauth returns error auth response');
-        } else {
-            /**
-            * Auth response validation
-            *
-            * To validate that the auth response received is unaltered, especially auth response that
-            * is sent through GET or POST.
-            */
-            if (empty($response['auth']) || empty($response['timestamp']) || empty($response['signature']) || empty($response['auth']['provider']) || empty($response['auth']['uid'])) {
-                $app->flash('auth error', 'Invalid auth response: Missing key auth response components.');
-            } elseif (!$this->opauth->validate(sha1(print_r($response['auth'], true)), $response['timestamp'], $response['signature'], $reason)) {
-                $app->flash('auth error', "Invalid auth response: {$reason}");
-            } else {
-                $valid = true;
-            }
-        }
-        return $valid;
+        // verifica se a resposta é um erro
+        // if (array_key_exists('error', $response)) {
+
+        //     $app->flash('auth error', 'Opauth returns error auth response');
+        // } else {
+        //     /**
+        //     * Auth response validation
+        //     *
+        //     * To validate that the auth response received is unaltered, especially auth response that
+        //     * is sent through GET or POST.
+        //     */
+        //     if (empty($response['auth']) || empty($response['timestamp']) || empty($response['signature']) || empty($response['auth']['provider']) || empty($response['auth']['uid'])) {
+        //         $app->flash('auth error', 'Invalid auth response: Missing key auth response components.');
+        //     } elseif (!$this->opauth->validate(sha1(print_r($response['auth'], true)), $response['timestamp'], $response['signature'], $reason)) {
+        //         $app->flash('auth error', "Invalid auth response: {$reason}");
+        //     } else {
+        //         $valid = true;
+        //     }
+        // }
+        // return $valid;
     }
 
     public function getMetadataFieldCpfFromConfig() {
@@ -1346,8 +1348,8 @@ public function _getAuthenticatedUser() {
             $app = App::i();
             $response = $this->_getResponse();
 
-            $auth_uid = $response['auth']['uid'];
-            $auth_provider = $app->getRegisteredAuthProviderId($response['auth']['provider']);
+            // $auth_uid = $response['auth']['uid'];
+            // $auth_provider = $app->getRegisteredAuthProviderId($response['auth']['provider']);
 
             $cpf = (isset($response['auth']['raw']['cpf'])) ? $this->mask($response['auth']['raw']['cpf'],'###.###.###-##') : null;
             if (!empty($cpf)) {        

From bd3d5e45bb788a101314e91fe62f643507f37927 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Wed, 26 Mar 2025 11:15:46 -0300
Subject: [PATCH 15/36] =?UTF-8?q?Retira=20return=20errors=20e=20corrige=20?=
 =?UTF-8?q?a=20renova=C3=A7=C3=A3o=20da=20data=20de=20verifica=C3=A7=C3=A3?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index b5fe7b0..f96633c 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -288,7 +288,7 @@ public static function verifyUpdateData($user, $response)
         $sealRelation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $user->profile->id]);
 
         if ($sealRelation) {
-            $sealRelation->validateDate = new DateTime();
+            $sealRelation->createTimestamp = new DateTime();
             $app->em->persist($sealRelation);
             $app->em->flush();
         }
@@ -328,7 +328,6 @@ public static function validateErrors($response, $user)
 		if($agents_meta = self::getAgentsByDocumento($response)) {
 			if(count($agents_meta) > 1) {
 				$errors['cpf-duplicado'] = 'cpf-duplicado';
-				return $errors;
 			}
 		}
 		

From ffd6caed9cd8d29b9992cc92c2a5a2173bf45a43 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Wed, 26 Mar 2025 12:09:24 -0300
Subject: [PATCH 16/36] =?UTF-8?q?Adiciona=20na=20single=20e=20na=20edi?=
 =?UTF-8?q?=C3=A7=C3=A3o=20de=20agente=20individual,=20o=20bot=C3=A3o=20de?=
 =?UTF-8?q?=20vincular=20com=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Plugin.php b/Plugin.php
index d5a8ef5..f9903ea 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -41,6 +41,20 @@ public function _init() {
             }
         });
 
+        $app->hook('template(agent.single.single1-entity-info-mc-share-links):before', function() use ($app) {
+            /** @var \MapasCulturais\Theme $this */
+            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
+                $this->part('govbr/govbr-data');
+            }
+        });
+        
+        $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app) {
+            /** @var \MapasCulturais\Theme $this */
+            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
+                $this->part('govbr/govbr-data');
+            }
+        });
+
         $app->hook('entity(User).permissionsList,doctrine.emum(permission_action).values', function (&$permissions) {
             $permissions[] = 'changePassword';
         });

From d7a0911314506a12f2c5d97dbce45ab9461e5d8d Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Thu, 27 Mar 2025 11:10:38 -0300
Subject: [PATCH 17/36] =?UTF-8?q?Ajusta=20redirecionamentos=20ap=C3=B3s=20?=
 =?UTF-8?q?erro=20ao=20se=20logar=20com=20o=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php             |  3 +++
 Provider.php                        | 15 +++++++++++----
 components/login-govbr/script.js    | 14 ++++++++++++++
 components/login-govbr/template.php | 28 +++++++++++++++++++++-------
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index f96633c..095d78d 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -300,6 +300,9 @@ public static function verifyUpdateData($user, $response)
 				$_agent->setAsUserProfile();
 			}
 		}
+
+		setcookie('errorRedirectLocation', '', time() - 3600, '/');
+		unset($_COOKIE['errorRedirectLocation']);
 		
 		self::getFile($user->profile, $userinfo->picture, $userinfo->access_token);
 	}
diff --git a/Provider.php b/Provider.php
index b2f17a2..f4840a5 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1364,7 +1364,9 @@ public function _getAuthenticatedUser() {
             if (empty($user)) {
                 $email = $response['auth']['info']['email'];
                 $user = $app->repo('User')->findOneBy(['email' => $email]);
-            }            
+            }
+            
+            $this->authenticateUser($user);
 
             return $user;
         }else{
@@ -1388,15 +1390,20 @@ public function processResponse(){
                 if(method_exists($provider_class, "validateErrors")){
                     if($errors = $provider_class::validateErrors($response, $user)){
                         $_SESSION['strategy-error'] = $errors;
+                        
+                        $cookie = json_decode($_COOKIE['errorRedirectLocation'], true);
+                        setcookie('errorRedirectLocation', '', time() - 3600, '/');
+                        unset($_COOKIE['errorRedirectLocation']);
 
-                        if(in_array('cpf-diferente', array_keys($errors))) {
-                            header('Location: '. $app->createUrl('panel', 'my-account'));
+                        if($cookie['isAuth']) {
+                            header('Location: '. $app->createUrl($cookie['controller'], $cookie['action']));
                             exit;
                         } else {
                             session_unset();
                             $_SESSION['strategy-error'] = $errors;
+                            $_SESSION['strategy-error-cpf'] = $user->profile->cpf;
                             http_response_code(302);
-                            header('Location: '.$app->createUrl('auth', 'index'));
+                            header('Location: '.$app->createUrl($cookie['controller'],  $cookie['action']));
                             exit;
                         }
                     }
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
index 5274a0e..fa18155 100644
--- a/components/login-govbr/script.js
+++ b/components/login-govbr/script.js
@@ -15,4 +15,18 @@ app.component('login-govbr', {
             return JSON.parse(this.config);
         },
     },
+
+    methods: {
+        setCookie(params) {
+            Utils.cookies.set('errorRedirectLocation', JSON.stringify(params), {path: '/'});
+        },
+        
+        govBrClick(event) {
+            const params = JSON.parse(event.currentTarget.getAttribute('data-params'));
+            
+            this.setCookie(params);
+
+            window.location.href = event.currentTarget.getAttribute('href');
+        }
+    }
 });
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 64c258d..2466482 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -9,21 +9,36 @@
 
 $cpf_duplicado = false;
 $cpf_diferente = false;
+$message_error = '';
 
 if(isset($_SESSION['strategy-error'])) {
     foreach($_SESSION['strategy-error'] as $key => $value) {
         if('cpf-duplicado' == ($key ?? false)) {
             $cpf_duplicado = true;
+            $user_cpf = $_SESSION['strategy-error-cpf'];
+
+            $message_error = sprintf(i::__('Encontramos duas contas cadastradas com este CPF %s. Para solucionar este problema entre em contato com o suporte pelo email XXXX'), $user_cpf);
+
+            unset($_SESSION['strategy-error-cpf']);
             unset($_SESSION['strategy-error'][$key]);
         }
         
         if('cpf-diferente' == ($key ?? false)) {
             $cpf_diferente = true;
+
+            $message_error = i::__('Sua conta do <a href="https://gov.br">Gov.br</a> vinculada apresenta um número de CPF diferente do cadastrado aqui. Verifique as contas para garantir que sejam do mesmo usuário');
+
             unset($_SESSION['strategy-error'][$key]);
         }
     }
 }
 
+$params = [
+    'isAuth' => $app->user->is('guest') ? false : true,
+    'action' => $this->controller->action,
+    'controller' => $this->controller->id
+];
+
 $this->import('
     mc-alert
 ');
@@ -38,7 +53,7 @@
                     <?= i::__('O Mapas Culturais está integrado ao') ." <a href='#'>Gov.br</a> ". i::__('porque garante segurança ao seu acesso, respeitando os ') ." <a href='#'>termos de uso</a> ". i::__('e as') ." <a href='#'>políticas de privacidade</a>". i::__('.') ?>
                 </p>
                     
-                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
+                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>" data-params='<?= json_encode($params) ?>' @click.prevent="govBrClick($event)">                                 
                     <?= i::__('Entrar com') ?>                            
                     <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
                 </a>
@@ -56,15 +71,14 @@
             </div>
 
             <div>
-                <?php if($cpf_duplicado): ?>
+                <?php if($cpf_diferente): ?>
                     <mc-alert class="col-12" type="warning">
-                        <?= i::__('Ops! seu CPF está duplicado na plataforma. Por favor, entre em contato com o suporte.') ?>
+                        <?= $message_error ?>
                     </mc-alert>
-                <?php endif; ?>
-    
-                <?php if($cpf_diferente): ?>
+                
+                <?php elseif($cpf_duplicado): ?>
                     <mc-alert class="col-12" type="warning">
-                        <?= i::__('Ops! seu CPF está diferente na plataforma. Por favor, entre em contato com o suporte.') ?>
+                        <?= $message_error ?>
                     </mc-alert>
                 <?php endif; ?>
             </div>

From b1e1eca00294ec7d301f779123d2fa83cbd8949a Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Fri, 28 Mar 2025 09:52:45 -0300
Subject: [PATCH 18/36] =?UTF-8?q?Adiciona=20na=20configura=C3=A7=C3=A3o=20?=
 =?UTF-8?q?e=20na=20mensagem=20de=20erro=20o=20e-mail=20de=20suporte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Provider.php                        | 3 ++-
 components/login-govbr/template.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Provider.php b/Provider.php
index f4840a5..8174ee1 100644
--- a/Provider.php
+++ b/Provider.php
@@ -110,7 +110,8 @@ function __construct ($config) {
                     'state_salt' => env('AUTH_GOV_BR_STATE_SALT', null),
                     'applySealId' => env('AUTH_GOV_BR_APPLY_SEAL_ID', null),
                     'menssagem_authenticated' => env('AUTH_GOV_BR_MENSSAGEM_AUTHENTICATED','Usuário já se autenticou pelo GovBr'),
-                    'dic_agent_fields_update' => env('AUTH_GOV_BR_DICT_AGENT_FIELDS_UPDATE','[]')
+                    'dic_agent_fields_update' => env('AUTH_GOV_BR_DICT_AGENT_FIELDS_UPDATE','[]'),
+                    'supportEmail' => env('AUTH_GOV_BR_SUPPORT_EMAIL', false)
                 ]
             ]
         ];
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 2466482..8e57f25 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -10,6 +10,7 @@
 $cpf_duplicado = false;
 $cpf_diferente = false;
 $message_error = '';
+$support_email = $app->config['auth.config']['strategies']['govbr']['supportEmail'] ?? '';
 
 if(isset($_SESSION['strategy-error'])) {
     foreach($_SESSION['strategy-error'] as $key => $value) {
@@ -17,7 +18,7 @@
             $cpf_duplicado = true;
             $user_cpf = $_SESSION['strategy-error-cpf'];
 
-            $message_error = sprintf(i::__('Encontramos duas contas cadastradas com este CPF %s. Para solucionar este problema entre em contato com o suporte pelo email XXXX'), $user_cpf);
+            $message_error = sprintf(i::__('Encontramos duas contas cadastradas com este CPF %s. Para solucionar este problema entre em contato com o suporte pelo email %s'), $user_cpf, $support_email);
 
             unset($_SESSION['strategy-error-cpf']);
             unset($_SESSION['strategy-error'][$key]);

From 8676e9b940533e6e74c3e31148850229e77681f4 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Fri, 28 Mar 2025 15:43:01 -0300
Subject: [PATCH 19/36] =?UTF-8?q?Adiciona=20modal=20para=20oferecer=20vinc?=
 =?UTF-8?q?ula=C3=A7=C3=A3o=20com=20o=20govbr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GovBr/GovBrStrategy.php                  |  1 +
 Plugin.php                               | 35 ++++++++++++++++++++-
 components/link-govbr-modal/script.js    | 39 ++++++++++++++++++++++++
 components/link-govbr-modal/template.php | 34 +++++++++++++++++++++
 layouts/parts/govbr/govbr-modal.php      | 19 ++++++++++++
 5 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 components/link-govbr-modal/script.js
 create mode 100644 components/link-govbr-modal/template.php
 create mode 100644 layouts/parts/govbr/govbr-modal.php

diff --git a/GovBr/GovBrStrategy.php b/GovBr/GovBrStrategy.php
index 095d78d..ad10bd7 100644
--- a/GovBr/GovBrStrategy.php
+++ b/GovBr/GovBrStrategy.php
@@ -281,6 +281,7 @@ public static function verifyUpdateData($user, $response)
 				}
 			}
 		}
+		$user->profile->hasSeenSocialLinkingModal = true;
 		$user->profile->save(true);
 		$app->enableAccessControl();
 
diff --git a/Plugin.php b/Plugin.php
index f9903ea..d368087 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -76,6 +76,34 @@ public function _init() {
             $iconset['cursor-click'] = "mynaui:click-solid";
         });
 
+        $app->hook('template(<<*>>.main-header):after', function() use ($app) {
+            $is_admin = $app->user->is('admin');
+            $govbr_visible = $app->config['auth.config']['strategies']['govbr']['visible'];
+            $has_seen_modal = !$app->user->is('guest') ? $app->user->profile->hasSeenSocialLinkingModal : false;
+            $govbr_seal = $app->config['auth.config']['strategies']['govbr']['applySealId'];
+            $seal_relation = !$app->user->is('guest') && $govbr_seal ? $app->repo('SealRelation')->findOneBy(['seal' => $govbr_seal, 'agent' => $app->user->profile->id]) : false;
+            
+            if ($govbr_visible && !$app->user->is('guest') && !$has_seen_modal && !$seal_relation && !$is_admin) {
+                $this->part('govbr/govbr-modal');
+            }
+        });
+
+        $app->hook('POST(site.desabilitar-modal)', function() use($app) {
+            $this->requireAuthentication();
+            
+            $agent_id = $this->data['agentId'];
+            $agent = $app->repo('Agent')->find($agent_id);
+
+            if($agent) {
+                $agent->hasSeenSocialLinkingModal = true;
+                $agent->save(true);
+
+                $this->json(true);
+            }
+
+            $this->errorJson(false);
+        });
+
         if (php_sapi_name() == "cli") {
             if (!isset($_SERVER['HTTP_HOST'])) {
                 $_SERVER['HTTP_HOST'] = 'localhost';
@@ -90,6 +118,11 @@ public function register() {
         $this->registerUserMetadata(Provider::$accountIsActiveMetadata, ['label' => i::__('Conta ativa?')]);
         $this->registerUserMetadata(Provider::$tokenVerifyAccountMetadata, ['label' => i::__('Token de verificação')]);
         $this->registerUserMetadata(Provider::$loginAttempMetadata, ['label' => i::__('Número de tentativas de login')]);
-        $this->registerUserMetadata(Provider::$timeBlockedloginAttempMetadata, ['label' => i::__('Tempo de bloqueio por excesso de tentativas')]);        
+        $this->registerUserMetadata(Provider::$timeBlockedloginAttempMetadata, ['label' => i::__('Tempo de bloqueio por excesso de tentativas')]);
+        $this->registerAgentMetadata('hasSeenSocialLinkingModal', [
+            'label' => i::__('Indica se o usuário já viu o modal de vinculação com redes sociais'),
+            'type' => 'boolean',
+            'default' => false
+        ]);    
     }
 }
diff --git a/components/link-govbr-modal/script.js b/components/link-govbr-modal/script.js
new file mode 100644
index 0000000..ea57246
--- /dev/null
+++ b/components/link-govbr-modal/script.js
@@ -0,0 +1,39 @@
+app.component('link-govbr-modal', {
+    template: $TEMPLATES['link-govbr-modal'],
+
+    props: {
+        config: {
+            type: String,
+            required: true
+        },
+    },
+
+    computed: {
+        configs() {
+            return JSON.parse(this.config);
+        },
+    },
+
+    methods: {
+        disableModal(event, redirect = true) {
+            let url = Utils.createUrl('site/desabilitar-modal', '');
+            let api = new API();
+            let data = { 
+                agentId: $MAPAS.user.profile.id,
+            };
+
+            const redirectUrl = event.currentTarget ? event.currentTarget.getAttribute('href') : null;
+            api.POST(url, data).then(res => res.json()).then(data => {
+                if(redirect) {
+                    window.location.href = redirectUrl;
+                }
+            })
+        }
+    },
+
+    mounted() {
+        this.$nextTick(() => {
+            this.$refs.linkGovbrModal.open();
+        });
+    }
+});
diff --git a/components/link-govbr-modal/template.php b/components/link-govbr-modal/template.php
new file mode 100644
index 0000000..419ee43
--- /dev/null
+++ b/components/link-govbr-modal/template.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @var \MapasCulturais\Themes\BaseV2\Theme $this
+ * @var \MapasCulturais\App $app
+ * 
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    mc-modal
+');
+
+?>
+
+<div v-if="configs.strategies.govbr?.visible" class="link-govbr-modal">
+    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincule sua conta ao Gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
+        <template #default>
+            <div class="link-govbr__content">
+                <p><?= i::__('Você pode vincular sua conta ao Gov.br para facilitar o acesso a serviços do governo. A vinculação é opcional e pode ser feita a qualquer momento.') ?></p>
+                <p><?= i::__('Clique abaixo para vincular sua conta agora.') ?></p>
+                
+                <a class="button button--icon button--large button--md button--primary" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">                                 
+                    <?= i::__('Vincular') ?>                            
+                </a>
+            </div>
+        </template>
+
+        <template #button="modal">
+            <span></span>
+        </template>
+    </mc-modal>
+</div>
\ No newline at end of file
diff --git a/layouts/parts/govbr/govbr-modal.php b/layouts/parts/govbr/govbr-modal.php
new file mode 100644
index 0000000..c398931
--- /dev/null
+++ b/layouts/parts/govbr/govbr-modal.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @var \MapasCulturais\Themes\BaseV2\Theme $this
+ * @var \MapasCulturais\App $app
+ * 
+ */
+
+use MapasCulturais\i;
+
+$configs = json_encode($app->config['auth.config']);
+
+$this->import('
+    link-govbr-modal
+');
+?>
+
+<div>
+    <link-govbr-modal config='<?= $configs; ?>' ></link-govbr-modal>
+</div>
\ No newline at end of file

From d275ca2547214bd072e7b0c9d514a35dff8c542b Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Fri, 28 Mar 2025 20:56:08 +0000
Subject: [PATCH 20/36] Ajustar alguns textos

---
 .../sass/4-components/_c-login-govbr.scss     |  3 +-
 assets/img/govbr-white.svg                    | 12 ++++
 components/create-account/template.php        | 68 +++++++++----------
 components/link-govbr-modal/template.php      | 15 ++--
 components/login-govbr/template.php           | 35 ++++++----
 components/login/template.php                 | 26 +++----
 layouts/parts/govbr/govbr-data.php            |  6 +-
 7 files changed, 94 insertions(+), 71 deletions(-)
 create mode 100644 assets/img/govbr-white.svg

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 7db3ef2..7dedf26 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -7,7 +7,8 @@
 
     .govbr {
         background-color: #1351b4;
-        color: #FFFFFF;
+        color: #fff;
+        display: flex;
 
         > img {
             width: 50px;
diff --git a/assets/img/govbr-white.svg b/assets/img/govbr-white.svg
new file mode 100644
index 0000000..c763215
--- /dev/null
+++ b/assets/img/govbr-white.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="495" height="178" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style type="text/css"/>
+ <g fill="#fff">
+  <path d="m53.425 111.72c11.77 0 21.15-9.93 21.15-24.63.91-11.54-7.7-21.63-19.24-22.55-.63-.05-1.27-.07-1.91-.06-12.3 0-18.74 10.85-18.74 23.9-.01 14.89 8.81 23.34 18.74 23.34zm53.12 14.15c0 39.33-19.1 52.01-57.71 52.01-12.44.03-24.81-2.01-36.58-6.06l1.65-26.11c9.93 5.37 21.07 8.09 32.36 7.91 19.12 0 29.41-9 29.41-27.75v-5.16h-.37c-7.2 10.62-19.35 16.8-32.17 16.36-26.29 0-42.64-19.84-42.64-48.17 0-28.5 13.41-49.81 43.19-49.81 13.58.11 26.03 7.57 32.53 19.49h.38v-17.26h29.95v84.54z"/>
+  <path d="m239.93 136.96h36.81l34.61-95.17h-32.15l-19.52 67.8h-.36l-19.37-67.8h-34.7z"/>
+  <path d="m183.75 89.4c0-14.24-6.21-26.84-21.37-26.84s-21.36 12.6-21.36 26.84c0 14.06 6.21 26.66 21.36 26.66s21.37-12.6 21.37-26.66zm-76.69 0c0-31.59 23.91-49.83 55.32-49.83s55.32 18.26 55.32 49.83c0 31.41-23.91 49.66-55.32 49.66s-55.32-18.25-55.32-49.66z"/>
+  <path d="m315.07 123.51c0 8.62-6.99 15.6-15.61 15.6s-15.6-6.99-15.6-15.61c0-8.61 6.98-15.59 15.6-15.6 8.61-.01 15.6 6.97 15.61 15.58z"/>
+  <path d="m371.01 64.84c-12.05 0-20.09 10.58-20.09 24.83 0 13.88 9.14 24.3 20.09 24.3 12.42 0 19.91-10.42 19.91-25.58 0-12.59-7.12-23.55-19.91-23.55zm-52.96-64.84h33.07v54.07h.37c7.91-9.84 20.1-15.22 32.7-14.42 26.3 0 40.71 25.01 40.71 48.03 0 28.12-15.15 51.51-43.47 51.51-13.7.53-26.47-6.96-32.69-19.18h-.37v17h-30.34v-137h.02z"/>
+  <path d="m492.83 68.13c-3.64-.91-7.39-1.28-11.14-1.09-15.34 0-23.91 11.14-23.91 29.77v40.19h-32.89v-95.21h29.98v17.54h.37c4.15-11.95 15.48-19.89 28.12-19.72 3.74.06 7.46.43 11.14 1.09z"/>
+ </g>
+</svg>
diff --git a/components/create-account/template.php b/components/create-account/template.php
index 3e7d608..b8a592c 100644
--- a/components/create-account/template.php
+++ b/components/create-account/template.php
@@ -2,7 +2,7 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- * 
+ *
  */
 
 use MapasCulturais\i;
@@ -17,7 +17,7 @@
 ');
 ?>
 
-<div class="create-account"> 
+<div class="create-account">
 
     <div v-if="!created" class="create-account__title">
         <label><?= $this->text('title', i::__('Novo cadastro')) ?> </label>
@@ -25,8 +25,8 @@
     </div>
 
     <!-- Creating account -->
-    <mc-card v-if="!created" class="no-title">        
-        <template #content> 
+    <mc-card v-if="!created" class="no-title">
+        <template #content>
             <div class="create-account__timeline">
                 <mc-stepper :steps="arraySteps" :step="step" disable-navigation></mc-stepper>
             </div>
@@ -38,10 +38,10 @@
                         <label for="email"> <?= i::__('E-mail') ?> </label>
                         <input type="text" name="email" id="email" v-model="email" />
                     </div>
-                    
+
                     <div class="field col-12">
-                        <label class="document-label" for="cpf"> 
-                            <?= i::__('CPF') ?> 
+                        <label class="document-label" for="cpf">
+                            <?= i::__('CPF') ?>
                             <div class="question">
                                 <VMenu class="popover">
                                     <button tabindex="-1" class="question" type="button"> <?= i::__('Por que pedimos este dado') ?> <mc-icon name="question"></mc-icon> </button>
@@ -51,7 +51,7 @@
                                 </VMenu>
                             </div>
                         </label>
-                        <input type="text" name="cpf" id="cpf" v-model="cpf" v-maska data-maska="###.###.###-##" maxlength="14" /> 
+                        <input type="text" name="cpf" id="cpf" v-model="cpf" v-maska data-maska="###.###.###-##" maxlength="14" />
                     </div>
 
                     <div class="field col-12 password">
@@ -75,16 +75,16 @@
                     <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" class="g-recaptcha col-12"></VueRecaptcha>
                     <button class="col-12 button button--primary button--large button--md" type="submit"> <?= i::__('Continuar') ?> </button>
                 </form>
-                
+
                 <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="divider col-12"></div>
 
                 <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="social-login col-12">
-                    <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
-                        <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
-                        <?= i::__('Entrar com Gov.br') ?>                            
-                    </a>                    
-                    <a v-if="configs.strategies.Google?.visible" class="social-login--button button button--icon button--large button--md google" href="<?php echo $app->createUrl('auth', 'google') ?>">                                
-                        <div class="img"> <img height="16" src="<?php $this->asset('img/g.png'); ?>" /> </div>                                
+                    <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">
+                        <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>
+                        <?= i::__('Entrar com Gov.br') ?>
+                    </a>
+                    <a v-if="configs.strategies.Google?.visible" class="social-login--button button button--icon button--large button--md google" href="<?php echo $app->createUrl('auth', 'google') ?>">
+                        <div class="img"> <img height="16" src="<?php $this->asset('img/g.png'); ?>" /> </div>
                         <?= i::__('Entrar com Google') ?>
                     </a>
                 </div>
@@ -96,8 +96,8 @@
                         <h4 class="bold"> <?= i::__('Revise seus dados') ?> </h4>
                     </div>
                     <div class="subtitle col-12">
-                        <span> 
-                            <?= i::__('Seu cadastro foi criado. Agora é necessário criar seu Perfil de Agente Cultural na plataforma, confirme se os seus dados estão corretos para seguir. Esses dados não serão divulgados.') ?> 
+                        <span>
+                            <?= i::__('Seu cadastro foi criado. Agora é necessário criar seu Perfil de Agente Cultural na plataforma, confirme se os seus dados estão corretos para seguir. Esses dados não serão divulgados.') ?>
                         </span>
                     </div>
                 </label>
@@ -107,7 +107,7 @@
                         <label for="nomeCompleto"> <?= i::__('Nome completo') ?> </label>
                         <input type="text" name="nomeCompleto" id="nomeCompleto" v-model="govbr.nome" disabled />
                     </div>
-                    
+
                     <div class="field col-12">
                         <label for="dataNascimento"> <?= i::__('Data de nasciento') ?> </label>
                         <input type="text" name="dataNascimento" id="dataNascimento" v-model="govbr.nascimento" disabled />
@@ -115,9 +115,9 @@
 
                     <div class="field col-12">
                         <label for="cpf"> <?= i::__('CPF') ?> </label>
-                        <input type="text" name="cpf" id="cpf" v-model="govbr.cpf" v-maska data-maska="###.###.###-##" maxlength="14"  disabled/> 
+                        <input type="text" name="cpf" id="cpf" v-model="govbr.cpf" v-maska data-maska="###.###.###-##" maxlength="14"  disabled/>
                     </div>
-                    
+
                     <div class="field col-12">
                         <label for="email"> <?= i::__('E-mail') ?> </label>
                         <input type="text" name="email" id="email" v-model="govbr.email" disabled />
@@ -132,8 +132,8 @@
 
                     <button class="col-12 create-account__button button button--primary button--large button--md" type="submit"> <?= i::__('Continuar') ?> </button>
 
-                    <small class="col-12"> 
-                        <?= i::__('*Caso seus dados estejam incorretos, será necessário alterá-los em sua conta Gov.br.') ?>
+                    <small class="col-12">
+                        <?= i::__('*Caso seus dados estejam incorretos, será necessário alterá-los em sua conta gov.br.') ?>
                         <br>
                         <a href="#"><?= i::__('Saiba mais.') ?></a>
                     </small>
@@ -147,8 +147,8 @@
                         <h4 class="bold"> <?= i::__('Aceite de políticas') ?> </h4>
                     </div>
                     <div class="subtitle col-12">
-                        <span> 
-                            <?= i::__('Para criar o seu perfil é necessário ler e aceitar os termos, políticas e autorizações para utilização da plataforma, que serão encaminhados a você por e-mail. Ao aceitar, você estará concordando com todos.') ?> 
+                        <span>
+                            <?= i::__('Para criar o seu perfil é necessário ler e aceitar os termos, políticas e autorizações para utilização da plataforma, que serão encaminhados a você por e-mail. Ao aceitar, você estará concordando com todos.') ?>
                         </span>
                     </div>
                 </label>
@@ -158,7 +158,7 @@
                         <template #default="modal">
                             <div class="create-account__modal-content grid-12">
                                 <div class="term col-12" v-html="value.text" :id="'term'+index" ref="terms"></div>
-                                <div class="divider col-12"></div>                
+                                <div class="divider col-12"></div>
                                 <button class="col-12 button button--primary button--large button--md" :id="'acceptTerm'+index" @click="modal.close(); acceptTerm(name)"> {{value.buttonText}} </button>
                                 <button class="col-12 button button--text" @click="modal.close(); cancel()"> <?= i::__('Voltar e excluir minhas informações') ?> </button>
                             </div>
@@ -182,19 +182,19 @@
                         <h4 class="bold"> <?= i::__('Criação do Perfil') ?> </h4>
                     </div>
                     <div class="subtitle col-12">
-                        <span> 
-                            <?= i::__(' Para finalizar o seu cadastro, é necessário criar seu Perfil de Agente Cultural. 
-                                        Um Agente Cultural é qualquer pessoa que tenha envolvimento com a área da cultura. 
+                        <span>
+                            <?= i::__(' Para finalizar o seu cadastro, é necessário criar seu Perfil de Agente Cultural.
+                                        Um Agente Cultural é qualquer pessoa que tenha envolvimento com a área da cultura.
                                         Este perfil será público e integrará o Mapa da Cultura brasileira, onde será possível acessar informações e projetos culturais relacionados.
-                                        Dê um nome, faça uma breve descrição sobre sua relação com a cultura e selecione suas principais áreas de atuação, para completar o seu cadastro. 
-                                        Será possível editar as informações posteriormente.') ?> 
+                                        Dê um nome, faça uma breve descrição sobre sua relação com a cultura e selecione suas principais áreas de atuação, para completar o seu cadastro.
+                                        Será possível editar as informações posteriormente.') ?>
                         </span>
                     </div>
                 </label>
-                
+
                 <entity-field :entity="agent" classes="col-12" hide-required label=<?php i::esc_attr_e("Nome")?> prop="name" fieldDescription="<?= i::__('As pessoas irão encontrar você por esse nome.') ?>"></entity-field>
                 <entity-field :entity="agent" classes="col-12" hide-required prop="shortDescription" label="<?php i::esc_attr_e("Mini Bio")?>"></entity-field>
-                <entity-terms :entity="agent" classes="col-12" :editable="true" taxonomy='area' title="<?php i::esc_attr_e("Área de atuação") ?>"></entity-terms>                
+                <entity-terms :entity="agent" classes="col-12" :editable="true" taxonomy='area' title="<?php i::esc_attr_e("Área de atuação") ?>"></entity-terms>
 
                 <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" @render="expiredCaptcha" class="g-recaptcha col-12"></VueRecaptcha>
 
@@ -202,8 +202,8 @@
             </div>
         </template>
     </mc-card>
-    
-    <!-- Account created -->            
+
+    <!-- Account created -->
     <mc-card v-if="created" class="no-title card-created">
         <template #content>
             <div class="create-account__created grid-12">
diff --git a/components/link-govbr-modal/template.php b/components/link-govbr-modal/template.php
index 419ee43..bc45b2b 100644
--- a/components/link-govbr-modal/template.php
+++ b/components/link-govbr-modal/template.php
@@ -3,7 +3,7 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- * 
+ *
  */
 
 use MapasCulturais\i;
@@ -15,14 +15,17 @@
 ?>
 
 <div v-if="configs.strategies.govbr?.visible" class="link-govbr-modal">
-    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincule sua conta ao Gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
+    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincule sua conta ao gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
         <template #default>
             <div class="link-govbr__content">
-                <p><?= i::__('Você pode vincular sua conta ao Gov.br para facilitar o acesso a serviços do governo. A vinculação é opcional e pode ser feita a qualquer momento.') ?></p>
+                <p><?= sprintf(
+                    i::__('Você pode vincular sua conta ao %s para facilitar o acesso a serviços do governo. A vinculação é opcional e pode ser feita a qualquer momento.'),
+                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>'
+                ) ?></p>
                 <p><?= i::__('Clique abaixo para vincular sua conta agora.') ?></p>
-                
-                <a class="button button--icon button--large button--md button--primary" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">                                 
-                    <?= i::__('Vincular') ?>                            
+
+                <a class="button button--icon button--large button--md button--primary" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">
+                    <?= i::__('Vincular') ?>
                 </a>
             </div>
         </template>
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 8e57f25..61910dd 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -2,7 +2,7 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- * 
+ *
  */
 
 use MapasCulturais\i;
@@ -23,11 +23,11 @@
             unset($_SESSION['strategy-error-cpf']);
             unset($_SESSION['strategy-error'][$key]);
         }
-        
+
         if('cpf-diferente' == ($key ?? false)) {
             $cpf_diferente = true;
 
-            $message_error = i::__('Sua conta do <a href="https://gov.br">Gov.br</a> vinculada apresenta um número de CPF diferente do cadastrado aqui. Verifique as contas para garantir que sejam do mesmo usuário');
+            $message_error = i::__('Sua conta do <a href="https://gov.br">gov.br</a> vinculada apresenta um número de CPF diferente do cadastrado aqui. Verifique as contas para garantir que sejam do mesmo usuário');
 
             unset($_SESSION['strategy-error'][$key]);
         }
@@ -51,23 +51,30 @@
         <template #default>
             <div class="login-govbr__content">
                 <p class="login-govbr__explain">
-                    <?= i::__('O Mapas Culturais está integrado ao') ." <a href='#'>Gov.br</a> ". i::__('porque garante segurança ao seu acesso, respeitando os ') ." <a href='#'>termos de uso</a> ". i::__('e as') ." <a href='#'>políticas de privacidade</a>". i::__('.') ?>
+                <?= sprintf(
+                    i::__('O Mapas Culturais está integrado ao %s porque garante segurança ao seu acesso, respeitando os ') ." <a href='#'>termos de uso</a> ". i::__('e as') ." <a href='#'>políticas de privacidade</a>". i::__('.'),
+                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>',
+                    '<a href="#">' . i::__('Termos de Uso') . '</a>',
+
+                ) ?>
                 </p>
-                    
-                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>" data-params='<?= json_encode($params) ?>' @click.prevent="govBrClick($event)">                                 
-                    <?= i::__('Entrar com') ?>                            
-                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
-                </a>
 
-                <p> <?= i::__('Ao prosseguir você será direcionado ao site') ." <a href='#'>Gov.br</a> ". i::__('para identificação e autenticação digital do cidadão através do seu navegador de internet.') ?></p>
+                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>" data-params='<?= json_encode($params) ?>' @click.prevent="govBrClick($event)">
+                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" /> </div>
+                    <?= i::__('Entrar com gov.br') ?>
+                </a>
+                <p> <?= sprintf(
+                    i::__('Ao prosseguir você será direcionado ao site %s para identificação e autenticação digital do cidadão através do seu navegador de internet.'),
+                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>'
+                ) ?></p>
             </div>
         </template>
 
         <template #button="modal">
             <div>
-                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="[{'button--sm' : small}, {'button--large': large}]" @click="modal.open()">                                
-                    <?= i::__('Entrar com') ?>                            
-                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
+                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="{'button--sm' : small, 'button--large': large}" @click="modal.open()">
+                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" /> </div>
+                    <?= i::__('Entrar com gov.br') ?>
                 </a>
             </div>
 
@@ -76,7 +83,7 @@
                     <mc-alert class="col-12" type="warning">
                         <?= $message_error ?>
                     </mc-alert>
-                
+
                 <?php elseif($cpf_duplicado): ?>
                     <mc-alert class="col-12" type="warning">
                         <?= $message_error ?>
diff --git a/components/login/template.php b/components/login/template.php
index f619f73..b6fdf25 100644
--- a/components/login/template.php
+++ b/components/login/template.php
@@ -2,7 +2,7 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- * 
+ *
  */
 
 use MapasCulturais\i;
@@ -38,28 +38,28 @@
                             <input type="password" name="password" id="password" v-model="password" autocomplete="off" />
                             <a id="multiple-login-recover" class="login__recover-link" @click="recoveryRequest = true"> <?= i::__('Esqueci minha senha') ?> </a>
                             <div class="seePassword" @click="togglePassword('password', $event)"></div>
-                        </div> 
-                    </div>                     
+                        </div>
+                    </div>
 
                     <VueRecaptcha v-if="configs['google-recaptcha-sitekey']" :sitekey="configs['google-recaptcha-sitekey']" @verify="verifyCaptcha" @expired="expiredCaptcha" @render="expiredCaptcha" class="g-recaptcha"></VueRecaptcha>
-                    
+
                     <div class="login__buttons">
                         <button class=" button button--primary button--large button--md" type="submit"> <?= i::__('Entrar') ?> </button>
 
-                        <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="divider"> 
+                        <div v-if="configs.strategies.Google?.visible || configs.strategies.govbr?.visible" class="divider">
                             <span class="divider__text"> <?= i::__('Ou entre com') ?> </span>
                         </div>
 
                         <div class="login__social-buttons" :class="{'login__social-buttons--multiple': multiple}">
                             <login-govbr :config="config"></login-govbr>
-                            
-                            <!-- <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">                                
-                                <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>                                
-                                <?= i::__('Entrar com Gov.br') ?>                            
+
+                            <!-- <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">
+                                <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>
+                                <?= i::__('Entrar com gov.br') ?>
                             </a> -->
 
-                            <a v-if="configs.strategies.Google?.visible" class="social-login--button button button--icon button--large button--md google" href="<?php echo $app->createUrl('auth', 'google') ?>">                                
-                                <div class="img"> <img height="16" src="<?php $this->asset('img/g.png'); ?>" /> </div>                                
+                            <a v-if="configs.strategies.Google?.visible" class="social-login--button button button--icon button--large button--md google" href="<?php echo $app->createUrl('auth', 'google') ?>">
+                                <div class="img"> <img height="16" src="<?php $this->asset('img/g.png'); ?>" /> </div>
                                 <?= i::__('Entrar com Google') ?>
                             </a>
 
@@ -69,7 +69,7 @@
                     <div class="create ">
                         <h5 class="bold"> <?= sprintf($this->text('register', i::__('Ainda não tem cadastro no %s? Realize seu cadastro agora!')), $app->siteName) ?> </h5>
 
-                        <a class=" button button--primary button--large button--md" href="<?php echo $app->createUrl('auth', 'register') ?>"> 
+                        <a class=" button button--primary button--large button--md" href="<?php echo $app->createUrl('auth', 'register') ?>">
                             <?= $this->text('fazer-cadastro', i::__('Fazer cadastro')) ?>
                         </a>
                     </div>
@@ -127,7 +127,7 @@
                     <div class="field col-12 password">
                         <label for="pwd"> <?= i::__('Senha'); ?> </label>
                         <input autocomplete="off" id="pwd" type="password" name="password" v-model="password" />
-                        
+
                     </div>
 
                     <div class="field col-12 password">
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index 39afd20..0da5a7e 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -2,7 +2,7 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- * 
+ *
  */
 
 use MapasCulturais\i;
@@ -20,11 +20,11 @@
 
 <div class="user-mail__config">
     <div class="user-mail__config-title">
-        <?= i::__('Gov.br') ?> :
+        <?= i::__('gov.br') ?> :
     </div>
     <div class="user-mail__config-content">
         <?php if ($has_govbr_seal): ?>
-            <b><mc-icon name="check"></mc-icon> Usuário vinculado ao Gov.br</b>
+            <b><mc-icon name="check"></mc-icon> <?= i::__('Usuário vinculado ao gov.br') ?></b>
         <?php else: ?>
             <login-govbr config='<?= $configs; ?>' small></login-govbr>
         <?php endif; ?>

From 7c3fc0a7973bf25cc23919910df17f3f8fc06ddb Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Mon, 31 Mar 2025 12:39:39 +0000
Subject: [PATCH 21/36] Ajustar alguns textos

---
 components/link-govbr-modal/template.php | 8 ++++----
 components/login-govbr/template.php      | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/link-govbr-modal/template.php b/components/link-govbr-modal/template.php
index bc45b2b..f2ad2c2 100644
--- a/components/link-govbr-modal/template.php
+++ b/components/link-govbr-modal/template.php
@@ -15,17 +15,17 @@
 ?>
 
 <div v-if="configs.strategies.govbr?.visible" class="link-govbr-modal">
-    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincule sua conta ao gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
+    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincular conta gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
         <template #default>
             <div class="link-govbr__content">
                 <p><?= sprintf(
-                    i::__('Você pode vincular sua conta ao %s para facilitar o acesso a serviços do governo. A vinculação é opcional e pode ser feita a qualquer momento.'),
-                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>'
+                    i::__('Você pode vincular sua conta ao %s para facilitar seu acesso a esse serviço. A vinculação é opcional e pode ser feita a qualquer momento.'),
+                    '<a href="https://www.gov.br/" target="_blank">' . i::__('gov.br') . '</a>'
                 ) ?></p>
                 <p><?= i::__('Clique abaixo para vincular sua conta agora.') ?></p>
 
                 <a class="button button--icon button--large button--md button--primary" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">
-                    <?= i::__('Vincular') ?>
+                    <?= i::__('Vincular conta gov.br') ?>
                 </a>
             </div>
         </template>
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 61910dd..7a8262e 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -27,7 +27,10 @@
         if('cpf-diferente' == ($key ?? false)) {
             $cpf_diferente = true;
 
-            $message_error = i::__('Sua conta do <a href="https://gov.br">gov.br</a> vinculada apresenta um número de CPF diferente do cadastrado aqui. Verifique as contas para garantir que sejam do mesmo usuário');
+            $message_error = sprintf(
+                i::__('Sua conta do %s vinculada apresenta um número de CPF diferente do cadastrado aqui. Verifique as contas para garantir que sejam do mesmo usuário'),
+                '<a href="https://www.gov.br/" target="_blank">' . i::__('gov.br') . '</a>'
+            );
 
             unset($_SESSION['strategy-error'][$key]);
         }
@@ -53,7 +56,7 @@
                 <p class="login-govbr__explain">
                 <?= sprintf(
                     i::__('O Mapas Culturais está integrado ao %s porque garante segurança ao seu acesso, respeitando os ') ." <a href='#'>termos de uso</a> ". i::__('e as') ." <a href='#'>políticas de privacidade</a>". i::__('.'),
-                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>',
+                    '<a href="https://www.gov.br/" target="_blank">' . i::__('gov.br') . '</a>',
                     '<a href="#">' . i::__('Termos de Uso') . '</a>',
 
                 ) ?>
@@ -65,7 +68,7 @@
                 </a>
                 <p> <?= sprintf(
                     i::__('Ao prosseguir você será direcionado ao site %s para identificação e autenticação digital do cidadão através do seu navegador de internet.'),
-                    '<a href="https://www.gov.br/" target="_blank">gov.br</a>'
+                    '<a href="https://www.gov.br/" target="_blank">' . i::__('gov.br') . '</a>'
                 ) ?></p>
             </div>
         </template>

From c68a347f548d152367eedc93063001c2b6de4f77 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Mon, 31 Mar 2025 14:37:23 -0300
Subject: [PATCH 22/36] =?UTF-8?q?Estiliza=C3=A7=C3=A3o=20do=20modal=20gov.?=
 =?UTF-8?q?br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sass/4-components/_c-login-govbr.scss     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 7dedf26..bc9f576 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -1,18 +1,32 @@
+@use '../1-settings/s-mixins' as *;
+
 .login-govbr {
     &__content {
         display: grid;
         gap: 20px;
-        max-width: 520px;
+        max-width: size(520);
     }
 
-    .govbr {
+    .button.govbr {
+        align-items: center;
         background-color: #1351b4;
         color: #fff;
         display: flex;
+        justify-content: center;
+        min-width: max-content;
+        padding: 8px 16px;
+        width: 100%;
 
         > img {
             width: 50px;
             height: 100%;
         }
     }
-}
\ No newline at end of file
+
+    &.modal__content {
+
+        .button.govbr {
+            width: 100%;
+        }
+    }
+}

From a785ba88bac3165ae72507ac3215109ab41e4549 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Mon, 31 Mar 2025 20:09:09 +0000
Subject: [PATCH 23/36] =?UTF-8?q?Compartilhar=20templates=20entre=20login?=
 =?UTF-8?q?=20e=20vincula=C3=A7=C3=A3o=20gov.br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/link-govbr-modal/template.php |  4 ++--
 components/login-govbr/script.js         | 13 +++++++++--
 components/login-govbr/template.php      | 10 ++++----
 components/login-govbr/texts.php         |  8 +++++++
 layouts/parts/govbr/govbr-data.php       | 29 ++++++++++++------------
 5 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 components/login-govbr/texts.php

diff --git a/components/link-govbr-modal/template.php b/components/link-govbr-modal/template.php
index f2ad2c2..cf7ece0 100644
--- a/components/link-govbr-modal/template.php
+++ b/components/link-govbr-modal/template.php
@@ -15,9 +15,9 @@
 ?>
 
 <div v-if="configs.strategies.govbr?.visible" class="link-govbr-modal">
-    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincular conta gov.br') ?>" classes="link-govbr__modal" @close="disableModal($event, false)">
+    <mc-modal ref="linkGovbrModal" title="<?= i::esc_attr_e('Vincular conta gov.br') ?>" classes="link-govbr__modal login-govbr" @close="disableModal($event, false)">
         <template #default>
-            <div class="link-govbr__content">
+            <div class="link-govbr__content login-govbr__content">
                 <p><?= sprintf(
                     i::__('Você pode vincular sua conta ao %s para facilitar seu acesso a esse serviço. A vinculação é opcional e pode ser feita a qualquer momento.'),
                     '<a href="https://www.gov.br/" target="_blank">' . i::__('gov.br') . '</a>'
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
index fa18155..4cb49b9 100644
--- a/components/login-govbr/script.js
+++ b/components/login-govbr/script.js
@@ -6,10 +6,19 @@ app.component('login-govbr', {
             type: String,
             required: true
         },
+        binding: {
+            type: Boolean,
+            default: false,
+        },
         small: Boolean,
         large: Boolean,
     },
 
+    setup() {
+        const text = Utils.getTexts('login-govbr')
+        return { text }
+    },
+
     computed: {
         configs() {
             return JSON.parse(this.config);
@@ -20,10 +29,10 @@ app.component('login-govbr', {
         setCookie(params) {
             Utils.cookies.set('errorRedirectLocation', JSON.stringify(params), {path: '/'});
         },
-        
+
         govBrClick(event) {
             const params = JSON.parse(event.currentTarget.getAttribute('data-params'));
-            
+
             this.setCookie(params);
 
             window.location.href = event.currentTarget.getAttribute('href');
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 7a8262e..0ee1d64 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -50,7 +50,7 @@
 ?>
 
 <div v-if="configs.strategies.govbr?.visible" class="login-govbr">
-    <mc-modal title="<?= i::esc_attr_e('Boas vindas!') ?>" subtitle="<?= i::esc_attr_e('Entre em sua conta do Mapas Culturais.') ?>" classes="login-govbr__modal">
+    <mc-modal :title="binding ? text('Vincular conta gov.br') : text('Boas vindas!')" classes="login-govbr__modal">
         <template #default>
             <div class="login-govbr__content">
                 <p class="login-govbr__explain">
@@ -63,8 +63,8 @@
                 </p>
 
                 <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>" data-params='<?= json_encode($params) ?>' @click.prevent="govBrClick($event)">
-                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" /> </div>
-                    <?= i::__('Entrar com gov.br') ?>
+                    <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" alt="">
+                    <?= i::__('Acessar gov.br') ?>
                 </a>
                 <p> <?= sprintf(
                     i::__('Ao prosseguir você será direcionado ao site %s para identificação e autenticação digital do cidadão através do seu navegador de internet.'),
@@ -76,8 +76,8 @@
         <template #button="modal">
             <div>
                 <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="{'button--sm' : small, 'button--large': large}" @click="modal.open()">
-                    <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" /> </div>
-                    <?= i::__('Entrar com gov.br') ?>
+                    <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" alt="">
+                    {{ binding ? text('Vincular conta gov.br') : text('Entrar com gov.br') }}
                 </a>
             </div>
 
diff --git a/components/login-govbr/texts.php b/components/login-govbr/texts.php
new file mode 100644
index 0000000..0ecf0dc
--- /dev/null
+++ b/components/login-govbr/texts.php
@@ -0,0 +1,8 @@
+<?php
+use MapasCulturais\i;
+
+return [
+    'Boas vindas!' => i::__('Boas vindas!'),
+    'Entrar com gov.br' => i::__('Entrar com gov.br'),
+    'Vincular conta gov.br' => i::__('Vincular conta gov.br'),
+];
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index 0da5a7e..2444f48 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -7,26 +7,27 @@
 
 use MapasCulturais\i;
 
+$current_user = $app->user;
 $configs = json_encode($app->config['auth.config']);
 $seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
-$seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $app->user->profile->id]);
+$seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $current_user->profile->id]);
 $has_govbr_seal = $seal_relation ? true : false;
 
-
 $this->import('
     login-govbr
 ');
 ?>
 
-<div class="user-mail__config">
-    <div class="user-mail__config-title">
-        <?= i::__('gov.br') ?> :
-    </div>
-    <div class="user-mail__config-content">
-        <?php if ($has_govbr_seal): ?>
-            <b><mc-icon name="check"></mc-icon> <?= i::__('Usuário vinculado ao gov.br') ?></b>
-        <?php else: ?>
-            <login-govbr config='<?= $configs; ?>' small></login-govbr>
-        <?php endif; ?>
-    </div>
-</div>
\ No newline at end of file
+<?php if (!$current_user->is('guest') && $this->controller->requestedEntity->id == $current_user->profile->id):
+    if ($has_govbr_seal): ?>
+        <div class="user-mail__config col-12" style="width: max-content">
+            <h4 class="user-mail__config-title bold"><?= i::__('gov.br') ?></h4>
+            <div class="user-mail__config-content">
+                <mc-icon name="check" class="success__color"></mc-icon>
+                <span><?= i::__('Usuário vinculado ao gov.br') ?></span>
+            </div>
+        </div>
+    <?php else: ?>
+        <login-govbr config='<?= $configs; ?>' :binding='true' small></login-govbr>
+    <?php endif;
+endif; ?>
\ No newline at end of file

From c734d20f823ccdfec16167bf1436a3fdfdd5c200 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Mon, 31 Mar 2025 20:31:25 +0000
Subject: [PATCH 24/36] =?UTF-8?q?Atualiza=20modal=20de=20vincula=C3=A7?=
 =?UTF-8?q?=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/link-govbr-modal/template.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/link-govbr-modal/template.php b/components/link-govbr-modal/template.php
index cf7ece0..79f68f7 100644
--- a/components/link-govbr-modal/template.php
+++ b/components/link-govbr-modal/template.php
@@ -24,7 +24,8 @@
                 ) ?></p>
                 <p><?= i::__('Clique abaixo para vincular sua conta agora.') ?></p>
 
-                <a class="button button--icon button--large button--md button--primary" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">
+                <a class="button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('panel', 'my-account') ?>" @click.prevent="disableModal($event)">
+                    <img height="16" src="<?php $this->asset('img/govbr-white.svg'); ?>" alt="">
                     <?= i::__('Vincular conta gov.br') ?>
                 </a>
             </div>

From 326e4da36c87641af11a8be1562fcd2fd4d674cb Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 1 Apr 2025 15:14:50 +0000
Subject: [PATCH 25/36] =?UTF-8?q?Corrige=20regress=C3=B5es=20de=20estiliza?=
 =?UTF-8?q?=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php                                    | 16 ++---
 .../sass/4-components/_c-create-account.scss  | 59 ++++++++++---------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index d368087..6c922a3 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -11,15 +11,15 @@
 include('GovBr/GovBrStrategy.php');
 
 class Plugin extends \MapasCulturais\Plugin {
-    
+
     public function _init() {
         $app = App::i();
-        
+
         // register translation text domain
         i::load_textdomain( 'multipleLocal', __DIR__ . "/translations" );
 
         // Load JS & CSS
-        $app->hook('GET(<<auth|panel|seal>>.<<*>>):before', function() use ($app) {
+        $app->hook('GET(<<*>>.<<*>>):before', function() use ($app) {
             $app->view->enqueueStyle('app-v2', 'multipleLocal-v2', 'css/plugin-MultiplLocalAuth.css');
         });
 
@@ -47,7 +47,7 @@ public function _init() {
                 $this->part('govbr/govbr-data');
             }
         });
-        
+
         $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
@@ -82,7 +82,7 @@ public function _init() {
             $has_seen_modal = !$app->user->is('guest') ? $app->user->profile->hasSeenSocialLinkingModal : false;
             $govbr_seal = $app->config['auth.config']['strategies']['govbr']['applySealId'];
             $seal_relation = !$app->user->is('guest') && $govbr_seal ? $app->repo('SealRelation')->findOneBy(['seal' => $govbr_seal, 'agent' => $app->user->profile->id]) : false;
-            
+
             if ($govbr_visible && !$app->user->is('guest') && !$has_seen_modal && !$seal_relation && !$is_admin) {
                 $this->part('govbr/govbr-modal');
             }
@@ -90,7 +90,7 @@ public function _init() {
 
         $app->hook('POST(site.desabilitar-modal)', function() use($app) {
             $this->requireAuthentication();
-            
+
             $agent_id = $this->data['agentId'];
             $agent = $app->repo('Agent')->find($agent_id);
 
@@ -110,7 +110,7 @@ public function _init() {
             }
         }
     }
-    
+
     public function register() {
         $this->registerUserMetadata(Provider::$passMetaName, ['label' => i::__('Senha')]);
         $this->registerUserMetadata(Provider::$recoverTokenMetadata, ['label' => i::__('Token para recuperação de senha')]);
@@ -123,6 +123,6 @@ public function register() {
             'label' => i::__('Indica se o usuário já viu o modal de vinculação com redes sociais'),
             'type' => 'boolean',
             'default' => false
-        ]);    
+        ]);
     }
 }
diff --git a/assets-src/sass/4-components/_c-create-account.scss b/assets-src/sass/4-components/_c-create-account.scss
index 34253a0..918a9e8 100644
--- a/assets-src/sass/4-components/_c-create-account.scss
+++ b/assets-src/sass/4-components/_c-create-account.scss
@@ -1,16 +1,19 @@
 @use '../1-settings/s-mixins' as *;
 
-.mc-breadcrumb {
-    li {
-        display: flex;
-        color: var(--mc-primary-500);
+.controller-auth {
 
-        &::before {
-            content: url('https://api.iconify.design/fe/arrow-left.svg?width=16&height=16');
-            height: 16px;
-            margin-inline-end: 5px;
-            width: 16px;
+    .mc-breadcrumb {
+        li {
+            display: flex;
             color: var(--mc-primary-500);
+
+            &::before {
+                content: url('https://api.iconify.design/fe/arrow-left.svg?width=16&height=16');
+                height: 16px;
+                margin-inline-end: 5px;
+                width: 16px;
+                color: var(--mc-primary-500);
+            }
         }
     }
 }
@@ -26,7 +29,7 @@
 
     .mc-card {
         padding: 24px;
-        
+
         &.card-created {
             margin: 80px 0;
         }
@@ -36,7 +39,7 @@
         max-width: size(473);
         margin: 0 auto;
     }
-    
+
     &__title {
         margin: 35px 0;
 
@@ -113,7 +116,7 @@
                     &::before {
                         top: 16px;
                     }
-                    
+
                     .count {
                         width: 32px;
                         height: 32px;
@@ -138,8 +141,8 @@
             }
         }
 
-        .password {     
-            position: relative;           
+        .password {
+            position: relative;
             &-rules {
                 margin-top:1em;
                 font-size: 14px;
@@ -164,7 +167,7 @@
             }
         }
 
-        
+
 
         .g-recaptcha {
             display: flex;
@@ -186,16 +189,16 @@
             &--button {
                 text-align: center;
                 display: block;
-    
+
                 .img {
                     width: 50px;
                     float: left;
                     text-align: left;
                     display: flex;
                     align-items: center;
-    
+
                     img {
-                        height: 16px;    
+                        height: 16px;
                     }
 
                     @media (max-width: 500px) {
@@ -205,12 +208,12 @@
                         }
                     }
                 }
-    
+
                 &.google {
                     border: var(--mc-border-hairline) var(--mc-low-500);
                     color: var(--mc-low-700);
                 }
-    
+
                 &.govbr {
                     border: var(--mc-border-hairline) #1351B4;
                     background-color: #1351B4;
@@ -223,7 +226,7 @@
                         font-size: 13px;
                     }
                 }
-            }   
+            }
         }
 
         .term {
@@ -231,14 +234,14 @@
 
             /* entire scrollbar */
             &::-webkit-scrollbar {
-                width: 6px; 
+                width: 6px;
             }
-            
+
             /* tracking area */
             &::-webkit-scrollbar-track {
                 background: unset;
             }
-            
+
             /* scroll thumb */
             &::-webkit-scrollbar-thumb {
                 background-color: #6C6C6C;
@@ -353,26 +356,26 @@
             border-radius: var(--mc-border-radius-sm);
         }
 
-        &::-webkit-progress-value {                       
+        &::-webkit-progress-value {
             border-radius: var(--mc-border-radius-sm);
             transition: 1s;
         }
 
         &.fraco {
             &::-webkit-progress-value {
-                background: red;    
+                background: red;
             }
         }
 
         &.medio {
             &::-webkit-progress-value {
-                background: yellow;   
+                background: yellow;
             }
         }
 
         &.forte {
             &::-webkit-progress-value {
-                background: green;    
+                background: green;
             }
         }
     }

From 5bcc960023ee7ac772e92e000c887013468baf12 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 1 Apr 2025 15:16:13 +0000
Subject: [PATCH 26/36] =?UTF-8?q?Estiliza=C3=A7=C3=A3o=20de=20mensagens=20?=
 =?UTF-8?q?de=20erro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets-src/sass/4-components/_c-login-govbr.scss |  5 +++++
 components/login-govbr/template.php              | 15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index bc9f576..6f99cb6 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -1,12 +1,17 @@
 @use '../1-settings/s-mixins' as *;
 
 .login-govbr {
+
     &__content {
         display: grid;
         gap: 20px;
         max-width: size(520);
     }
 
+    &__error {
+        margin-top: size(16);
+    }
+
     .button.govbr {
         align-items: center;
         background-color: #1351b4;
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 0ee1d64..99d6bc8 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -81,18 +81,13 @@
                 </a>
             </div>
 
-            <div>
-                <?php if($cpf_diferente): ?>
-                    <mc-alert class="col-12" type="warning">
+            <?php if($cpf_diferente || $cpf_duplicado): ?>
+                <div class="login-govbr__error">
+                    <mc-alert class="col-12" type="danger">
                         <?= $message_error ?>
                     </mc-alert>
-
-                <?php elseif($cpf_duplicado): ?>
-                    <mc-alert class="col-12" type="warning">
-                        <?= $message_error ?>
-                    </mc-alert>
-                <?php endif; ?>
-            </div>
+                </div>
+            <?php endif; ?>
         </template>
     </mc-modal>
 </div>
\ No newline at end of file

From c6079d8facf020b55452dacc27130d8ce8dddb21 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Tue, 1 Apr 2025 13:03:50 -0300
Subject: [PATCH 27/36] =?UTF-8?q?Corrige=20redirecionamento=20de=20erro=20?=
 =?UTF-8?q?quando=20est=C3=A1=20na=20single=20ou=20edit=20do=20agente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Provider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Provider.php b/Provider.php
index 8174ee1..38b473e 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1397,7 +1397,8 @@ public function processResponse(){
                         unset($_COOKIE['errorRedirectLocation']);
 
                         if($cookie['isAuth']) {
-                            header('Location: '. $app->createUrl($cookie['controller'], $cookie['action']));
+                            $params = $cookie['controller'] == 'agent' ? ['id' => $user->profile->id] : [];
+                            header('Location: ' . $app->createUrl($cookie['controller'], $cookie['action'], $params));
                             exit;
                         } else {
                             session_unset();

From 5c2bbff2cdd6da8451e70a03232f79bee0909a91 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 1 Apr 2025 18:41:20 +0000
Subject: [PATCH 28/36] =?UTF-8?q?Corrige=20estiliza=C3=A7=C3=A3o=20das=20m?=
 =?UTF-8?q?ensagens=20de=20erro=20do=20gov.br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sass/4-components/_c-login-govbr.scss      |  5 +++++
 components/login-govbr/template.php            | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 6f99cb6..3b3f6e6 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -10,6 +10,11 @@
 
     &__error {
         margin-top: size(16);
+        width: 100%;
+
+        a {
+            color: inherit;
+        }
     }
 
     .button.govbr {
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index 99d6bc8..ff2c877 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -80,14 +80,14 @@
                     {{ binding ? text('Vincular conta gov.br') : text('Entrar com gov.br') }}
                 </a>
             </div>
-
-            <?php if($cpf_diferente || $cpf_duplicado): ?>
-                <div class="login-govbr__error">
-                    <mc-alert class="col-12" type="danger">
-                        <?= $message_error ?>
-                    </mc-alert>
-                </div>
-            <?php endif; ?>
         </template>
     </mc-modal>
-</div>
\ No newline at end of file
+</div>
+
+<?php if($cpf_diferente || $cpf_duplicado): ?>
+    <div class="login-govbr__error col-12">
+        <mc-alert class="col-12" type="danger">
+            <?= $message_error ?>
+        </mc-alert>
+    </div>
+<?php endif; ?>

From 2dd437a5a5aa2140dabf6880b8c4fc4ea490a1d0 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 1 Apr 2025 17:10:40 -0300
Subject: [PATCH 29/36] =?UTF-8?q?Exibe=20o=20bot=C3=A3o=20de=20vincula?=
 =?UTF-8?q?=C3=A7=C3=A3o=20gov.br=20no=20painel=20de=20Contas=20e=20Privac?=
 =?UTF-8?q?idade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/parts/govbr/govbr-data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index 2444f48..b5ead62 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -18,7 +18,7 @@
 ');
 ?>
 
-<?php if (!$current_user->is('guest') && $this->controller->requestedEntity->id == $current_user->profile->id):
+<?php if (!$current_user->is('guest') && ($this->controller->id === 'panel' || $this->controller->requestedEntity->id == $current_user->profile->id)):
     if ($has_govbr_seal): ?>
         <div class="user-mail__config col-12" style="width: max-content">
             <h4 class="user-mail__config-title bold"><?= i::__('gov.br') ?></h4>

From a14d528148b932c5733e13c6a85c3dea5510a338 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 8 Apr 2025 20:12:56 +0000
Subject: [PATCH 30/36] Refatora template part govbr-data.php para futuro
 refinamento

---
 Plugin.php                         | 29 +++++++++++++++++++++++++----
 components/seal-govbr/script.js    |  3 +++
 components/seal-govbr/template.php | 17 +++++++++++++++++
 layouts/parts/govbr/govbr-data.php | 19 ++++---------------
 4 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 components/seal-govbr/script.js
 create mode 100644 components/seal-govbr/template.php

diff --git a/Plugin.php b/Plugin.php
index 6c922a3..b068725 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -34,25 +34,46 @@ public function _init() {
             $this->part('password/change-password');
         });
 
+        function userHasGovBrSeal($user) {
+            $app = App::i();
+            $seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
+            $seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $user->profile->id]);
+            return !empty($seal_relation);
+        }
+
         $app->hook('template(panel.<<my-account|user-detail>>.user-mail):end ', function() use ($app) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $this->part('govbr/govbr-data');
+                $current_user = $app->user;
+                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $this->part('govbr/govbr-data', [
+                    'current_user' => $current_user,
+                    'has_govbr_seal' => $has_govbr_seal,
+                ]);
             }
         });
 
         $app->hook('template(agent.single.single1-entity-info-mc-share-links):before', function() use ($app) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $this->part('govbr/govbr-data');
+                $current_user = $app->user;
+                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $this->part('govbr/govbr-data', [
+                    'current_user' => $current_user,
+                    'has_govbr_seal' => $has_govbr_seal,
+                ]);
             }
         });
 
         $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $this->part('govbr/govbr-data');
-            }
+                $current_user = $app->user;
+                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $this->part('govbr/govbr-data', [
+                    'current_user' => $current_user,
+                    'has_govbr_seal' => $has_govbr_seal,
+                ]);            }
         });
 
         $app->hook('entity(User).permissionsList,doctrine.emum(permission_action).values', function (&$permissions) {
diff --git a/components/seal-govbr/script.js b/components/seal-govbr/script.js
new file mode 100644
index 0000000..6c54d77
--- /dev/null
+++ b/components/seal-govbr/script.js
@@ -0,0 +1,3 @@
+app.component('seal-govbr', {
+    template: $TEMPLATES['seal-govbr'],
+});
diff --git a/components/seal-govbr/template.php b/components/seal-govbr/template.php
new file mode 100644
index 0000000..2bee31f
--- /dev/null
+++ b/components/seal-govbr/template.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @var \MapasCulturais\Themes\BaseV2\Theme $this
+ * @var \MapasCulturais\App $app
+ *
+ */
+
+use MapasCulturais\i;
+?>
+
+<div class="user-mail__config seal-govbr">
+    <h4 class="user-mail__config-title bold"><?= i::__('gov.br') ?></h4>
+    <div class="user-mail__config-content">
+        <mc-icon name="check" class="success__color"></mc-icon>
+        <span><?= i::__('Usuário vinculado ao gov.br') ?></span>
+    </div>
+</div>
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index b5ead62..1019b59 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -2,32 +2,21 @@
 /**
  * @var \MapasCulturais\Themes\BaseV2\Theme $this
  * @var \MapasCulturais\App $app
- *
  */
 
 use MapasCulturais\i;
 
-$current_user = $app->user;
-$configs = json_encode($app->config['auth.config']);
-$seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
-$seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $current_user->profile->id]);
-$has_govbr_seal = $seal_relation ? true : false;
-
 $this->import('
     login-govbr
+    seal-govbr
 ');
 ?>
 
 <?php if (!$current_user->is('guest') && ($this->controller->id === 'panel' || $this->controller->requestedEntity->id == $current_user->profile->id)):
     if ($has_govbr_seal): ?>
-        <div class="user-mail__config col-12" style="width: max-content">
-            <h4 class="user-mail__config-title bold"><?= i::__('gov.br') ?></h4>
-            <div class="user-mail__config-content">
-                <mc-icon name="check" class="success__color"></mc-icon>
-                <span><?= i::__('Usuário vinculado ao gov.br') ?></span>
-            </div>
-        </div>
+        <seal-govbr></seal-govbr>
     <?php else: ?>
+        <?php $configs = json_encode($app->config['auth.config']); ?>
         <login-govbr config='<?= $configs; ?>' :binding='true' small></login-govbr>
     <?php endif;
-endif; ?>
\ No newline at end of file
+endif; ?>

From b29cab86e5570f19b6162c297b30b9b971ed1047 Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 8 Apr 2025 20:17:39 +0000
Subject: [PATCH 31/36] Refatora template part govbr-data.php para futuro
 refinamento

---
 Plugin.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index b068725..ece6513 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -14,6 +14,7 @@ class Plugin extends \MapasCulturais\Plugin {
 
     public function _init() {
         $app = App::i();
+        $plugin = $this;
 
         // register translation text domain
         i::load_textdomain( 'multipleLocal', __DIR__ . "/translations" );
@@ -34,18 +35,11 @@ public function _init() {
             $this->part('password/change-password');
         });
 
-        function userHasGovBrSeal($user) {
-            $app = App::i();
-            $seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
-            $seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $user->profile->id]);
-            return !empty($seal_relation);
-        }
-
-        $app->hook('template(panel.<<my-account|user-detail>>.user-mail):end ', function() use ($app) {
+        $app->hook('template(panel.<<my-account|user-detail>>.user-mail):end ', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
                 $current_user = $app->user;
-                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
                 $this->part('govbr/govbr-data', [
                     'current_user' => $current_user,
                     'has_govbr_seal' => $has_govbr_seal,
@@ -53,11 +47,11 @@ function userHasGovBrSeal($user) {
             }
         });
 
-        $app->hook('template(agent.single.single1-entity-info-mc-share-links):before', function() use ($app) {
+        $app->hook('template(agent.single.single1-entity-info-mc-share-links):before', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
                 $current_user = $app->user;
-                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
                 $this->part('govbr/govbr-data', [
                     'current_user' => $current_user,
                     'has_govbr_seal' => $has_govbr_seal,
@@ -65,11 +59,11 @@ function userHasGovBrSeal($user) {
             }
         });
 
-        $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app) {
+        $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
             if ($app->config['auth.config']['strategies']['govbr']['visible']) {
                 $current_user = $app->user;
-                $has_govbr_seal = userHasGovBrSeal($current_user);
+                $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
                 $this->part('govbr/govbr-data', [
                     'current_user' => $current_user,
                     'has_govbr_seal' => $has_govbr_seal,
@@ -146,4 +140,11 @@ public function register() {
             'default' => false
         ]);
     }
+
+    public function hasGovBrSeal($user) {
+        $app = App::i();
+        $seal = $app->repo('Seal')->find($app->config['auth.config']['strategies']['govbr']['applySealId']);
+        $seal_relation = $app->repo('SealRelation')->findOneBy(['seal' => $seal, 'agent' => $user->profile->id]);
+        return !empty($seal_relation);
+    }
 }

From f3feef5ffbea2271990b9980f17b29a170d82a4a Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Tue, 8 Apr 2025 20:37:19 +0000
Subject: [PATCH 32/36] =?UTF-8?q?Refatora=20autentica=C3=A7=C3=A3o=20fora?=
 =?UTF-8?q?=20do=20govbr-data.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php                         | 34 ++++++++++++++----------------
 layouts/parts/govbr/govbr-data.php | 14 ++++++------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Plugin.php b/Plugin.php
index ece6513..2785a3e 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -37,37 +37,35 @@ public function _init() {
 
         $app->hook('template(panel.<<my-account|user-detail>>.user-mail):end ', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
-            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $current_user = $app->user;
+            $current_user = $app->user;
+            $can_seal = !$current_user->is('guest');
+
+            if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [
-                    'current_user' => $current_user,
-                    'has_govbr_seal' => $has_govbr_seal,
-                ]);
+                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
             }
         });
 
         $app->hook('template(agent.single.single1-entity-info-mc-share-links):before', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
-            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $current_user = $app->user;
+            $current_user = $app->user;
+            $can_seal = !$current_user->is('guest') && $this->controller->requestedEntity->id == $current_user->profile->id;
+
+            if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [
-                    'current_user' => $current_user,
-                    'has_govbr_seal' => $has_govbr_seal,
-                ]);
+                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
             }
         });
 
         $app->hook('template(agent.edit.edit1-entity-info-site):after', function() use ($app, $plugin) {
             /** @var \MapasCulturais\Theme $this */
-            if ($app->config['auth.config']['strategies']['govbr']['visible']) {
-                $current_user = $app->user;
+            $current_user = $app->user;
+            $can_seal = !$current_user->is('guest') && $this->controller->requestedEntity->id == $current_user->profile->id;
+
+            if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [
-                    'current_user' => $current_user,
-                    'has_govbr_seal' => $has_govbr_seal,
-                ]);            }
+                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
+            }
         });
 
         $app->hook('entity(User).permissionsList,doctrine.emum(permission_action).values', function (&$permissions) {
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index 1019b59..aa16afd 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -12,11 +12,9 @@
 ');
 ?>
 
-<?php if (!$current_user->is('guest') && ($this->controller->id === 'panel' || $this->controller->requestedEntity->id == $current_user->profile->id)):
-    if ($has_govbr_seal): ?>
-        <seal-govbr></seal-govbr>
-    <?php else: ?>
-        <?php $configs = json_encode($app->config['auth.config']); ?>
-        <login-govbr config='<?= $configs; ?>' :binding='true' small></login-govbr>
-    <?php endif;
-endif; ?>
+<?php if ($has_govbr_seal): ?>
+    <seal-govbr></seal-govbr>
+<?php else: ?>
+    <?php $configs = json_encode($app->config['auth.config']); ?>
+    <login-govbr config='<?= $configs; ?>' :binding='true' small></login-govbr>
+<?php endif; ?>

From f3100817203a5fc7eec499c92ae89b220e55880c Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Wed, 9 Apr 2025 10:44:52 -0300
Subject: [PATCH 33/36] =?UTF-8?q?Melhora=20estiliza=C3=A7=C3=A3o=20dos=20b?=
 =?UTF-8?q?ot=C3=B5es=20do=20gov.br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plugin.php                                    | 18 ++++++++++---
 .../sass/4-components/_c-login-govbr.scss     | 13 +++++++---
 .../sass/4-components/_c-seal-govbr.scss      | 14 +++++++++++
 assets-src/sass/plugin-MultiplLocalAuth.scss  |  1 +
 components/login-govbr/template.php           | 25 +++++++++----------
 components/seal-govbr/template.php            |  2 +-
 layouts/parts/govbr/govbr-data.php            |  7 ++++--
 7 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 assets-src/sass/4-components/_c-seal-govbr.scss

diff --git a/Plugin.php b/Plugin.php
index 2785a3e..a0ec01c 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -42,7 +42,11 @@ public function _init() {
 
             if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
+                $this->part('govbr/govbr-data', [
+                    'has_govbr_seal' => $has_govbr_seal,
+                    'button_class' => 'login-govbr--panel',
+                    'seal_class' => 'seal-govbr--panel',
+                ]);
             }
         });
 
@@ -53,7 +57,11 @@ public function _init() {
 
             if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
+                $this->part('govbr/govbr-data', [
+                    'has_govbr_seal' => $has_govbr_seal,
+                    'button_class' => 'col-12',
+                    'seal_class' => 'col-12',
+                ]);
             }
         });
 
@@ -64,7 +72,11 @@ public function _init() {
 
             if ($app->config['auth.config']['strategies']['govbr']['visible'] && $can_seal) {
                 $has_govbr_seal = $plugin->hasGovBrSeal($current_user);
-                $this->part('govbr/govbr-data', [ 'has_govbr_seal' => $has_govbr_seal ]);
+                $this->part('govbr/govbr-data', [
+                    'has_govbr_seal' => $has_govbr_seal,
+                    'button_class' => 'col-12',
+                    'seal_class' => 'col-12',
+                ]);
             }
         });
 
diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 3b3f6e6..205514e 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -23,9 +23,8 @@
         color: #fff;
         display: flex;
         justify-content: center;
-        min-width: max-content;
         padding: 8px 16px;
-        width: 100%;
+        width: fit-content;
 
         > img {
             width: 50px;
@@ -33,7 +32,15 @@
         }
     }
 
-    &.modal__content {
+    &--panel {
+        margin: size(16) 0;
+
+        .button.govbr {
+            width: fit-content;
+        }
+    }
+
+    &.modal__content, .modal__content {
 
         .button.govbr {
             width: 100%;
diff --git a/assets-src/sass/4-components/_c-seal-govbr.scss b/assets-src/sass/4-components/_c-seal-govbr.scss
new file mode 100644
index 0000000..9ec4e57
--- /dev/null
+++ b/assets-src/sass/4-components/_c-seal-govbr.scss
@@ -0,0 +1,14 @@
+@use '../1-settings/s-mixins' as *;
+
+.seal-govbr {
+
+    &__content {
+        align-items: center;
+        display: flex;
+        gap: 1ex;
+    }
+
+    &--panel {
+        margin: size(16) 0;
+    }
+}
diff --git a/assets-src/sass/plugin-MultiplLocalAuth.scss b/assets-src/sass/plugin-MultiplLocalAuth.scss
index f3d1b30..6fff0ad 100755
--- a/assets-src/sass/plugin-MultiplLocalAuth.scss
+++ b/assets-src/sass/plugin-MultiplLocalAuth.scss
@@ -18,6 +18,7 @@
 @import '4-components/c-create-account';
 @import '4-components/c-login-govbr';
 @import '4-components/c-login';
+@import '4-components/c-seal-govbr';
 
 
 /* ----- 5: AREAS ------- */
diff --git a/components/login-govbr/template.php b/components/login-govbr/template.php
index ff2c877..273afbb 100644
--- a/components/login-govbr/template.php
+++ b/components/login-govbr/template.php
@@ -74,20 +74,19 @@
         </template>
 
         <template #button="modal">
-            <div>
-                <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="{'button--sm' : small, 'button--large': large}" @click="modal.open()">
-                    <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" alt="">
-                    {{ binding ? text('Vincular conta gov.br') : text('Entrar com gov.br') }}
-                </a>
-            </div>
+            <a v-if="configs.strategies.govbr?.visible" class="button button--icon button--md govbr" :class="{'button--sm' : small, 'button--large': large}" @click="modal.open()">
+                <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.svg'); ?>" alt="">
+                {{ binding ? text('Vincular conta gov.br') : text('Entrar com gov.br') }}
+            </a>
+
+            <?php if($cpf_diferente || $cpf_duplicado): ?>
+                <div class="login-govbr__error">
+                    <mc-alert type="danger">
+                        <?= $message_error ?>
+                    </mc-alert>
+                </div>
+            <?php endif; ?>
         </template>
     </mc-modal>
 </div>
 
-<?php if($cpf_diferente || $cpf_duplicado): ?>
-    <div class="login-govbr__error col-12">
-        <mc-alert class="col-12" type="danger">
-            <?= $message_error ?>
-        </mc-alert>
-    </div>
-<?php endif; ?>
diff --git a/components/seal-govbr/template.php b/components/seal-govbr/template.php
index 2bee31f..e6a8da7 100644
--- a/components/seal-govbr/template.php
+++ b/components/seal-govbr/template.php
@@ -10,7 +10,7 @@
 
 <div class="user-mail__config seal-govbr">
     <h4 class="user-mail__config-title bold"><?= i::__('gov.br') ?></h4>
-    <div class="user-mail__config-content">
+    <div class="user-mail__config-content seal-govbr__content">
         <mc-icon name="check" class="success__color"></mc-icon>
         <span><?= i::__('Usuário vinculado ao gov.br') ?></span>
     </div>
diff --git a/layouts/parts/govbr/govbr-data.php b/layouts/parts/govbr/govbr-data.php
index aa16afd..d0b9295 100644
--- a/layouts/parts/govbr/govbr-data.php
+++ b/layouts/parts/govbr/govbr-data.php
@@ -10,11 +10,14 @@
     login-govbr
     seal-govbr
 ');
+
+$button_class = $button_class ?? '';
+$seal_class = $seal_class ?? '';
 ?>
 
 <?php if ($has_govbr_seal): ?>
-    <seal-govbr></seal-govbr>
+    <seal-govbr class="<?= $seal_class ?>"></seal-govbr>
 <?php else: ?>
     <?php $configs = json_encode($app->config['auth.config']); ?>
-    <login-govbr config='<?= $configs; ?>' :binding='true' small></login-govbr>
+    <login-govbr class="<?= $button_class ?>" config='<?= $configs; ?>' binding small></login-govbr>
 <?php endif; ?>

From 1f6fec481056050c8687ada5b5f9c6152f23621a Mon Sep 17 00:00:00 2001
From: leopiccionia <leopiccionia@gmail.com>
Date: Wed, 9 Apr 2025 15:01:01 -0300
Subject: [PATCH 34/36] =?UTF-8?q?Corre=C3=A7=C3=A3o=20do=20bot=C3=A3o=20go?=
 =?UTF-8?q?v.br=20na=20p=C3=A1gina=20de=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets-src/sass/4-components/_c-login-govbr.scss |  9 ++++++---
 components/login-govbr/script.js                 | 10 ++++++++--
 components/login/template.php                    |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/assets-src/sass/4-components/_c-login-govbr.scss b/assets-src/sass/4-components/_c-login-govbr.scss
index 205514e..4f6e282 100644
--- a/assets-src/sass/4-components/_c-login-govbr.scss
+++ b/assets-src/sass/4-components/_c-login-govbr.scss
@@ -24,11 +24,14 @@
         display: flex;
         justify-content: center;
         padding: 8px 16px;
-        width: fit-content;
+
+        &:not(.button--large) {
+            width: fit-content;
+        }
 
         > img {
-            width: 50px;
-            height: 100%;
+            height: 1em;
+            width: auto;
         }
     }
 
diff --git a/components/login-govbr/script.js b/components/login-govbr/script.js
index 4cb49b9..a42c9f0 100644
--- a/components/login-govbr/script.js
+++ b/components/login-govbr/script.js
@@ -10,8 +10,14 @@ app.component('login-govbr', {
             type: Boolean,
             default: false,
         },
-        small: Boolean,
-        large: Boolean,
+        small: {
+            type: Boolean,
+            default: false,
+        },
+        large: {
+            type: Boolean,
+            default: false,
+        },
     },
 
     setup() {
diff --git a/components/login/template.php b/components/login/template.php
index b6fdf25..e32b0f3 100644
--- a/components/login/template.php
+++ b/components/login/template.php
@@ -51,7 +51,7 @@
                         </div>
 
                         <div class="login__social-buttons" :class="{'login__social-buttons--multiple': multiple}">
-                            <login-govbr :config="config"></login-govbr>
+                            <login-govbr :config="config" large></login-govbr>
 
                             <!-- <a v-if="configs.strategies.govbr?.visible" class="social-login--button button button--icon button--large button--md govbr" href="<?php echo $app->createUrl('auth', 'govbr') ?>">
                                 <div class="img"> <img height="16" class="br-sign-in-img" src="<?php $this->asset('img/govbr-white.png'); ?>" /> </div>

From f995204fdba8d496b8a91d16ea04c16a05c671db Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 12 May 2025 15:04:55 -0300
Subject: [PATCH 35/36] =?UTF-8?q?Caso=20os=20campos=20obrigat=C3=B3rios=20?=
 =?UTF-8?q?estejam=20vazios,=20agente=20ter=C3=A1=20o=20status=20de=20rasc?=
 =?UTF-8?q?unho=20(Ref.:=20#83)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Provider.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Provider.php b/Provider.php
index 38b473e..ad82a1f 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1533,7 +1533,18 @@ protected function _createUser($response) {
                 $agent->$metadataFieldCpf =  $cpf;
             }
 
-            $agent->status = (int) $config['statusCreateAgent'] ?? '0';
+            // Valida se algum campo obrigatório não foi preenchido
+            if (
+                empty($agent->$metadataFieldCpf) ||
+                empty($agent->name) ||
+                empty($agent->shortDescription) ||
+                (isset($agent->terms['area']) && $agent->terms['area'] === [])
+            ) {
+                $agent->status = 0;
+            } else {
+                $agent->status = (int) $config['statusCreateAgent'] ?? '0';
+            }
+            
             $agent->emailPrivado = $user->email;
             
             $agent->save();

From 0af7facc021d1d9b45bdf5a977245b1a2df4ef58 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Thu, 15 May 2025 16:04:59 -0300
Subject: [PATCH 36/36] =?UTF-8?q?Melhoria=20no=20tratamento=20de=20erros?=
 =?UTF-8?q?=20ao=20criar=20um=20novo=20usu=C3=A1rio=20e=20seu=20agente=20i?=
 =?UTF-8?q?ndividual?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Provider.php | 174 +++++++++++++++++++++++++++------------------------
 1 file changed, 91 insertions(+), 83 deletions(-)

diff --git a/Provider.php b/Provider.php
index ad82a1f..bbd6dc8 100644
--- a/Provider.php
+++ b/Provider.php
@@ -1466,107 +1466,115 @@ function authenticateUser(Entities\User $user) {
     }
     
     protected function _createUser($response) {
-        $app = App::i();
+        try {
+            $app = App::i();
 
-        $app->disableAccessControl();
+            $app->disableAccessControl();
 
-        $config = $this->_config;
+            $config = $this->_config;
 
-        $user = null;
-        if($response && $provider_class = $response['auth']['provider']."Strategy"){
-            if(method_exists($provider_class, "newAccountCheck")){
-                if($user = $provider_class::newAccountCheck($response)){
-                    $agent = $user->profile;
+            $user = null;
+            if($response && $provider_class = $response['auth']['provider']."Strategy"){
+                if(method_exists($provider_class, "newAccountCheck")){
+                    if($user = $provider_class::newAccountCheck($response)){
+                        $agent = $user->profile;
+                    }
                 }
             }
-        }
-
-        if(!$user){
-            // cria o usuário
-            $user = new Entities\User;
-            $user->authProvider = $response['auth']['provider'];
-            $user->authUid = $response['auth']['uid'];
-            $user->email = $response['auth']['info']['email'];
 
-            $app->em->persist($user);
-            
-            // cria um agente do tipo user profile para o usuário criado acima
-            $agent = new Entities\Agent($user);
+            if(!$user){
+                $app->em->beginTransaction();
 
-            if(isset($response['auth']['info']['name'])){
-                $agent->name = $response['auth']['info']['name'];
-            }
-            elseif(isset($response['auth']['info']['first_name']) && isset($response['auth']['info']['last_name'])){
-                $agent->name = $response['auth']['info']['first_name'] . ' ' . $response['auth']['info']['last_name'];
-            }
-            elseif(isset($response['auth']['agentData']['name'])){
-                $agent->name = $response['auth']['agentData']['name'];
-            }
-            else{
-                $agent->name = '';
-            }
-            
-            if(isset($response['auth']['info']['phone_number'])){
-                $metadataFieldPhone = $this->getMetadataFieldPhone(); 
-                $metadataFieldPhone = $this->getMetadataFieldPhone(); 
-                $metadataFieldPhone = $this->getMetadataFieldPhone(); 
-                $agent->$metadataFieldPhone = $response['auth']['info']['phone_number'];
-            }
+                // cria o usuário
+                $user = new Entities\User;
+                $user->authProvider = $response['auth']['provider'];
+                $user->authUid = $response['auth']['uid'];
+                $user->email = $response['auth']['info']['email'];
 
-            if(isset($response['auth']['agentData']['shortDescription'])){
-                $agent->shortDescription = $response['auth']['agentData']['shortDescription'];
-            }
+                $app->em->persist($user);
+                
+                // cria um agente do tipo user profile para o usuário criado acima
+                $agent = new Entities\Agent($user);
+
+                if(isset($response['auth']['info']['name'])){
+                    $agent->name = $response['auth']['info']['name'];
+                } 
+                elseif(isset($response['auth']['info']['first_name']) && isset($response['auth']['info']['last_name'])){
+                    $agent->name = $response['auth']['info']['first_name'] . ' ' . $response['auth']['info']['last_name'];
+                }
+                elseif(isset($response['auth']['agentData']['name'])){
+                    $agent->name = $response['auth']['agentData']['name'];
+                }
+                else{
+                    $agent->name = '';
+                }
+                
+                if(isset($response['auth']['info']['phone_number'])){
+                    $metadataFieldPhone = $this->getMetadataFieldPhone(); 
+                    $metadataFieldPhone = $this->getMetadataFieldPhone(); 
+                    $metadataFieldPhone = $this->getMetadataFieldPhone(); 
+                    $agent->$metadataFieldPhone = $response['auth']['info']['phone_number'];
+                }
 
-            if(isset($response['auth']['agentData']['terms:area'])){
-                $agent->terms['area']  = $response['auth']['agentData']['terms:area'];
-            }
+                if(isset($response['auth']['agentData']['shortDescription'])){
+                    $agent->shortDescription = $response['auth']['agentData']['shortDescription'];
+                }
 
-            if(isset($response['auth']['info']['phone_number'])){
-                $metadataFieldPhone = $this->getMetadataFieldPhone();  
-                $agent->setMetadata($metadataFieldPhone, $response['auth']['info']['phone_number']);
-            }
+                if(isset($response['auth']['agentData']['terms:area'])){
+                    $agent->terms['area']  = $response['auth']['agentData']['terms:area'];
+                }
 
-            //cpf
-            $cpf = (isset($response['auth']['info']['cpf']) && $response['auth']['info']['cpf'] != "") ? $this->mask($response['auth']['info']['cpf'],'###.###.###-##') : null;
-            if(!empty($cpf)){
-                $metadataFieldCpf = $this->getMetadataFieldCpfFromConfig();   
-                $agent->$metadataFieldCpf =  $cpf;
-            }
+                if(isset($response['auth']['info']['phone_number'])){
+                    $metadataFieldPhone = $this->getMetadataFieldPhone();  
+                    $agent->setMetadata($metadataFieldPhone, $response['auth']['info']['phone_number']);
+                }
 
-            // Valida se algum campo obrigatório não foi preenchido
-            if (
-                empty($agent->$metadataFieldCpf) ||
-                empty($agent->name) ||
-                empty($agent->shortDescription) ||
-                (isset($agent->terms['area']) && $agent->terms['area'] === [])
-            ) {
-                $agent->status = 0;
-            } else {
-                $agent->status = (int) $config['statusCreateAgent'] ?? '0';
-            }
-            
-            $agent->emailPrivado = $user->email;
-            
-            $agent->save();
-            $app->em->flush();
+                //cpf
+                $cpf = (isset($response['auth']['info']['cpf']) && $response['auth']['info']['cpf'] != "") ? $this->mask($response['auth']['info']['cpf'],'###.###.###-##') : null;
+                if(!empty($cpf)){
+                    $metadataFieldCpf = $this->getMetadataFieldCpfFromConfig();   
+                    $agent->$metadataFieldCpf =  $cpf;
+                }
 
-            $user->profile = $agent;
+                // Valida se algum campo obrigatório não foi preenchido
+                if (
+                    empty($agent->$metadataFieldCpf) ||
+                    empty($agent->name) ||
+                    empty($agent->shortDescription) ||
+                    (isset($agent->terms['area']) && $agent->terms['area'] === [])
+                ) {
+                    $agent->status = 0;
+                } else {
+                    $agent->status = (int) $config['statusCreateAgent'] ?? '0';
+                }
             
-            $user->save(true);
+                $agent->emailPrivado = $user->email;
+                $agent->save();
+                $app->em->flush();
+                
+                $user->profile = $agent;
+                $user->save(true);
+                $app->em->flush();
+                
+                $user->createPermissionsCacheForUsers([$user]);
+                $agent->createPermissionsCacheForUsers([$user]);
 
-            $user->createPermissionsCacheForUsers([$user]);
-            $agent->createPermissionsCacheForUsers([$user]);
-        }
+                $app->em->commit();
+            }
         
-        $app->enableAccessControl();
-        $redirectUrl = $agent->status == Agent::STATUS_DRAFT ? $agent->editUrl : $this->getRedirectPath();
-        $app->applyHookBoundTo($this, 'auth.createUser:redirectUrl', [&$redirectUrl]);
+            $app->enableAccessControl();
+            $redirectUrl = $agent->status == Agent::STATUS_DRAFT ? $agent->editUrl : $this->getRedirectPath();
+            $app->applyHookBoundTo($this, 'auth.createUser:redirectUrl', [&$redirectUrl]);
 
-        if ($redirectUrl) {
-            $this->_setRedirectPath($redirectUrl);
+            if ($redirectUrl) {
+                $this->_setRedirectPath($redirectUrl);
+            }
+            
+            return $user;
+        } catch(\Exception $e) {
+            $app->em->rollback();
+            throw $e;
         }
-        
-        return $user;
     }
 
     function mask($val, $mask) {