fish/trading_assistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
vipg
2026-02-09 17:54:46 +08:00
parent 65353ee4a2
commit cc8dfdad80
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trading_assistant_api/common/httpx/auth.go
View File

@@ -6,6 +6,7 @@ import (
"strings"
"common/auth"
"common/logger"
)
type userIDKey struct{}
@@ -15,13 +16,15 @@ func AuthRequired() func(http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ah := r.Header.Get("Authorization")
if ah == "" || !strings.HasPrefix(ah, "Bearer ") {
Unauthorized(w, "unauthorized")
logger.WithPrefix("rid="+RequestIDFromContext(r)).Printf("auth missing header path=%s", r.URL.Path)
Unauthorized(w, r, "unauthorized")
return
}
token := strings.TrimSpace(strings.TrimPrefix(ah, "Bearer "))
sub, err := auth.ParseToken(token)
if err != nil || sub == "" {
Unauthorized(w, "unauthorized")
logger.WithPrefix("rid="+RequestIDFromContext(r)).Printf("auth invalid token path=%s", r.URL.Path)
Unauthorized(w, r, "unauthorized")
return
}
ctx := context.WithValue(r.Context(), userIDKey{}, sub)

40
trading_assistant_api/common/httpx/httpx.go
View File

@@ -14,30 +14,42 @@ func WriteJSON(w http.ResponseWriter, status int, ok bool, msg string, data inte
json.NewEncoder(w).Encode(types.Response{Status: ok, Message: msg, Data: data})
}
func OK(w http.ResponseWriter, data interface{}) {
WriteJSON(w, http.StatusOK, true, string(codes.OK), data)
func OK(w http.ResponseWriter, r *http.Request, data interface{}) {
WriteJSON(w, http.StatusOK, true, string(codes.OK), addRequestID(r, data))
}
func Created(w http.ResponseWriter, data interface{}) {
WriteJSON(w, http.StatusCreated, true, string(codes.OK), data)
func Created(w http.ResponseWriter, r *http.Request, data interface{}) {
WriteJSON(w, http.StatusCreated, true, string(codes.OK), addRequestID(r, data))
}
func BadRequest(w http.ResponseWriter, msg string) {
WriteJSON(w, http.StatusBadRequest, false, msg, map[string]string{"code": string(codes.InvalidInput)})
func BadRequest(w http.ResponseWriter, r *http.Request, msg string) {
WriteJSON(w, http.StatusBadRequest, false, msg, addRequestID(r, map[string]string{"code": string(codes.InvalidInput)}))
}
func Unauthorized(w http.ResponseWriter, msg string) {
WriteJSON(w, http.StatusUnauthorized, false, msg, map[string]string{"code": string(codes.Unauthorized)})
func Unauthorized(w http.ResponseWriter, r *http.Request, msg string) {
WriteJSON(w, http.StatusUnauthorized, false, msg, addRequestID(r, map[string]string{"code": string(codes.Unauthorized)}))
}
func Conflict(w http.ResponseWriter, msg string) {
WriteJSON(w, http.StatusConflict, false, msg, map[string]string{"code": string(codes.Conflict)})
func Conflict(w http.ResponseWriter, r *http.Request, msg string) {
WriteJSON(w, http.StatusConflict, false, msg, addRequestID(r, map[string]string{"code": string(codes.Conflict)}))
}
func MethodNotAllowed(w http.ResponseWriter, msg string) {
WriteJSON(w, http.StatusMethodNotAllowed, false, msg, map[string]string{"code": string(codes.MethodNotAllowed)})
func MethodNotAllowed(w http.ResponseWriter, r *http.Request, msg string) {
WriteJSON(w, http.StatusMethodNotAllowed, false, msg, addRequestID(r, map[string]string{"code": string(codes.MethodNotAllowed)}))
}
func InternalError(w http.ResponseWriter) {
WriteJSON(w, http.StatusInternalServerError, false, string(codes.InternalError), map[string]string{"code": string(codes.InternalError)})
func InternalError(w http.ResponseWriter, r *http.Request) {
WriteJSON(w, http.StatusInternalServerError, false, string(codes.InternalError), addRequestID(r, map[string]string{"code": string(codes.InternalError)}))
}
func addRequestID(r *http.Request, data interface{}) interface{} {
rid := RequestIDFromContext(r)
if m, ok := data.(map[string]string); ok {
m["request_id"] = rid
return m
}
if data == nil {
return map[string]string{"request_id": rid}
}
return map[string]interface{}{"request_id": rid, "data": data}
}