UX of link account (Step 1)

options/locale/locale_en-US.ini

@@ -8,6 +8,7 @@ sign_in = Sign In
 sign_in_with = Sign In With
 sign_out = Sign Out
 sign_up = Register
+add_recovery = Add Email and Password (for Account Recovery)
 link_account = Link Account
 link_account_signin_or_signup = Sign in with existing credentials to link your existing account to this account. Or register a new one.
 register = Register

routers/user/auth.go

@@ -664,8 +664,23 @@ func LinkAccount(ctx *context.Context) {
 		return
 	}
 
-	ctx.Data["user_name"] = gothUser.(goth.User).NickName
-	ctx.Data["email"] = gothUser.(goth.User).Email
+	uname := gothUser.(goth.User).NickName
+	email := gothUser.(goth.User).Email
+	ctx.Data["user_name"] = uname
+	ctx.Data["email"] = email
+
+	if "" != uname {
+		u, _ := models.GetUserByName(uname)
+		if u != nil {
+			ctx.Data["user_name_exists"] = "true"
+		}
+	}
+	if "" != email {
+		u, _ := models.GetUserByEmail(email)
+		if u != nil {
+			ctx.Data["email_exists"] = "true"
+		}
+	}
 
 	ctx.HTML(200, tplLinkAccount)
 }

templates/user/auth/link_account.tmpl

@@ -8,8 +8,13 @@
 		</div>
 	</div>
 </div>
+
+{{if or .user_name_exists .email_exists}}
 <div class="ui user signin container icon">
 {{template "user/auth/signin_inner" .}}
 </div>
+{{else}}
 {{template "user/auth/signup_inner" .}}
+{{end}}
+
 {{template "base/footer" .}}

templates/user/auth/signup_inner.tmpl

@@ -4,7 +4,11 @@
 			<form class="ui form" action="{{.SignUpLink}}" method="post">
 				{{.CsrfTokenHtml}}
 				<h3 class="ui top attached header">
-					{{.i18n.Tr "sign_up"}}
+					{{if .LinkAccountMode}}
+						{{.i18n.Tr "add_recovery"}}
+					{{else}}
+						{{.i18n.Tr "sign_up"}}
+					{{end}}
 				</h3>
 				<div class="ui attached segment">
 					{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}