alterado para funcionar o signup pela rede social

Ábner Silva de Oliveira
1 parent e140c729
Showing 1 changed file with 21 additions and 10 deletions Show diff stats
js/main.js
@@ -45,7 +45,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
   //127.0.0.1  login.dialoga.gov.br
   //127.0.0.1  noosfero.com
   //Detects for localhost settings
-  var patt = new RegExp(':300[0-1]/|8080/');
+  var patt = new RegExp(':300[0-2]/');
   var localDevelopment = false;
   if(patt.test(window.location.href)){
@@ -62,13 +62,13 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/
       cat_saude = 23;
     } else { //ABNER
-      host = 'http://noosfero.com:3000';
+      host = 'http://local.abner.com:3002';
       dialoga_community = 105;
       proposal_discussion = '392'; //Evandro
       recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/
       cat_saude = 23;
     }
-  }
+  }
   var BARRA_ADDED = false;
@@ -93,13 +93,14 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
     function fillSignupForm(signupForm, user) {
       signupForm.find('#signup-user_email').val(user.email);
+      signupForm.find('#signup-user_email').attr('disabled', true);
       signupForm.find('#signup-user_name').val(user.login);
-      signupForm.find('#user_oauth_signup_token').val(user.oauth_signup_token);
+      signupForm.find('#user_oauth_signup_token').val(user.signup_token);
       signupForm.find('#user_oauth_providers').val(user.oauth_providers);
-      /*signupForm.find('div.password').hide();
+      signupForm.find('div.password').hide();
       signupForm.find('div.password-confirmation').hide();
       signupForm.find('#signup-user_password').attr('required', false);
-      signupForm.find('#user_password_confirmation').attr('required', false);*/
+      signupForm.find('#user_password_confirmation').attr('required', false);
     };
     return {
@@ -1325,7 +1326,12 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       signupForm.find('#user_password_confirmation').attr('required', true);
       loginForm.find('.message').hide();
-      signupForm.find('#serpro_captcha').empty();
+      signupForm.find('#serpro_captcha').val('');
+
+      signupForm.find('#signup-user_email').val('');
+      signupForm.find('#signup-user_email').attr('disabled', false);
+      signupForm.find('#signup-user_name').val('');
+
       var oCaptcha_serpro_gov_br;
       oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();
@@ -1373,11 +1379,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
       var hasPasswordConfirmation = true;
       var hasPasswordEquals = true;
-      //if(! isOAUTH){
+      if(! isOAUTH){
         hasPassword = $inputPassword && $inputPassword.val().length > 0;
         hasPasswordConfirmation = $inputPasswordConfirmation && $inputPasswordConfirmation.val().length > 0;
         hasPasswordEquals = $inputPassword.val() === $inputPasswordConfirmation.val();
-      //}
+      }
       var hasAcceptation = $inputAcceptation.val();
       var hasCaptcha = $inputCaptcha.val().length > 0;
@@ -1434,10 +1440,15 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         // show loading
         var $loading = $('.login-container .loading');
         $loading.show();
+        var signup_form_data = $signupForm.serialize();
+        if(! new RegExp('email=').test(signup_form_data)){
+          signup_form_data += "&email=" + $inputEmail.val();
+        }
         $.ajax({
           type: 'post',
+          contentType: 'application/x-www-form-urlencoded',
           url: host + '/api/v1/register',
-          data: $signupForm.serialize(),
+          data: signup_form_data,
         })
         .done(function (data){
               $signupForm.hide();