Merge remote-tracking branch 'origin/master' into internal

2026-03-19 01:55:01 -07:00
parent 5898b74647 bc721b0ba6
commit e5e9f93f68
101 changed files with 6910 additions and 330 deletions
@@ -11,13 +11,15 @@ info (
 type (
 	// User login request
 	UserLoginRequest {
-		Identifier string `json:"identifier"`
-		Email      string `json:"email" validate:"required"`
-		Password   string `json:"password" validate:"required"`
-		IP         string `header:"X-Original-Forwarded-For"`
-		UserAgent  string `header:"User-Agent"`
-		LoginType  string `header:"Login-Type"`
-		CfToken    string `json:"cf_token,optional"`
+		Identifier  string `json:"identifier"`
+		Email       string `json:"email" validate:"required"`
+		Password    string `json:"password" validate:"required"`
+		IP          string `header:"X-Original-Forwarded-For"`
+		UserAgent   string `header:"User-Agent"`
+		LoginType   string `header:"Login-Type"`
+		CfToken     string `json:"cf_token,optional"`
+		CaptchaId   string `json:"captcha_id,optional"`
+		CaptchaCode string `json:"captcha_code,optional"`
 	}
 	// Check user is exist request
 	CheckUserRequest {
@@ -29,26 +31,30 @@ type (
 	}
 	// User login response
 	UserRegisterRequest {
-		Identifier string `json:"identifier"`
-		Email      string `json:"email" validate:"required"`
-		Password   string `json:"password" validate:"required"`
-		Invite     string `json:"invite,optional"`
-		Code       string `json:"code,optional"`
-		IP         string `header:"X-Original-Forwarded-For"`
-		UserAgent  string `header:"User-Agent"`
-		LoginType  string `header:"Login-Type"`
-		CfToken    string `json:"cf_token,optional"`
+		Identifier  string `json:"identifier"`
+		Email       string `json:"email" validate:"required"`
+		Password    string `json:"password" validate:"required"`
+		Invite      string `json:"invite,optional"`
+		Code        string `json:"code,optional"`
+		IP          string `header:"X-Original-Forwarded-For"`
+		UserAgent   string `header:"User-Agent"`
+		LoginType   string `header:"Login-Type"`
+		CfToken     string `json:"cf_token,optional"`
+		CaptchaId   string `json:"captcha_id,optional"`
+		CaptchaCode string `json:"captcha_code,optional"`
 	}
-	// User login response
+	// User reset password request
 	ResetPasswordRequest {
-		Identifier string `json:"identifier"`
-		Email      string `json:"email" validate:"required"`
-		Password   string `json:"password" validate:"required"`
-		Code       string `json:"code,optional"`
-		IP         string `header:"X-Original-Forwarded-For"`
-		UserAgent  string `header:"User-Agent"`
-		LoginType  string `header:"Login-Type"`
-		CfToken    string `json:"cf_token,optional"`
+		Identifier  string `json:"identifier"`
+		Email       string `json:"email" validate:"required"`
+		Password    string `json:"password" validate:"required"`
+		Code        string `json:"code,optional"`
+		IP          string `header:"X-Original-Forwarded-For"`
+		UserAgent   string `header:"User-Agent"`
+		LoginType   string `header:"Login-Type"`
+		CfToken     string `json:"cf_token,optional"`
+		CaptchaId   string `json:"captcha_id,optional"`
+		CaptchaCode string `json:"captcha_code,optional"`
 	}
 	// Email login request
 	EmailLoginRequest {
@@ -86,6 +92,8 @@ type (
 		UserAgent         string `header:"User-Agent"`
 		LoginType         string `header:"Login-Type"`
 		CfToken           string `json:"cf_token,optional"`
+		CaptchaId         string `json:"captcha_id,optional"`
+		CaptchaCode       string `json:"captcha_code,optional"`
 	}
 	// Check user is exist request
 	TelephoneCheckUserRequest {
@@ -108,6 +116,8 @@ type (
 		UserAgent         string `header:"User-Agent"`
 		LoginType         string `header:"Login-Type,optional"`
 		CfToken           string `json:"cf_token,optional"`
+		CaptchaId         string `json:"captcha_id,optional"`
+		CaptchaCode       string `json:"captcha_code,optional"`
 	}
 	// User login response
 	TelephoneResetPasswordRequest {
@@ -120,6 +130,8 @@ type (
 		UserAgent         string `header:"User-Agent"`
 		LoginType         string `header:"Login-Type,optional"`
 		CfToken           string `json:"cf_token,optional"`
+		CaptchaId         string `json:"captcha_id,optional"`
+		CaptchaCode       string `json:"captcha_code,optional"`
 	}
 	AppleLoginCallbackRequest {
 		Code    string `form:"code"`
@@ -137,6 +149,11 @@ type (
 		CfToken    string `json:"cf_token,optional"`
 		ShortCode  string `json:"short_code,optional"`
 	}
+	GenerateCaptchaResponse {
+		Id    string `json:"id"`
+		Image string `json:"image"`
+		Type  string `json:"type"`
+	}
 )

@server (
@@ -181,11 +198,34 @@ service ppanel {
 	@handler TelephoneResetPassword
 	post /reset/telephone (TelephoneResetPasswordRequest) returns (LoginResponse)

+	@doc "Generate captcha"
+	@handler GenerateCaptcha
+	post /captcha/generate returns (GenerateCaptchaResponse)
+
 	@doc "Device Login"
 	@handler DeviceLogin
 	post /login/device (DeviceLoginRequest) returns (LoginResponse)
 }

+@server (
+	prefix:     v1/auth/admin
+	group:      auth/admin
+	middleware: DeviceMiddleware
+)
+service ppanel {
+	@doc "Admin login"
+	@handler AdminLogin
+	post /login (UserLoginRequest) returns (LoginResponse)
+
+	@doc "Admin reset password"
+	@handler AdminResetPassword
+	post /reset (ResetPasswordRequest) returns (LoginResponse)
+
+	@doc "Generate captcha"
+	@handler AdminGenerateCaptcha
+	post /captcha/generate returns (GenerateCaptchaResponse)
+}
+
@server (
 	prefix: v1/auth/oauth
 	group:  auth/oauth