From 5a3abdbc9592049b378a99069c64535711ed174d Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 9 May 2021 11:55:43 +0800
Subject: [PATCH] Rename to authState, useProxy, delete EnableDocs.

---
 conf/app.conf          | 5 ++---
 controllers/account.go | 2 +-
 controllers/auth.go    | 4 ++--
 controllers/util.go    | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 61acef76..9c50d7be 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -6,9 +6,8 @@ copyrequestbody = true
 driverName = mysql
 dataSourceName = root:123@tcp(localhost:3306)/
 dbName = casdoor
-AuthState = "casdoor"
-UseProxy = false
-EnableDocs = true
+authState = "casdoor"
+useProxy = false
 mailUser = ""
 mailPass = ""
 mailHost = ""
diff --git a/controllers/account.go b/controllers/account.go
index 93c54306..194151dd 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -190,7 +190,7 @@ func (c *ApiController) UploadAvatar() {
 	}
 
 	dist, _ := base64.StdEncoding.DecodeString(avatarBase64[index+1:])
-	msg := object.UploadAvatar(user.Owner + "/" + user.Name, dist)
+	msg := object.UploadAvatar(user.GetId(), dist)
 	if msg != "" {
 		resp = Response{Status: "error", Msg: msg}
 		c.Data["json"] = resp
diff --git a/controllers/auth.go b/controllers/auth.go
index f5a58bfa..9fb7f1e2 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -121,8 +121,8 @@ func (c *ApiController) Login() {
 		idProvider := idp.GetIdProvider(provider.Type, provider.ClientId, provider.ClientSecret, form.RedirectUri)
 		idProvider.SetHttpClient(httpClient)
 
-		if form.State != beego.AppConfig.String("AuthState") && form.State != application.Name {
-			resp = &Response{Status: "error", Msg: fmt.Sprintf("state expected: \"%s\", but got: \"%s\"", beego.AppConfig.String("AuthState"), form.State)}
+		if form.State != beego.AppConfig.String("authState") && form.State != application.Name {
+			resp = &Response{Status: "error", Msg: fmt.Sprintf("state expected: \"%s\", but got: \"%s\"", beego.AppConfig.String("authState"), form.State)}
 			c.Data["json"] = resp
 			c.ServeJSON()
 			return
diff --git a/controllers/util.go b/controllers/util.go
index daab712d..97a218e9 100644
--- a/controllers/util.go
+++ b/controllers/util.go
@@ -24,7 +24,7 @@ import (
 var httpClient *http.Client
 
 func InitHttpClient() {
-	useProxy, err := beego.AppConfig.Bool("UseProxy")
+	useProxy, err := beego.AppConfig.Bool("useProxy")
 	if err != nil {
 		panic(err)
 	}