fix gitea workflow path and runner label
Build docker and publish / build (20.15.1) (push) Failing after 8m21s
Build docker and publish / build (20.15.1) (push) Failing after 8m21s
This commit is contained in:
+12
-11
@@ -91,17 +91,18 @@ type RegisterConfig struct {
|
||||
}
|
||||
|
||||
type EmailConfig struct {
|
||||
Enable bool `yaml:"Enable" default:"true"`
|
||||
Platform string `yaml:"platform"`
|
||||
PlatformConfig string `yaml:"platform_config"`
|
||||
EnableVerify bool `yaml:"enable_verify"`
|
||||
EnableNotify bool `yaml:"enable_notify"`
|
||||
EnableDomainSuffix bool `yaml:"enable_domain_suffix"`
|
||||
DomainSuffixList string `yaml:"domain_suffix_list"`
|
||||
VerifyEmailTemplate string `yaml:"verify_email_template"`
|
||||
ExpirationEmailTemplate string `yaml:"expiration_email_template"`
|
||||
MaintenanceEmailTemplate string `yaml:"maintenance_email_template"`
|
||||
TrafficExceedEmailTemplate string `yaml:"traffic_exceed_email_template"`
|
||||
Enable bool `yaml:"Enable" default:"true"`
|
||||
Platform string `yaml:"platform"`
|
||||
PlatformConfig string `yaml:"platform_config"`
|
||||
EnableVerify bool `yaml:"enable_verify"`
|
||||
EnableNotify bool `yaml:"enable_notify"`
|
||||
EnableDomainSuffix bool `yaml:"enable_domain_suffix"`
|
||||
DomainSuffixList string `yaml:"domain_suffix_list"`
|
||||
VerifyEmailTemplate string `yaml:"verify_email_template"`
|
||||
VerifyEmailTemplates map[string]string `yaml:"verify_email_templates"`
|
||||
ExpirationEmailTemplate string `yaml:"expiration_email_template"`
|
||||
MaintenanceEmailTemplate string `yaml:"maintenance_email_template"`
|
||||
TrafficExceedEmailTemplate string `yaml:"traffic_exceed_email_template"`
|
||||
}
|
||||
|
||||
type MobileConfig struct {
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
commonLogic "github.com/perfect-panel/server/internal/logic/common"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
// Check legacy verification code
|
||||
func CheckCodeLegacyHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.LegacyCheckVerificationCodeRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
validateErr := svcCtx.Validate(&req)
|
||||
if validateErr != nil {
|
||||
result.ParamErrorResult(c, validateErr)
|
||||
return
|
||||
}
|
||||
|
||||
normalizedReq, legacyType3Mapped, err := commonLogic.NormalizeLegacyCheckVerificationCodeRequest(&req)
|
||||
if err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
l := commonLogic.NewCheckVerificationCodeLogic(c.Request.Context(), svcCtx)
|
||||
useLatest := false
|
||||
if value, ok := c.Request.Context().Value(constant.CtxKeyAPIVersionUseLatest).(bool); ok {
|
||||
useLatest = value
|
||||
}
|
||||
|
||||
resp, err := l.CheckVerificationCodeWithBehavior(normalizedReq, commonLogic.VerifyCodeCheckBehavior{
|
||||
Source: "legacy",
|
||||
Consume: useLatest,
|
||||
LegacyType3Mapped: legacyType3Mapped,
|
||||
AllowSceneFallback: constant.ParseVerifyType(normalizedReq.Type) != constant.DeleteAccount,
|
||||
})
|
||||
|
||||
legacyResp := &types.LegacyCheckVerificationCodeResponse{}
|
||||
if resp != nil {
|
||||
legacyResp.Status = resp.Status
|
||||
legacyResp.Exist = resp.Status
|
||||
}
|
||||
|
||||
result.HttpResult(c, legacyResp, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,167 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/alicebob/miniredis/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/middleware"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
type legacyCheckCodeResponse struct {
|
||||
Code uint32 `json:"code"`
|
||||
Data struct {
|
||||
Status bool `json:"status"`
|
||||
Exist bool `json:"exist"`
|
||||
} `json:"data"`
|
||||
}
|
||||
|
||||
func newLegacyCheckCodeTestRouter(svcCtx *svc.ServiceContext) *gin.Engine {
|
||||
gin.SetMode(gin.TestMode)
|
||||
router := gin.New()
|
||||
router.Use(middleware.ApiVersionMiddleware(svcCtx))
|
||||
router.POST("/v1/auth/check-code", CheckCodeLegacyHandler(svcCtx))
|
||||
return router
|
||||
}
|
||||
|
||||
func newLegacyCheckCodeTestSvcCtx(t *testing.T) (*svc.ServiceContext, *redis.Client) {
|
||||
t.Helper()
|
||||
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
return svcCtx, redisClient
|
||||
}
|
||||
|
||||
func seedLegacyVerifyCode(t *testing.T, redisClient *redis.Client, scene string, email string, code string) string {
|
||||
t.Helper()
|
||||
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, email)
|
||||
payload := map[string]interface{}{
|
||||
"code": code,
|
||||
"lastAt": time.Now().Unix(),
|
||||
}
|
||||
payloadRaw, err := json.Marshal(payload)
|
||||
require.NoError(t, err)
|
||||
err = redisClient.Set(context.Background(), cacheKey, payloadRaw, time.Minute*15).Err()
|
||||
require.NoError(t, err)
|
||||
return cacheKey
|
||||
}
|
||||
|
||||
func callLegacyCheckCode(t *testing.T, router *gin.Engine, apiHeader string, body string) legacyCheckCodeResponse {
|
||||
t.Helper()
|
||||
|
||||
reqBody := bytes.NewBufferString(body)
|
||||
req := httptest.NewRequest(http.MethodPost, "/v1/auth/check-code", reqBody)
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
if apiHeader != "" {
|
||||
req.Header.Set("api-header", apiHeader)
|
||||
}
|
||||
recorder := httptest.NewRecorder()
|
||||
router.ServeHTTP(recorder, req)
|
||||
require.Equal(t, http.StatusOK, recorder.Code)
|
||||
|
||||
var resp legacyCheckCodeResponse
|
||||
err := json.Unmarshal(recorder.Body.Bytes(), &resp)
|
||||
require.NoError(t, err)
|
||||
return resp
|
||||
}
|
||||
|
||||
func TestCheckCodeLegacyHandler_NoHeaderNotConsumed(t *testing.T) {
|
||||
svcCtx, redisClient := newLegacyCheckCodeTestSvcCtx(t)
|
||||
router := newLegacyCheckCodeTestRouter(svcCtx)
|
||||
|
||||
email := "legacy@example.com"
|
||||
code := "123456"
|
||||
cacheKey := seedLegacyVerifyCode(t, redisClient, constant.Security.String(), email, code)
|
||||
|
||||
resp := callLegacyCheckCode(t, router, "", `{"email":"legacy@example.com","code":"123456","type":3}`)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.True(t, resp.Data.Status)
|
||||
assert.True(t, resp.Data.Exist)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(1), exists)
|
||||
}
|
||||
|
||||
func TestCheckCodeLegacyHandler_GreaterVersionConsumed(t *testing.T) {
|
||||
svcCtx, redisClient := newLegacyCheckCodeTestSvcCtx(t)
|
||||
router := newLegacyCheckCodeTestRouter(svcCtx)
|
||||
|
||||
email := "latest@example.com"
|
||||
code := "999888"
|
||||
cacheKey := seedLegacyVerifyCode(t, redisClient, constant.Security.String(), email, code)
|
||||
|
||||
resp := callLegacyCheckCode(t, router, "1.0.1", `{"email":"latest@example.com","code":"999888","type":3}`)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.True(t, resp.Data.Status)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(0), exists)
|
||||
|
||||
resp = callLegacyCheckCode(t, router, "1.0.1", `{"email":"latest@example.com","code":"999888","type":3}`)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.False(t, resp.Data.Status)
|
||||
assert.False(t, resp.Data.Exist)
|
||||
}
|
||||
|
||||
func TestCheckCodeLegacyHandler_EqualThresholdNotConsumed(t *testing.T) {
|
||||
svcCtx, redisClient := newLegacyCheckCodeTestSvcCtx(t)
|
||||
router := newLegacyCheckCodeTestRouter(svcCtx)
|
||||
|
||||
email := "equal@example.com"
|
||||
code := "112233"
|
||||
cacheKey := seedLegacyVerifyCode(t, redisClient, constant.Security.String(), email, code)
|
||||
|
||||
resp := callLegacyCheckCode(t, router, "1.0.0", `{"email":"equal@example.com","code":"112233","type":3}`)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.True(t, resp.Data.Status)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(1), exists)
|
||||
}
|
||||
|
||||
func TestCheckCodeLegacyHandler_InvalidVersionNotConsumed(t *testing.T) {
|
||||
svcCtx, redisClient := newLegacyCheckCodeTestSvcCtx(t)
|
||||
router := newLegacyCheckCodeTestRouter(svcCtx)
|
||||
|
||||
email := "invalid@example.com"
|
||||
code := "445566"
|
||||
cacheKey := seedLegacyVerifyCode(t, redisClient, constant.Security.String(), email, code)
|
||||
|
||||
resp := callLegacyCheckCode(t, router, "abc", `{"email":"invalid@example.com","code":"445566","type":3}`)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.True(t, resp.Data.Status)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(1), exists)
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"github.com/perfect-panel/server/internal/logic/common"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
@@ -20,7 +21,15 @@ func CheckVerificationCodeHandler(svcCtx *svc.ServiceContext) func(c *gin.Contex
|
||||
}
|
||||
|
||||
l := common.NewCheckVerificationCodeLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.CheckVerificationCode(&req)
|
||||
useLatest := false
|
||||
if value, ok := c.Request.Context().Value(constant.CtxKeyAPIVersionUseLatest).(bool); ok {
|
||||
useLatest = value
|
||||
}
|
||||
|
||||
resp, err := l.CheckVerificationCodeWithBehavior(&req, common.VerifyCodeCheckBehavior{
|
||||
Source: "canonical",
|
||||
Consume: useLatest,
|
||||
})
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/alicebob/miniredis/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/middleware"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/authmethod"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
type canonicalCheckCodeResponse struct {
|
||||
Code uint32 `json:"code"`
|
||||
Data struct {
|
||||
Status bool `json:"status"`
|
||||
Exist bool `json:"exist"`
|
||||
} `json:"data"`
|
||||
}
|
||||
|
||||
func newCanonicalCheckCodeTestSvcCtx(t *testing.T) (*svc.ServiceContext, *redis.Client) {
|
||||
t.Helper()
|
||||
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
return svcCtx, redisClient
|
||||
}
|
||||
|
||||
func newCanonicalCheckCodeTestRouter(svcCtx *svc.ServiceContext) *gin.Engine {
|
||||
gin.SetMode(gin.TestMode)
|
||||
router := gin.New()
|
||||
router.Use(middleware.ApiVersionMiddleware(svcCtx))
|
||||
router.POST("/v1/common/check_verification_code", CheckVerificationCodeHandler(svcCtx))
|
||||
return router
|
||||
}
|
||||
|
||||
func seedCanonicalVerifyCode(t *testing.T, redisClient *redis.Client, scene string, account string, code string) string {
|
||||
t.Helper()
|
||||
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, account)
|
||||
payload := map[string]interface{}{
|
||||
"code": code,
|
||||
"lastAt": time.Now().Unix(),
|
||||
}
|
||||
payloadRaw, err := json.Marshal(payload)
|
||||
require.NoError(t, err)
|
||||
err = redisClient.Set(context.Background(), cacheKey, payloadRaw, time.Minute*15).Err()
|
||||
require.NoError(t, err)
|
||||
return cacheKey
|
||||
}
|
||||
|
||||
func callCanonicalCheckCode(t *testing.T, router *gin.Engine, apiHeader string, body string) canonicalCheckCodeResponse {
|
||||
t.Helper()
|
||||
|
||||
reqBody := bytes.NewBufferString(body)
|
||||
req := httptest.NewRequest(http.MethodPost, "/v1/common/check_verification_code", reqBody)
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
if apiHeader != "" {
|
||||
req.Header.Set("api-header", apiHeader)
|
||||
}
|
||||
recorder := httptest.NewRecorder()
|
||||
router.ServeHTTP(recorder, req)
|
||||
require.Equal(t, http.StatusOK, recorder.Code)
|
||||
|
||||
var resp canonicalCheckCodeResponse
|
||||
err := json.Unmarshal(recorder.Body.Bytes(), &resp)
|
||||
require.NoError(t, err)
|
||||
return resp
|
||||
}
|
||||
|
||||
func TestCheckVerificationCodeHandler_ApiHeaderGate(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
apiHeader string
|
||||
expectConsume bool
|
||||
}{
|
||||
{name: "no header", apiHeader: "", expectConsume: false},
|
||||
{name: "invalid header", apiHeader: "invalid", expectConsume: false},
|
||||
{name: "equal threshold", apiHeader: "1.0.0", expectConsume: false},
|
||||
{name: "greater threshold", apiHeader: "1.0.1", expectConsume: true},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
svcCtx, redisClient := newCanonicalCheckCodeTestSvcCtx(t)
|
||||
router := newCanonicalCheckCodeTestRouter(svcCtx)
|
||||
|
||||
account := "header-gate@example.com"
|
||||
code := "123123"
|
||||
cacheKey := seedCanonicalVerifyCode(t, redisClient, constant.Register.String(), account, code)
|
||||
body := fmt.Sprintf(`{"method":"%s","account":"%s","code":"%s","type":%d}`,
|
||||
authmethod.Email,
|
||||
account,
|
||||
code,
|
||||
constant.Register,
|
||||
)
|
||||
|
||||
resp := callCanonicalCheckCode(t, router, tt.apiHeader, body)
|
||||
assert.Equal(t, uint32(200), resp.Code)
|
||||
assert.True(t, resp.Data.Status)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
if tt.expectConsume {
|
||||
assert.Equal(t, int64(0), exists)
|
||||
} else {
|
||||
assert.Equal(t, int64(1), exists)
|
||||
}
|
||||
|
||||
resp = callCanonicalCheckCode(t, router, tt.apiHeader, body)
|
||||
if tt.expectConsume {
|
||||
assert.False(t, resp.Data.Status)
|
||||
} else {
|
||||
assert.True(t, resp.Data.Status)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -635,6 +635,9 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
// Check user telephone is exist
|
||||
authGroupRouter.GET("/check/telephone", auth.CheckUserTelephoneHandler(serverCtx))
|
||||
|
||||
// Check legacy verification code
|
||||
authGroupRouter.POST("/check-code", auth.CheckCodeLegacyHandler(serverCtx))
|
||||
|
||||
// User login
|
||||
authGroupRouter.POST("/login", auth.UserLoginHandler(serverCtx))
|
||||
|
||||
|
||||
@@ -2,19 +2,9 @@ package common
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/authmethod"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/phone"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type CheckVerificationCodeLogic struct {
|
||||
@@ -33,40 +23,8 @@ func NewCheckVerificationCodeLogic(ctx context.Context, svcCtx *svc.ServiceConte
|
||||
}
|
||||
|
||||
func (l *CheckVerificationCodeLogic) CheckVerificationCode(req *types.CheckVerificationCodeRequest) (resp *types.CheckVerificationCodeRespone, err error) {
|
||||
resp = &types.CheckVerificationCodeRespone{}
|
||||
req.Account = strings.ToLower(strings.TrimSpace(req.Account))
|
||||
if req.Method == authmethod.Email {
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, constant.ParseVerifyType(req.Type), req.Account)
|
||||
value, err := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
|
||||
if err != nil {
|
||||
return resp, nil
|
||||
}
|
||||
var payload CacheKeyPayload
|
||||
if err := json.Unmarshal([]byte(value), &payload); err != nil {
|
||||
return resp, nil
|
||||
}
|
||||
if payload.Code != req.Code {
|
||||
return resp, nil
|
||||
}
|
||||
resp.Status = true
|
||||
}
|
||||
if req.Method == authmethod.Mobile {
|
||||
if !phone.CheckPhone(req.Account) {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.TelephoneError), "Invalid phone number")
|
||||
}
|
||||
cacheKey := fmt.Sprintf("%s:%s:+%s", config.AuthCodeTelephoneCacheKey, constant.ParseVerifyType(req.Type), req.Account)
|
||||
value, err := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
|
||||
if err != nil {
|
||||
return resp, nil
|
||||
}
|
||||
var payload CacheKeyPayload
|
||||
if err := json.Unmarshal([]byte(value), &payload); err != nil {
|
||||
return resp, nil
|
||||
}
|
||||
if payload.Code != req.Code {
|
||||
return resp, nil
|
||||
}
|
||||
resp.Status = true
|
||||
}
|
||||
return resp, nil
|
||||
return l.CheckVerificationCodeWithBehavior(req, VerifyCodeCheckBehavior{
|
||||
Source: "canonical",
|
||||
Consume: true,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -0,0 +1,259 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/alicebob/miniredis/v2"
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/apiversion"
|
||||
"github.com/perfect-panel/server/pkg/authmethod"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestCheckVerificationCodeCanonicalConsume(t *testing.T) {
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
email := "user@example.com"
|
||||
code := "123456"
|
||||
scene := constant.Register.String()
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, email)
|
||||
setEmailCodePayload(t, redisClient, cacheKey, code, time.Now().Unix())
|
||||
|
||||
logic := NewCheckVerificationCodeLogic(context.Background(), svcCtx)
|
||||
req := &types.CheckVerificationCodeRequest{
|
||||
Method: authmethod.Email,
|
||||
Account: email,
|
||||
Code: code,
|
||||
Type: uint8(constant.Register),
|
||||
}
|
||||
|
||||
resp, err := logic.CheckVerificationCode(req)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.True(t, resp.Status)
|
||||
assert.True(t, resp.Exist)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(0), exists)
|
||||
|
||||
resp, err = logic.CheckVerificationCode(req)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.False(t, resp.Status)
|
||||
assert.False(t, resp.Exist)
|
||||
}
|
||||
|
||||
func TestCheckVerificationCodeLegacyNoConsumeAndType3Mapping(t *testing.T) {
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
email := "legacy@example.com"
|
||||
code := "654321"
|
||||
scene := constant.Security.String()
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, email)
|
||||
setEmailCodePayload(t, redisClient, cacheKey, code, time.Now().Unix())
|
||||
|
||||
legacyReq := &types.LegacyCheckVerificationCodeRequest{
|
||||
Email: email,
|
||||
Code: code,
|
||||
Type: 3,
|
||||
}
|
||||
|
||||
normalizedReq, type3Mapped, err := NormalizeLegacyCheckVerificationCodeRequest(legacyReq)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, type3Mapped)
|
||||
assert.Equal(t, uint8(constant.Security), normalizedReq.Type)
|
||||
assert.Equal(t, authmethod.Email, normalizedReq.Method)
|
||||
assert.Equal(t, email, normalizedReq.Account)
|
||||
|
||||
logic := NewCheckVerificationCodeLogic(context.Background(), svcCtx)
|
||||
legacyBehavior := VerifyCodeCheckBehavior{
|
||||
Source: "legacy",
|
||||
Consume: false,
|
||||
LegacyType3Mapped: true,
|
||||
AllowSceneFallback: true,
|
||||
}
|
||||
|
||||
resp, err := logic.CheckVerificationCodeWithBehavior(normalizedReq, legacyBehavior)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.True(t, resp.Status)
|
||||
assert.True(t, resp.Exist)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(1), exists)
|
||||
|
||||
resp, err = logic.CheckVerificationCodeWithBehavior(normalizedReq, legacyBehavior)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, resp.Status)
|
||||
|
||||
resp, err = logic.CheckVerificationCode(normalizedReq)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, resp.Status)
|
||||
|
||||
exists, err = redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, int64(0), exists)
|
||||
}
|
||||
|
||||
func TestCheckVerificationCodeLegacySceneFallback(t *testing.T) {
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
email := "fallback@example.com"
|
||||
code := "778899"
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, constant.Register.String(), email)
|
||||
setEmailCodePayload(t, redisClient, cacheKey, code, time.Now().Unix())
|
||||
|
||||
logic := NewCheckVerificationCodeLogic(context.Background(), svcCtx)
|
||||
req := &types.CheckVerificationCodeRequest{
|
||||
Method: authmethod.Email,
|
||||
Account: email,
|
||||
Code: code,
|
||||
Type: uint8(constant.Security),
|
||||
}
|
||||
|
||||
resp, err := logic.CheckVerificationCodeWithBehavior(req, VerifyCodeCheckBehavior{
|
||||
Source: "legacy",
|
||||
Consume: false,
|
||||
AllowSceneFallback: true,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.True(t, resp.Status)
|
||||
|
||||
resp, err = logic.CheckVerificationCodeWithBehavior(req, VerifyCodeCheckBehavior{
|
||||
Source: "legacy",
|
||||
Consume: false,
|
||||
AllowSceneFallback: false,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.False(t, resp.Status)
|
||||
}
|
||||
|
||||
func setEmailCodePayload(t *testing.T, redisClient *redis.Client, cacheKey string, code string, lastAt int64) {
|
||||
t.Helper()
|
||||
|
||||
payload := CacheKeyPayload{
|
||||
Code: code,
|
||||
LastAt: lastAt,
|
||||
}
|
||||
value, err := json.Marshal(payload)
|
||||
require.NoError(t, err)
|
||||
err = redisClient.Set(context.Background(), cacheKey, value, time.Minute*15).Err()
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestCheckVerificationCodeWithApiHeaderGate(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
header string
|
||||
expectConsume bool
|
||||
}{
|
||||
{name: "missing header", header: "", expectConsume: false},
|
||||
{name: "invalid header", header: "invalid", expectConsume: false},
|
||||
{name: "equal threshold", header: "1.0.0", expectConsume: false},
|
||||
{name: "greater threshold", header: "1.0.1", expectConsume: true},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
miniRedis := miniredis.RunT(t)
|
||||
redisClient := redis.NewClient(&redis.Options{Addr: miniRedis.Addr()})
|
||||
t.Cleanup(func() {
|
||||
redisClient.Close()
|
||||
miniRedis.Close()
|
||||
})
|
||||
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Redis: redisClient,
|
||||
Config: config.Config{
|
||||
VerifyCode: config.VerifyCode{
|
||||
VerifyCodeExpireTime: 900,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
email := "gate@example.com"
|
||||
code := "101010"
|
||||
cacheKey := fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, constant.Register.String(), email)
|
||||
setEmailCodePayload(t, redisClient, cacheKey, code, time.Now().Unix())
|
||||
|
||||
logic := NewCheckVerificationCodeLogic(context.Background(), svcCtx)
|
||||
req := &types.CheckVerificationCodeRequest{
|
||||
Method: authmethod.Email,
|
||||
Account: email,
|
||||
Code: code,
|
||||
Type: uint8(constant.Register),
|
||||
}
|
||||
|
||||
resp, err := logic.CheckVerificationCodeWithBehavior(req, VerifyCodeCheckBehavior{
|
||||
Source: "canonical",
|
||||
Consume: apiversion.UseLatest(tt.header, apiversion.DefaultThreshold),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
assert.True(t, resp.Status)
|
||||
|
||||
exists, err := redisClient.Exists(context.Background(), cacheKey).Result()
|
||||
require.NoError(t, err)
|
||||
if tt.expectConsume {
|
||||
assert.Equal(t, int64(0), exists)
|
||||
} else {
|
||||
assert.Equal(t, int64(1), exists)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -88,7 +88,9 @@ func (l *SendEmailCodeLogic) SendEmailCode(req *types.SendCodeRequest) (resp *ty
|
||||
var taskPayload queue.SendEmailPayload
|
||||
// Generate verification code
|
||||
code := random.Key(6, 0)
|
||||
scene := constant.ParseVerifyType(req.Type).String()
|
||||
taskPayload.Type = queue.EmailTypeVerify
|
||||
taskPayload.Scene = scene
|
||||
taskPayload.Email = req.Email
|
||||
taskPayload.Subject = "Verification code"
|
||||
|
||||
|
||||
@@ -0,0 +1,227 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/authmethod"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/phone"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var consumeVerifyCodeScript = redis.NewScript(`
|
||||
local current = redis.call("GET", KEYS[1])
|
||||
if not current then
|
||||
return 0
|
||||
end
|
||||
if current == ARGV[1] then
|
||||
redis.call("DEL", KEYS[1])
|
||||
return 1
|
||||
end
|
||||
return -1
|
||||
`)
|
||||
|
||||
type VerifyCodeCheckBehavior struct {
|
||||
Source string
|
||||
Consume bool
|
||||
LegacyType3Mapped bool
|
||||
AllowSceneFallback bool
|
||||
}
|
||||
|
||||
func NormalizeLegacyCheckVerificationCodeRequest(req *types.LegacyCheckVerificationCodeRequest) (*types.CheckVerificationCodeRequest, bool, error) {
|
||||
if req == nil {
|
||||
return nil, false, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "empty request")
|
||||
}
|
||||
|
||||
method := strings.ToLower(strings.TrimSpace(req.Method))
|
||||
account := strings.TrimSpace(req.Account)
|
||||
email := strings.ToLower(strings.TrimSpace(req.Email))
|
||||
if account == "" {
|
||||
account = email
|
||||
}
|
||||
if method == "" {
|
||||
method = authmethod.Email
|
||||
}
|
||||
|
||||
mappedType := req.Type
|
||||
legacyType3Mapped := false
|
||||
if mappedType == 3 {
|
||||
mappedType = uint8(constant.Security)
|
||||
legacyType3Mapped = true
|
||||
}
|
||||
|
||||
normalizedReq := &types.CheckVerificationCodeRequest{
|
||||
Method: method,
|
||||
Account: account,
|
||||
Code: strings.TrimSpace(req.Code),
|
||||
Type: mappedType,
|
||||
}
|
||||
|
||||
normalizedReq, err := normalizeCheckVerificationCodeRequest(normalizedReq)
|
||||
if err != nil {
|
||||
return nil, false, err
|
||||
}
|
||||
return normalizedReq, legacyType3Mapped, nil
|
||||
}
|
||||
|
||||
func (l *CheckVerificationCodeLogic) CheckVerificationCodeWithBehavior(req *types.CheckVerificationCodeRequest, behavior VerifyCodeCheckBehavior) (*types.CheckVerificationCodeRespone, error) {
|
||||
resp := &types.CheckVerificationCodeRespone{}
|
||||
|
||||
normalizedReq, err := normalizeCheckVerificationCodeRequest(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
source := strings.TrimSpace(behavior.Source)
|
||||
if source == "" {
|
||||
source = "canonical"
|
||||
}
|
||||
|
||||
verifyType := constant.ParseVerifyType(normalizedReq.Type)
|
||||
scenes := resolveVerifyScenes(verifyType, behavior.AllowSceneFallback)
|
||||
if len(scenes) == 0 {
|
||||
l.Infow("[CheckVerificationCode] unsupported verify type",
|
||||
logger.Field("verify_check_source", source),
|
||||
logger.Field("verify_consume", behavior.Consume),
|
||||
logger.Field("legacy_type3_mapped", behavior.LegacyType3Mapped),
|
||||
logger.Field("legacy_scene_fallback_hit", false),
|
||||
logger.Field("type", normalizedReq.Type),
|
||||
logger.Field("method", normalizedReq.Method),
|
||||
)
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
expireTime := l.svcCtx.Config.VerifyCode.VerifyCodeExpireTime
|
||||
if expireTime <= 0 {
|
||||
expireTime = 900
|
||||
}
|
||||
|
||||
for idx, scene := range scenes {
|
||||
cacheKey := buildVerifyCodeCacheKey(normalizedReq.Method, scene, normalizedReq.Account)
|
||||
value, redisErr := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
|
||||
if redisErr != nil || value == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
var payload CacheKeyPayload
|
||||
if err = json.Unmarshal([]byte(value), &payload); err != nil {
|
||||
continue
|
||||
}
|
||||
if payload.Code != normalizedReq.Code {
|
||||
continue
|
||||
}
|
||||
if time.Now().Unix()-payload.LastAt > expireTime {
|
||||
continue
|
||||
}
|
||||
|
||||
if behavior.Consume {
|
||||
consumed, consumeErr := consumeVerificationCodeAtomically(l.ctx, l.svcCtx.Redis, cacheKey, value)
|
||||
if consumeErr != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "consume verification code failed")
|
||||
}
|
||||
if !consumed {
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
fallbackHit := idx > 0
|
||||
resp.Status = true
|
||||
resp.Exist = true
|
||||
|
||||
l.Infow("[CheckVerificationCode] verify success",
|
||||
logger.Field("verify_check_source", source),
|
||||
logger.Field("verify_consume", behavior.Consume),
|
||||
logger.Field("legacy_type3_mapped", behavior.LegacyType3Mapped),
|
||||
logger.Field("legacy_scene_fallback_hit", fallbackHit),
|
||||
logger.Field("scene", scene),
|
||||
logger.Field("method", normalizedReq.Method),
|
||||
)
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
l.Infow("[CheckVerificationCode] verify failed",
|
||||
logger.Field("verify_check_source", source),
|
||||
logger.Field("verify_consume", behavior.Consume),
|
||||
logger.Field("legacy_type3_mapped", behavior.LegacyType3Mapped),
|
||||
logger.Field("legacy_scene_fallback_hit", false),
|
||||
logger.Field("type", normalizedReq.Type),
|
||||
logger.Field("method", normalizedReq.Method),
|
||||
)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func normalizeCheckVerificationCodeRequest(req *types.CheckVerificationCodeRequest) (*types.CheckVerificationCodeRequest, error) {
|
||||
if req == nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "empty request")
|
||||
}
|
||||
|
||||
method := strings.ToLower(strings.TrimSpace(req.Method))
|
||||
account := strings.TrimSpace(req.Account)
|
||||
code := strings.TrimSpace(req.Code)
|
||||
|
||||
switch method {
|
||||
case authmethod.Email:
|
||||
account = strings.ToLower(account)
|
||||
case authmethod.Mobile:
|
||||
if !phone.CheckPhone(account) {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.TelephoneError), "Invalid phone number")
|
||||
}
|
||||
default:
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid method")
|
||||
}
|
||||
|
||||
if account == "" {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required")
|
||||
}
|
||||
|
||||
return &types.CheckVerificationCodeRequest{
|
||||
Method: method,
|
||||
Account: account,
|
||||
Code: code,
|
||||
Type: req.Type,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func resolveVerifyScenes(verifyType constant.VerifyType, allowFallback bool) []string {
|
||||
switch verifyType {
|
||||
case constant.Register:
|
||||
if allowFallback {
|
||||
return []string{constant.Register.String(), constant.Security.String()}
|
||||
}
|
||||
return []string{constant.Register.String()}
|
||||
case constant.Security:
|
||||
if allowFallback {
|
||||
return []string{constant.Security.String(), constant.Register.String()}
|
||||
}
|
||||
return []string{constant.Security.String()}
|
||||
case constant.DeleteAccount:
|
||||
return []string{constant.DeleteAccount.String()}
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func buildVerifyCodeCacheKey(method string, scene string, account string) string {
|
||||
if method == authmethod.Mobile {
|
||||
return fmt.Sprintf("%s:%s:+%s", config.AuthCodeTelephoneCacheKey, scene, account)
|
||||
}
|
||||
return fmt.Sprintf("%s:%s:%s", config.AuthCodeCacheKey, scene, account)
|
||||
}
|
||||
|
||||
func consumeVerificationCodeAtomically(ctx context.Context, redisClient *redis.Client, cacheKey string, expectedValue string) (bool, error) {
|
||||
result, err := consumeVerifyCodeScript.Run(ctx, redisClient, []string{cacheKey}, expectedValue).Int()
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return result == 1, nil
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/apiversion"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
)
|
||||
|
||||
func ApiVersionMiddleware(_ *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
rawVersion := strings.TrimSpace(c.GetHeader("api-header"))
|
||||
useLatest := apiversion.UseLatest(rawVersion, apiversion.DefaultThreshold)
|
||||
|
||||
ctx := context.WithValue(c.Request.Context(), constant.CtxKeyAPIVersionUseLatest, useLatest)
|
||||
ctx = context.WithValue(ctx, constant.CtxKeyAPIHeaderRaw, rawVersion)
|
||||
c.Request = c.Request.WithContext(ctx)
|
||||
|
||||
c.Set("api_header", rawVersion)
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ func CorsMiddleware(c *gin.Context) {
|
||||
}
|
||||
// c.Writer.Header().Set("Access-Control-Allow-Origin", c.Request.Host)
|
||||
c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Origin, X-CSRF-Token, Authorization, AccessToken, Token, Range")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Origin, X-CSRF-Token, Authorization, AccessToken, Token, Range, api-header")
|
||||
c.Writer.Header().Set("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
|
||||
c.Writer.Header().Set("Access-Control-Max-Age", "172800")
|
||||
|
||||
@@ -70,6 +70,9 @@ func LoggerMiddleware(svc *svc.ServiceContext) func(c *gin.Context) {
|
||||
Value: c.Request.UserAgent(),
|
||||
},
|
||||
}
|
||||
if apiHeader, ok := c.Get("api_header"); ok {
|
||||
logs = append(logs, logger.Field("api_header", apiHeader))
|
||||
}
|
||||
if c.Errors.Last() != nil {
|
||||
var e *xerr.CodeError
|
||||
var errMessage string
|
||||
|
||||
+24
-10
@@ -113,16 +113,17 @@ func (l *TelegramAuthConfig) Unmarshal(data string) error {
|
||||
}
|
||||
|
||||
type EmailAuthConfig struct {
|
||||
Platform string `json:"platform"`
|
||||
PlatformConfig interface{} `json:"platform_config"`
|
||||
EnableVerify bool `json:"enable_verify"`
|
||||
EnableNotify bool `json:"enable_notify"`
|
||||
EnableDomainSuffix bool `json:"enable_domain_suffix"`
|
||||
DomainSuffixList string `json:"domain_suffix_list"`
|
||||
VerifyEmailTemplate string `json:"verify_email_template"`
|
||||
ExpirationEmailTemplate string `json:"expiration_email_template"`
|
||||
MaintenanceEmailTemplate string `json:"maintenance_email_template"`
|
||||
TrafficExceedEmailTemplate string `json:"traffic_exceed_email_template"`
|
||||
Platform string `json:"platform"`
|
||||
PlatformConfig interface{} `json:"platform_config"`
|
||||
EnableVerify bool `json:"enable_verify"`
|
||||
EnableNotify bool `json:"enable_notify"`
|
||||
EnableDomainSuffix bool `json:"enable_domain_suffix"`
|
||||
DomainSuffixList string `json:"domain_suffix_list"`
|
||||
VerifyEmailTemplate string `json:"verify_email_template"`
|
||||
VerifyEmailTemplates map[string]string `json:"verify_email_templates"`
|
||||
ExpirationEmailTemplate string `json:"expiration_email_template"`
|
||||
MaintenanceEmailTemplate string `json:"maintenance_email_template"`
|
||||
TrafficExceedEmailTemplate string `json:"traffic_exceed_email_template"`
|
||||
}
|
||||
|
||||
func (l *EmailAuthConfig) Marshal() string {
|
||||
@@ -138,6 +139,9 @@ func (l *EmailAuthConfig) Marshal() string {
|
||||
if l.VerifyEmailTemplate == "" {
|
||||
l.VerifyEmailTemplate = email.DefaultEmailVerifyTemplate
|
||||
}
|
||||
if l.VerifyEmailTemplates == nil {
|
||||
l.VerifyEmailTemplates = map[string]string{}
|
||||
}
|
||||
bytes, err := json.Marshal(l)
|
||||
if err != nil {
|
||||
config := &EmailAuthConfig{
|
||||
@@ -148,6 +152,7 @@ func (l *EmailAuthConfig) Marshal() string {
|
||||
EnableDomainSuffix: false,
|
||||
DomainSuffixList: "",
|
||||
VerifyEmailTemplate: email.DefaultEmailVerifyTemplate,
|
||||
VerifyEmailTemplates: map[string]string{},
|
||||
ExpirationEmailTemplate: email.DefaultExpirationEmailTemplate,
|
||||
MaintenanceEmailTemplate: email.DefaultMaintenanceEmailTemplate,
|
||||
TrafficExceedEmailTemplate: email.DefaultTrafficExceedEmailTemplate,
|
||||
@@ -169,11 +174,20 @@ func (l *EmailAuthConfig) Unmarshal(data string) {
|
||||
EnableDomainSuffix: false,
|
||||
DomainSuffixList: "",
|
||||
VerifyEmailTemplate: email.DefaultEmailVerifyTemplate,
|
||||
VerifyEmailTemplates: map[string]string{},
|
||||
ExpirationEmailTemplate: email.DefaultExpirationEmailTemplate,
|
||||
MaintenanceEmailTemplate: email.DefaultMaintenanceEmailTemplate,
|
||||
TrafficExceedEmailTemplate: email.DefaultTrafficExceedEmailTemplate,
|
||||
}
|
||||
_ = json.Unmarshal([]byte(config.Marshal()), &l)
|
||||
return
|
||||
}
|
||||
|
||||
if l.VerifyEmailTemplate == "" {
|
||||
l.VerifyEmailTemplate = email.DefaultEmailVerifyTemplate
|
||||
}
|
||||
if l.VerifyEmailTemplates == nil {
|
||||
l.VerifyEmailTemplates = map[string]string{}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ func initServer(svc *svc.ServiceContext) *gin.Engine {
|
||||
}
|
||||
r.Use(sessions.Sessions("ppanel", sessionStore))
|
||||
// use cors middleware
|
||||
r.Use(middleware.TraceMiddleware(svc), middleware.LoggerMiddleware(svc), middleware.CorsMiddleware, gin.Recovery())
|
||||
r.Use(middleware.TraceMiddleware(svc), middleware.ApiVersionMiddleware(svc), middleware.LoggerMiddleware(svc), middleware.CorsMiddleware, gin.Recovery())
|
||||
|
||||
// register handlers
|
||||
handler.RegisterHandlers(r, svc)
|
||||
|
||||
@@ -218,6 +218,20 @@ type CheckVerificationCodeRequest struct {
|
||||
|
||||
type CheckVerificationCodeRespone struct {
|
||||
Status bool `json:"status"`
|
||||
Exist bool `json:"exist,omitempty"`
|
||||
}
|
||||
|
||||
type LegacyCheckVerificationCodeRequest struct {
|
||||
Method string `json:"method" form:"method"`
|
||||
Account string `json:"account" form:"account"`
|
||||
Email string `json:"email" form:"email"`
|
||||
Code string `json:"code" form:"code" validate:"required"`
|
||||
Type uint8 `json:"type" form:"type" validate:"required"`
|
||||
}
|
||||
|
||||
type LegacyCheckVerificationCodeResponse struct {
|
||||
Status bool `json:"status"`
|
||||
Exist bool `json:"exist"`
|
||||
}
|
||||
|
||||
type CheckoutOrderRequest struct {
|
||||
|
||||
Reference in New Issue
Block a user