From 58f9d45f277a79b69cb4c9c76b257c724712b126 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Sat, 30 May 2015 19:06:58 -0300
Subject: [PATCH] Improve oauth login/signup

---
 index.html |  4 ++++
 js/main.js | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index ef6f1ac..7a07f4e 100644
--- a/index.html
+++ b/index.html
@@ -397,8 +397,12 @@
             <label for="user_password_confirmation" class="label">Confirme a senha:</label>
             <input id="user_password_confirmation" name="password_confirmation" type="password" placeholder="Confirme a senha">
           </div>
+          <div class="oauth-providers">
+            <input id="user_oauth_providers" name="oauth_providers" type="hidden">
+          </div>
           <div class="captcha col-sm-12">
             <div id="g-recaptcha"></div>
+          </div>
         </div>
         <div class="actions col-sm-12">
           <div class="row">
diff --git a/js/main.js b/js/main.js
index a0415b8..bad99cf 100644
--- a/js/main.js
+++ b/js/main.js
@@ -188,7 +188,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $('.talk-proposal-container').hide();
         },
 
-        loginCallback: function(loggedIn, token) {
+        loginCallback: function(loggedIn, token, user) {
           logged_in = loggedIn;
           $('.login .message').text('');
 
@@ -200,6 +200,16 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
             loginButton.siblings('.require-login .message').show();
             loginButton.siblings('.login-container').hide();
             $.cookie('_dialoga_session', Main.private_token);
+          } else if (user) {
+            var loginContainer = loginButton.siblings('.login-container');
+            loginContainer.show();
+            loginContainer.find('.new-user').click();
+            var signupForm = loginContainer.find('#signup-form');
+            signupForm.find("#user_email").val(user.email);
+            signupForm.find("#user_name").val(user.login);
+            signupForm.find("#user_oauth_providers").val(user.oauth_providers);
+            signupForm.find(".password").hide();
+            signupForm.find(".password-confirmation").hide();
           } else {
             loginButton.siblings('.require-login').hide();
             loginButton.siblings('.login-container').show();
@@ -714,11 +724,13 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
     $(document).on('click', '.new-user', function(e) {
       var loginForm = $(this).parents('#login-form');
       var signupForm = loginForm.siblings('#signup-form');
-      
+
       loginForm.hide();
       signupForm.show();
+      signupForm.find(".password").show();
+      signupForm.find(".password-confirmation").show();
       loginForm.find('.message').hide();
-      console.log(signupForm.find('#g-recaptcha')[0]);
+      signupForm.find('#g-recaptcha').empty();
       grecaptcha.render(signupForm.find('#g-recaptcha')[0], {'sitekey' : window.recaptchaSiteKey });
       e.preventDefault();
     })
@@ -785,7 +797,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
   window.addEventListener("message", function(ev) {
     if (ev.data.message === "oauthClientPluginResult") {
-      Main.loginCallback(ev.data.logged_in, ev.data.private_token);
+      Main.loginCallback(ev.data.logged_in, ev.data.private_token, ev.data.user);
       ev.source.close();
     }
   });
--
libgit2 0.21.2