Merge branch 'upstream/main'

common/config/config.go

@@ -49,6 +49,7 @@ var PasswordLoginEnabled = true
 var PasswordRegisterEnabled = true
 var EmailVerificationEnabled = false
 var GitHubOAuthEnabled = false
+var OidcEnabled = false
 var WeChatAuthEnabled = false
 var TurnstileCheckEnabled = false
 var RegisterEnabled = true
@@ -84,6 +85,13 @@ var GitHubClientSecret = ""
 var LarkClientId = ""
 var LarkClientSecret = ""
 
+var OidcClientId = ""
+var OidcClientSecret = ""
+var OidcWellKnown = ""
+var OidcAuthorizationEndpoint = ""
+var OidcTokenEndpoint = ""
+var OidcUserinfoEndpoint = ""
+
 var WeChatServerAddress = ""
 var WeChatServerToken = ""
 var WeChatAccountQRCodeImageURL = ""

common/gin.go

@@ -2,7 +2,9 @@ package common
 
 import (
 	"bytes"
+	"encoding/json"
 	"io"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
@@ -28,17 +30,19 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error {
 	if err != nil {
 		return errors.Wrap(err, "get request body failed")
 	}
-
-	// Reset request body
-	c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
-	defer func() {
+	contentType := c.Request.Header.Get("Content-Type")
+	if strings.HasPrefix(contentType, "application/json") {
+		err = json.Unmarshal(requestBody, &v)
 		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
-	}()
-
-	if err = c.Bind(v); err != nil {
-		return errors.Wrap(err, "bind request body failed")
+	} else {
+		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
+		err = c.ShouldBind(&v)
+	}
+	if err != nil {
+		return err
 	}
 
+	// Reset request body
 	return nil
 }