解绑

zhima1234 · zhima1234 · commit 72b6537bdcb3 · 2017-06-06T17:21:12.000+08:00
diff --git a/src/http/controller/account.go b/src/http/controller/account.go
@@ -42,6 +42,7 @@ func (self AccountController) RegisterRoute(g *echo.Group) {
 	g.Any("/account/forgetpwd", self.ForgetPasswd)
 	g.Any("/account/resetpwd", self.ResetPasswd)
 	g.Get("/account/logout", self.Logout, middleware.NeedLogin())
+	g.POST("/account/social/unbind", self.Unbind, middleware.NeedLogin())
 }
 
 func (self AccountController) Register(ctx echo.Context) error {
@@ -394,3 +395,12 @@ func (AccountController) Logout(ctx echo.Context) error {
 	// 重定向得到登录页（TODO:重定向到什么页面比较好？）
 	return ctx.Redirect(http.StatusSeeOther, "/account/login")
 }
+
+// Unbind 第三方账号解绑
+func (AccountController) Unbind(ctx echo.Context) error {
+	bindId := ctx.FormValue("bind_id")
+	me := ctx.Get("user").(*model.Me)
+	logic.DefaultThirdUser.UnBindUser(ctx, bindId, me)
+
+	return ctx.Redirect(http.StatusSeeOther, "/account/edit#connection")
+}
diff --git a/src/logic/third_user.go b/src/logic/third_user.go
@@ -190,6 +190,11 @@ func (self ThirdUserLogic) BindGithub(ctx context.Context, code string, me *mode
 	return nil
 }
 
+func (ThirdUserLogic) UnBindUser(ctx context.Context, bindId interface{}, me *model.Me) error {
+	_, err := MasterDB.Where("id=? AND uid=?", bindId, me.Uid).Delete(new(model.BindUser))
+	return err
+}
+
 func (ThirdUserLogic) githubTokenAndUser(ctx context.Context, code string) (*model.GithubUser, *oauth2.Token, error) {
 	token, err := githubConf.Exchange(ctx, code)
 	if err != nil {
diff --git a/template/user/edit.html b/template/user/edit.html
@@ -198,7 +198,7 @@ <h4 class="title">账号关联</h4>
 				<p>您可以使用以下社交账户登录 {{.setting.Name}}。如果您删除了全部关联的社交账户，您仍可以使用<span class="text-danger">已验证的邮箱</span>或者以下用户名登录{{.setting.Name}}：</p>
 				<p>您的用户名为：<span class="text-danger">{{.user.Username}}</span></p>
 
-				<form method="post" action="/user/social/connections">
+				<form method="post" action="/account/social/unbind" id="unbind">
 					<fieldset>
 						<div>
 							{{range .bind_users}}
@@ -269,16 +269,15 @@ <h5 class="mb-3">添加一个第三方账号</h5>
 <script type="text/javascript" src="/static/js/libs/plupload.full.min.js"></script>
 <script type="text/javascript" src="/static/js/user.js?v=1.1"></script>
 <script type="text/javascript">
-// 需要加载的侧边栏
-SG.SIDE_BARS = [
-	"/topics/recent",
-	"/resources/recent",
-	"/comments/recent",
-];
-
 $(function(){
 	// 文本框自动伸缩
 	$('.need-autogrow').autoGrow();
+
+	$('#unbind').submit(function(evt){
+		if ($('input[name=bind_id]:checked').length == 0) {
+			evt.preventDefault();
+		}
+	});
 });
 </script>
 {{end}}
