Forgot password not working yet, the rest needs

testing

Forgot password not working yet, the rest needs
testing
Evandro Junior
1 parent d09a8c8f
Showing 2 changed files with 21 additions and 28 deletions Show diff stats
index.html
js/main.js
@@ -460,14 +460,7 @@
           </div>
         </div>
         <div class="row">
-          <div id="serpro_captcha" class="captcha col-sm-12">
-          </div>
-          <div class="captcha col-sm-12">
-            Digite os caracteres acima:
-          </div>
-          <div class="captcha col-sm-6">
-            <input type="text" name="captcha_text" id="captcha_text">
-          </div>
+          <div id="g-recaptcha"></div>
         </div>
         <div class="row">
           <div class="col-sm-4">
@@ -503,13 +496,8 @@
             <input id="user_oauth_providers" name="oauth_providers" type="hidden">
             <input id="user_oauth_signup_token" name="oauth_signup_token" type="hidden">
           </div>
-          <div id="serpro_captcha" class="captcha col-sm-12">
-          </div>
-          <div class="captcha col-sm-12">
-            Digite os caracteres acima:
-          </div>
-          <div class="captcha col-sm-6">
-            <input type="text" name="captcha_text" id="captcha_text">
+          <div id="captcha" class="captcha col-sm-12">
+            <div id="g-recaptcha"></div>
           </div>
           <div id="terms-of-use-box" class="col-sm-12">
             <div class="checkbox">
@@ -623,7 +611,7 @@
       loadRequireJS();
     </script>
-    <script src="http://captcha2.servicoscorporativos.serpro.gov.br/js/captcha.serpro.gov.br.js"></script>
+    <script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js" async defer></script>
   </body>
@@ -70,6 +70,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
     }
   }
+  window.recaptchaSiteKey = recaptchaSiteKey;
   var BARRA_ADDED = false;
   var HIDE_BARRA_DO_GOVERNO = false;
@@ -891,7 +892,9 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       reloadCaptcha: function(element) {
         var $element = $(element);
         if($element.data('captcha')){
-          $element.data('captcha').recarregar();
+          Recaptcha.reload();
+          //Recaptcha.create(window.recaptchaSiteKey, $element.find('#g-recaptcha')[0], { lang : 'pt', theme: "clean", callback: Recaptcha.focus_response_field } );
+          //$element.data('captcha').recarregar();
         }
       },
       initCaptcha: function(element) {
@@ -899,13 +902,15 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         if($element.data('captcha')) return;
         $element.val('');
-        var oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();
-        $element.data('captcha', oCaptcha_serpro_gov_br);
-        oCaptcha_serpro_gov_br.clienteId = serpro_captcha_clienteId;
-        if(!localDevelopment) {
-          oCaptcha_serpro_gov_br.url = "/captchaserpro"
-        }
-        oCaptcha_serpro_gov_br.criarUI(element, 'css', 'serpro_captcha_component_', Main.guid());
+        // var oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();
+        // $element.data('captcha', oCaptcha_serpro_gov_br);
+        // oCaptcha_serpro_gov_br.clienteId = serpro_captcha_clienteId;
+        // if(!localDevelopment) {
+        //   oCaptcha_serpro_gov_br.url = "/captchaserpro"
+        // }
+        // oCaptcha_serpro_gov_br.criarUI(element, 'css', 'serpro_captcha_component_', Main.guid());
+        $element.find('#g-recaptcha').empty();
+        Recaptcha.create(window.recaptchaSiteKey, $element.find('#g-recaptcha')[0], { lang : 'pt', theme: "clean", callback: Recaptcha.focus_response_field } );
       },
       computeBoxHeight: function(){
         var hPerLineOnTitle = 25;
@@ -1401,7 +1406,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       loginForm.hide();
       $forgotPasswordForm.show();
-      Main.initCaptcha($forgotPasswordForm.find('#serpro_captcha')[0]);
+      Main.initCaptcha($forgotPasswordForm.find('#captcha')[0]);
       var $message = $forgotPasswordForm.find('.message');
       $message.html('');
@@ -1458,7 +1463,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       }).fail(function(data) {
         console.log(data.responseJSON);
-        Main.reloadCaptcha($forgotPasswordForm.find('#serpro_captcha')[0]);
+        Main.reloadCaptcha($forgotPasswordForm.find('#captcha')[0]);
         var $message = $forgotPasswordForm.find('.message');
         $message.html('Não foi possível requisitar a troca de senha para os dados informados.');
         $message.show();
@@ -1502,7 +1507,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       signupForm.find('#captcha_text').val('');
       signupForm.find('#user_terms_accepted').removeAttr('checked');
-      Main.initCaptcha(signupForm.find('#serpro_captcha')[0]);
+      Main.initCaptcha(signupForm.find('#captcha')[0]);
       e.preventDefault();
     });
@@ -1632,7 +1637,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
             })
         .fail(function (data) {
               var msg = '';
-              Main.reloadCaptcha($signupForm.find('#serpro_captcha')[0]);
+              Main.reloadCaptcha($signupForm.find('#captcha')[0]);
               if(data.responseJSON){
                 try{