From 9feefc31f92713bb099b316e02c40d8826fc9cda Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 8 Aug 2021 16:00:19 +0800
Subject: [PATCH] Use c.ResponseOk() for all places.

---
 controllers/account.go | 17 ++++-------------
 controllers/auth.go    | 11 ++++-------
 controllers/link.go    |  4 +---
 controllers/user.go    |  5 +----
 controllers/util.go    | 14 ++++++++++++++
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/controllers/account.go b/controllers/account.go
index 64913635..674f2c92 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -174,9 +174,7 @@ func (c *ApiController) Signup() {
 
 	util.LogInfo(c.Ctx, "API: [%s] is signed up as new user", userId)
 
-	resp = Response{Status: "ok", Msg: "", Data: userId}
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk(userId)
 }
 
 // Logout
@@ -193,10 +191,7 @@ func (c *ApiController) Logout() {
 	c.SetSessionUsername("")
 	c.SetSessionData(nil)
 
-	resp = Response{Status: "ok", Msg: "", Data: user}
-
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk(user)
 }
 
 // GetAccount
@@ -219,10 +214,8 @@ func (c *ApiController) GetAccount() {
 	}
 
 	organization := object.GetOrganizationByUser(user)
-	resp = Response{Status: "ok", Msg: "", Data: user, Data2: organization}
 
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk(user, organization)
 }
 
 // UploadAvatar
@@ -265,9 +258,7 @@ func (c *ApiController) UploadAvatar() {
 	user.Avatar = fileUrl
 	object.UpdateUser(user.GetId(), user)
 
-	resp = Response{Status: "ok", Msg: ""}
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk()
 }
 
 // GetHumanCheck ...
diff --git a/controllers/auth.go b/controllers/auth.go
index 1fd2ed00..9c1fb1a6 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -83,8 +83,6 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
 // @Success 200 {object} controllers.api_controller.Response The Response object
 // @router /update-application [get]
 func (c *ApiController) GetApplicationLogin() {
-	var resp Response
-
 	clientId := c.Input().Get("clientId")
 	responseType := c.Input().Get("responseType")
 	redirectUri := c.Input().Get("redirectUri")
@@ -93,12 +91,10 @@ func (c *ApiController) GetApplicationLogin() {
 
 	msg, application := object.CheckOAuthLogin(clientId, responseType, redirectUri, scope, state)
 	if msg != "" {
-		resp = Response{Status: "error", Msg: msg, Data: application}
+		c.ResponseError(msg, application)
 	} else {
-		resp = Response{Status: "ok", Msg: "", Data: application}
+		c.ResponseOk(application)
 	}
-	c.Data["json"] = resp
-	c.ServeJSON()
 }
 
 func setHttpClient(idProvider idp.IdProvider, providerType string) {
@@ -117,7 +113,8 @@ func setHttpClient(idProvider idp.IdProvider, providerType string) {
 // @Success 200 {object} controllers.api_controller.Response The Response object
 // @router /login [post]
 func (c *ApiController) Login() {
-	resp := &Response{Status: "null", Msg: ""}
+	resp := &Response{}
+
 	var form RequestForm
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
 	if err != nil {
diff --git a/controllers/link.go b/controllers/link.go
index b05664db..127ecb69 100644
--- a/controllers/link.go
+++ b/controllers/link.go
@@ -51,7 +51,5 @@ func (c *ApiController) Unlink() {
 	object.ClearUserOAuthProperties(user, providerType)
 
 	object.LinkUserAccount(user, providerType, "")
-	resp = Response{Status: "ok", Msg: ""}
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk()
 }
diff --git a/controllers/user.go b/controllers/user.go
index c5371b30..aa397538 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -157,10 +157,7 @@ func (c *ApiController) GetEmailAndPhone() {
 		contentType = "username"
 	}
 
-	resp = Response{Status: "ok", Msg: "", Data: respUser, Data2: contentType}
-
-	c.Data["json"] = resp
-	c.ServeJSON()
+	c.ResponseOk(respUser, contentType)
 }
 
 // SetPassword
diff --git a/controllers/util.go b/controllers/util.go
index dee1d924..3e52ed41 100644
--- a/controllers/util.go
+++ b/controllers/util.go
@@ -55,6 +55,20 @@ func InitHttpClient() {
 	//println("Response status: %s", resp.Status)
 }
 
+// ResponseOk ...
+func (c *ApiController) ResponseOk(data ...interface{}) {
+	resp := Response{Status: "ok"}
+	switch len(data) {
+	case 2:
+		resp.Data2 = data[1]
+		fallthrough
+	case 1:
+		resp.Data = data[0]
+	}
+	c.Data["json"] = resp
+	c.ServeJSON()
+}
+
 // ResponseError ...
 func (c *ApiController) ResponseError(error string, data ...interface{}) {
 	resp := Response{Status: "error", Msg: error}