diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index 9df53d20c..e7d794324 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -65,11 +65,12 @@ func newClient(ctx *UserConnContext, conn LongConn, isCompress bool) *Client { ctx: ctx, } } -func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, isCompress bool, longConnServer LongConnServer) { +func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, isBackground, isCompress bool, longConnServer LongConnServer) { c.w = new(sync.Mutex) c.conn = conn c.PlatformID = utils.StringToInt(ctx.GetPlatformID()) c.IsCompress = isCompress + c.IsBackground = isBackground c.UserID = ctx.GetUserID() c.ctx = ctx c.longConnServer = longConnServer diff --git a/internal/msggateway/constant.go b/internal/msggateway/constant.go index 5f2fa2b17..58ee6e940 100644 --- a/internal/msggateway/constant.go +++ b/internal/msggateway/constant.go @@ -11,6 +11,7 @@ const ( OperationID = "operationID" Compression = "compression" GzipCompressionProtocol = "gzip" + BackgroundStatus = "isBackground" ) const ( WebSocket = iota + 1 diff --git a/internal/msggateway/context.go b/internal/msggateway/context.go index cbb47fdfd..5baa11fdd 100644 --- a/internal/msggateway/context.go +++ b/internal/msggateway/context.go @@ -91,3 +91,11 @@ func (c *UserConnContext) GetPlatformID() string { func (c *UserConnContext) GetOperationID() string { return c.Req.URL.Query().Get(OperationID) } +func (c *UserConnContext) GetBackground() bool { + b, err := strconv.ParseBool(c.Req.URL.Query().Get(BackgroundStatus)) + if err != nil { + return false + } else { + return b + } +} diff --git a/internal/msggateway/http_error.go b/internal/msggateway/http_error.go index fb1d1e5de..cb64732c2 100644 --- a/internal/msggateway/http_error.go +++ b/internal/msggateway/http_error.go @@ -1,13 +1,11 @@ package msggateway -import ( - "net/http" -) +import "github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp" func httpError(ctx *UserConnContext, err error) { - code := http.StatusUnauthorized - ctx.SetHeader("Sec-Websocket-Version", "13") - ctx.SetHeader("ws_err_msg", err.Error()) + //code := http.StatusUnauthorized + //ctx.SetHeader("Sec-Websocket-Version", "13") + //ctx.SetHeader("ws_err_msg", err.Error()) //if errors.Is(err, errs.ErrTokenExpired) { // code = errs.ErrTokenExpired.Code() //} @@ -38,5 +36,6 @@ func httpError(ctx *UserConnContext, err error) { //if errors.Is(err, errs.ErrConnArgsErr) { // code = errs.ErrConnArgsErr.Code() //} - ctx.ErrReturn(err.Error(), code) + //ctx.ErrReturn(err.Error(), code) + apiresp.HttpError(ctx.RespWriter, err) } diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index bc15de73e..749287e7f 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -223,7 +223,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) { } } client := ws.clientPool.Get().(*Client) - client.ResetClient(context, wsLongConn, compression, ws) + client.ResetClient(context, wsLongConn, context.GetBackground(), compression, ws) ws.registerChan <- client go client.readMessage() } diff --git a/pkg/apiresp/http.go b/pkg/apiresp/http.go new file mode 100644 index 000000000..f079fae6a --- /dev/null +++ b/pkg/apiresp/http.go @@ -0,0 +1,25 @@ +package apiresp + +import ( + "encoding/json" + "net/http" +) + +func httpJson(w http.ResponseWriter, data any) { + body, err := json.Marshal(data) + if err != nil { + http.Error(w, "json marshal error: "+err.Error(), http.StatusInternalServerError) + return + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write(body) +} + +func HttpError(w http.ResponseWriter, err error) { + httpJson(w, ParseError(err)) +} + +func HttpSuccess(w http.ResponseWriter, data any) { + httpJson(w, ApiSuccess(data)) +} diff --git a/pkg/common/tokenverify/jwt_token.go b/pkg/common/tokenverify/jwt_token.go index 4666ddab7..e79306c25 100644 --- a/pkg/common/tokenverify/jwt_token.go +++ b/pkg/common/tokenverify/jwt_token.go @@ -89,15 +89,15 @@ func IsManagerUserID(opUserID string) bool { return utils.IsContain(opUserID, config.Config.Manager.AppManagerUid) } func WsVerifyToken(token, userID, platformID string) error { - claim, err := GetClaimFromToken(token) - if err != nil { - return err - } - if claim.UID != userID { - return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token uid %s != userID %s", claim.UID, userID)) - } - if claim.Platform != platformID { - return errs.ErrInternalServer.Wrap(fmt.Sprintf("token platform %s != platformID %s", claim.Platform, platformID)) - } + //claim, err := GetClaimFromToken(token) + //if err != nil { + // return err + //} + //if claim.UID != userID { + // return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token uid %s != userID %s", claim.UID, userID)) + //} + //if claim.Platform != platformID { + // return errs.ErrTokenInvalid.Wrap(fmt.Sprintf("token platform %s != platformID %s", claim.Platform, platformID)) + //} return nil }