嵌入与邮箱

internal/apps/oauth/oauth_test.go

@@ -66,7 +66,16 @@ func newMockRedisClient() *mockRedisClient {
 
 func (m *mockRedisClient) Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd {
 	cmd := redis.NewStatusCmd(ctx)
-	m.store[key] = fmt.Sprintf("%v", value)
+	var val string
+	switch v := value.(type) {
+	case []byte:
+		val = string(v)
+	case string:
+		val = v
+	default:
+		val = fmt.Sprintf("%v", v)
+	}
+	m.store[key] = val
 	cmd.SetVal("OK")
 	return cmd
 }
@@ -99,7 +108,15 @@ func (m *mockRedisClient) HSet(ctx context.Context, key string, values ...interf
 	cmd := redis.NewIntCmd(ctx)
 	if len(values) >= 2 {
 		field := fmt.Sprintf("%v", values[0])
-		val := fmt.Sprintf("%v", values[1])
+		var val string
+		switch v := values[1].(type) {
+		case []byte:
+			val = string(v)
+		case string:
+			val = v
+		default:
+			val = fmt.Sprintf("%v", v)
+		}
 		compositeKey := key + ":" + field
 		m.store[compositeKey] = val
 		cmd.SetVal(1)
@@ -265,6 +282,15 @@ func setupTestDB(t *testing.T) *gorm.DB {
 	if err != nil {
 		t.Fatalf("failed to migrate schema: %v", err)
 	}
+
+	// 注入测试所需的服务器地址配置
+	if err := dbConn.Create(&model.SystemConfig{
+		Key:   model.ConfigKeyServerAddress,
+		Value: "http://localhost:3000",
+	}).Error; err != nil {
+		t.Fatalf("failed to seed server_address config: %v", err)
+	}
+
 	return dbConn
 }
 
@@ -332,7 +358,6 @@ func initializeTestConfig() {
 	config.Config.App.SessionCookieName = "test_session_id"
 	config.Config.App.SessionSecret = "test_session_secret"
 	config.Config.App.APIPrefix = "/api"
-	config.Config.App.FrontendURL = "http://localhost:3000"
 }
 
 // -----------------------------------------------------------------------------

internal/apps/oauth/sources.go

@@ -15,7 +15,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/linux-do/credit/internal/common"
-	"github.com/linux-do/credit/internal/config"
 	"github.com/linux-do/credit/internal/db"
 	"github.com/linux-do/credit/internal/model"
 	"github.com/linux-do/credit/internal/util"
@@ -104,11 +103,12 @@ func activeLoginSources() []AuthSourceView {
 	return sources
 }
 
-func frontendLoginRedirectURL() string {
-	if config.Config.App.FrontendURL != "" {
-		return strings.TrimRight(config.Config.App.FrontendURL, "/") + "/login"
+func getFrontendLoginRedirectURL(ctx context.Context) (string, error) {
+	var sc model.SystemConfig
+	if err := sc.GetByKey(ctx, model.ConfigKeyServerAddress); err != nil || strings.TrimSpace(sc.Value) == "" {
+		return "", errors.New("服务器地址 (server_address) 未配置或配置为空，请在后台系统设置中配置后再试")
 	}
-	return "/login"
+	return strings.TrimRight(sc.Value, "/") + "/login", nil
 }
 
 func buildOAuthConfig(ctx context.Context, source *model.AuthSource, redirectURL string) (*oauth2.Config, *oidc.IDTokenVerifier, error) {
@@ -304,14 +304,18 @@ func GetLoginURL(c *gin.Context) {
 
 	authorizeURL, err := buildAuthorizeURL(c.Request.Context(), source, state)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, util.Err(err.Error()))
+		c.JSON(http.StatusBadRequest, util.Err(err.Error()))
 		return
 	}
 	c.JSON(http.StatusOK, util.OK(OAuthAuthorizeResponse{AuthorizeURL: authorizeURL}))
 }
 
 func buildAuthorizeURL(ctx context.Context, source *model.AuthSource, state string) (string, error) {
-	authConfig, verifier, err := buildOAuthConfig(ctx, source, frontendLoginRedirectURL())
+	redirectURL, err := getFrontendLoginRedirectURL(ctx)
+	if err != nil {
+		return "", err
+	}
+	authConfig, verifier, err := buildOAuthConfig(ctx, source, redirectURL)
 	if err != nil {
 		return "", err
 	}
@@ -361,7 +365,7 @@ func Authorize(c *gin.Context) {
 	}
 	authorizeURL, err := buildAuthorizeURL(c.Request.Context(), source, state)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, util.Err(err.Error()))
+		c.JSON(http.StatusBadRequest, util.Err(err.Error()))
 		return
 	}
 	c.JSON(http.StatusOK, util.OK(OAuthAuthorizeResponse{AuthorizeURL: authorizeURL}))
@@ -407,7 +411,13 @@ func Callback(c *gin.Context) {
 		return
 	}
 
-	userInfo, err := buildOAuthUserInfo(ctx, source, req.Code, req.State, frontendLoginRedirectURL())
+	redirectURL, err := getFrontendLoginRedirectURL(ctx)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, util.Err(err.Error()))
+		return
+	}
+
+	userInfo, err := buildOAuthUserInfo(ctx, source, req.Code, req.State, redirectURL)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, util.Err(err.Error()))
 		return