From c85c2da523fbbe81a9428e307ee0d224a335ca63 Mon Sep 17 00:00:00 2001
From: kleinsea <haixiao@yeah.net>
Date: Sat, 29 May 2021 09:58:11 +0800
Subject: [PATCH 1/2] feat: append config parameter: registerEnabled (#911)

---
 pkg/serializer/setting.go   | 2 ++
 routers/controllers/site.go | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkg/serializer/setting.go b/pkg/serializer/setting.go
index 5906e81..28fd8dd 100644
--- a/pkg/serializer/setting.go
+++ b/pkg/serializer/setting.go
@@ -22,6 +22,7 @@ type SiteConfig struct {
 	ReCaptchaKey         string `json:"captcha_ReCaptchaKey"`
 	CaptchaType          string `json:"captcha_type"`
 	TCaptchaCaptchaAppId string `json:"tcaptcha_captcha_app_id"`
+	RegisterEnabled      bool   `json:"registerEnabled"`
 }
 
 type task struct {
@@ -83,6 +84,7 @@ func BuildSiteConfig(settings map[string]string, user *model.User) Response {
 			ReCaptchaKey:         checkSettingValue(settings, "captcha_ReCaptchaKey"),
 			CaptchaType:          checkSettingValue(settings, "captcha_type"),
 			TCaptchaCaptchaAppId: checkSettingValue(settings, "captcha_TCaptcha_CaptchaAppId"),
+			RegisterEnabled:      model.IsTrueVal(checkSettingValue(settings, "register_enabled")),
 		}}
 	return res
 }
diff --git a/routers/controllers/site.go b/routers/controllers/site.go
index 056a982..f74534d 100644
--- a/routers/controllers/site.go
+++ b/routers/controllers/site.go
@@ -27,6 +27,7 @@ func SiteConfig(c *gin.Context) {
 		"captcha_ReCaptchaKey",
 		"captcha_type",
 		"captcha_TCaptcha_CaptchaAppId",
+		"register_enabled",
 	)
 
 	// 如果已登录，则同时返回用户信息和标签

From e6959a5026c3c09b4b74c548b3ca409e242cb189 Mon Sep 17 00:00:00 2001
From: Songtao <chu32951@gmail.com>
Date: Sun, 11 Jul 2021 14:32:47 +0800
Subject: [PATCH 2/2] delete $name policy (#831)

---
 pkg/filesystem/driver/s3/handler.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/filesystem/driver/s3/handler.go b/pkg/filesystem/driver/s3/handler.go
index b338d8f..9a37a92 100644
--- a/pkg/filesystem/driver/s3/handler.go
+++ b/pkg/filesystem/driver/s3/handler.go
@@ -344,7 +344,6 @@ func (handler Driver) Token(ctx context.Context, TTL int64, key string) (seriali
 			map[string]string{"bucket": handler.Policy.BucketName},
 			[]string{"starts-with", "$key", savePath},
 			[]string{"starts-with", "$success_action_redirect", apiURL.String()},
-			[]string{"starts-with", "$name", ""},
 			[]string{"starts-with", "$Content-Type", ""},
 			map[string]string{"x-amz-algorithm": "AWS4-HMAC-SHA256"},
 		},