From f572a08888cb75ea62a8014b2ec09d8577049110 Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Tue, 5 Mar 2019 15:44:48 +0900
Subject: [PATCH] Improved twitter login

---
 auth/twitter.go              | 15 ++++++++++++---
 pages/settings/accounts.pixy | 18 +++++++++---------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/auth/twitter.go b/auth/twitter.go
index de0266ae..a2442fbb 100644
--- a/auth/twitter.go
+++ b/auth/twitter.go
@@ -17,9 +17,11 @@ import (
 
 // TwitterUser is the user data we receive from Twitter
 type TwitterUser struct {
-	ID    string `json:"id_str"`
-	Email string `json:"email"`
-	Name  string `json:"name"`
+	ID          string `json:"id_str"`
+	Email       string `json:"email"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
+	ScreenName  string `json:"screen_name"`
 }
 
 // InstallTwitterAuth enables Twitter login for the app.
@@ -93,6 +95,7 @@ func InstallTwitterAuth(app *aero.Application) {
 
 		defer response.Body.Close()
 		body, _ := ioutil.ReadAll(response.Body)
+		fmt.Println(string(body))
 
 		// Construct a TwitterUser object
 		twUser := TwitterUser{}
@@ -113,6 +116,7 @@ func InstallTwitterAuth(app *aero.Application) {
 			user.ConnectTwitter(twUser.ID)
 
 			// Save in DB
+			user.Accounts.Twitter.Nick = twUser.ScreenName
 			user.Save()
 
 			// Log
@@ -145,6 +149,7 @@ func InstallTwitterAuth(app *aero.Application) {
 			// Add TwitterToUser reference
 			user.ConnectTwitter(twUser.ID)
 
+			user.Accounts.Twitter.Nick = twUser.ScreenName
 			user.LastLogin = arn.DateTimeUTC()
 			user.Save()
 
@@ -170,6 +175,10 @@ func InstallTwitterAuth(app *aero.Application) {
 		// Connect account to a Twitter account
 		user.ConnectTwitter(twUser.ID)
 
+		// Copy fields
+		user.Accounts.Twitter.Nick = twUser.ScreenName
+		user.Introduction = twUser.Description
+
 		// Save user object again with updated data
 		user.Save()
 
diff --git a/pages/settings/accounts.pixy b/pages/settings/accounts.pixy
index 8449968a..d327d9b9 100644
--- a/pages/settings/accounts.pixy
+++ b/pages/settings/accounts.pixy
@@ -51,16 +51,16 @@ component SettingsAccounts(user *arn.User)
 						Icon("circle-o")
 						span Not connected
 			
-			//- .widget-section.social-account
-			//- 	label(for="twitter") Twitter:
+			.widget-section.social-account
+				label(for="twitter") Twitter:
 
-			//- 	a#twitter.button.social-account-button(href="/auth/twitter", data-ajax="false")
-			//- 		if user.Accounts.Twitter.ID != ""
-			//- 			Icon("check")
-			//- 			span Connected
-			//- 		else
-			//- 			Icon("circle-o")
-			//- 			span Not connected
+				a#twitter.button.social-account-button(href="/auth/twitter", data-ajax="false")
+					if user.Accounts.Twitter.ID != ""
+						Icon("check")
+						span Connected
+					else
+						Icon("circle-o")
+						span Not connected
 
 		.widget.mountable
 			h3.widget-title