From c8cd37058e1750995fd81c5793b4d854edb21346 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sat, 20 Mar 2021 09:11:03 +0800
Subject: [PATCH] Add codeToResponse().

---
 controllers/account.go | 12 ++++++------
 controllers/auth.go    |  2 +-
 controllers/token.go   | 11 ++++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/controllers/account.go b/controllers/account.go
index 5013cb25..ea1479d6 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -25,7 +25,7 @@ import (
 	"github.com/casdoor/casdoor/util"
 )
 
-type RegisterForm struct {
+type RequestForm struct {
 	Type string `json:"type"`
 
 	Organization string `json:"organization"`
@@ -65,7 +65,7 @@ func (c *ApiController) Register() {
 		return
 	}
 
-	var form RegisterForm
+	var form RequestForm
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
 	if err != nil {
 		panic(err)
@@ -138,7 +138,7 @@ func (c *ApiController) UploadAvatar() {
 	username := c.GetSessionUser()
 	userObj := object.GetUser(username)
 
-	msg := object.CheckUserLogin(userObj.Owner + "/" + userObj.Name, c.Ctx.Request.Form.Get("password"))
+	msg := object.CheckUserLogin(userObj.Owner+"/"+userObj.Name, c.Ctx.Request.Form.Get("password"))
 	if msg != "" {
 		resp = Response{Status: "error", Msg: "Password wrong"}
 		c.Data["json"] = resp
@@ -148,14 +148,14 @@ func (c *ApiController) UploadAvatar() {
 
 	avatarBase64 := c.Ctx.Request.Form.Get("avatarfile")
 	index := strings.Index(avatarBase64, ",")
-	if index < 0 || avatarBase64[0: index] != "data:image/png;base64" {
+	if index < 0 || avatarBase64[0:index] != "data:image/png;base64" {
 		resp = Response{Status: "error", Msg: "File encoding error"}
 		c.Data["json"] = resp
 		c.ServeJSON()
 		return
 	}
 
-	dist, _ := base64.StdEncoding.DecodeString(avatarBase64[index + 1:])
+	dist, _ := base64.StdEncoding.DecodeString(avatarBase64[index+1:])
 	msg = object.UploadAvatar(userObj.Name, dist)
 	if msg != "" {
 		resp = Response{Status: "error", Msg: msg}
@@ -164,7 +164,7 @@ func (c *ApiController) UploadAvatar() {
 		return
 	}
 	userObj.Avatar = object.GetAvatarPath() + userObj.Name + ".png?time=" + strconv.FormatInt(time.Now().UnixNano(), 10)
-	object.UpdateUser(userObj.Owner + "/" + userObj.Name, userObj)
+	object.UpdateUser(userObj.Owner+"/"+userObj.Name, userObj)
 	resp = Response{Status: "ok", Msg: "Successfully set avatar"}
 	c.Data["json"] = resp
 	c.ServeJSON()
diff --git a/controllers/auth.go b/controllers/auth.go
index e3be5ca0..1909ee6c 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -33,7 +33,7 @@ func (c *ApiController) HandleLoggedIn(userId string) {
 
 func (c *ApiController) Login() {
 	var resp Response
-	var form RegisterForm
+	var form RequestForm
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
 	if err != nil {
 		panic(err)
diff --git a/controllers/token.go b/controllers/token.go
index b989be54..c53ca4ee 100644
--- a/controllers/token.go
+++ b/controllers/token.go
@@ -69,6 +69,14 @@ func (c *ApiController) DeleteToken() {
 	c.ServeJSON()
 }
 
+func codeToResponse(code *object.Code) Response {
+	if code.Code == "" {
+		return Response{Status: "error", Msg: code.Message, Data: code.Code}
+	} else {
+		return Response{Status: "ok", Msg: "success", Data: code.Code}
+	}
+}
+
 func (c *ApiController) GetOAuthCode() {
 	userId := c.GetSessionUser()
 	clientId := c.Input().Get("clientId")
@@ -77,7 +85,8 @@ func (c *ApiController) GetOAuthCode() {
 	scope := c.Input().Get("scope")
 	state := c.Input().Get("state")
 
-	c.Data["json"] = object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state)
+	code := object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state)
+	c.Data["json"] = codeToResponse(code)
 	c.ServeJSON()
 }