vinchent/howmuch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make create session works

Browse Source
This commit is contained in:
Muyao CHEN
2024-10-13 21:55:26 +02:00
parent 7ff91bab1d
commit 9290bcf88c
9 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/log/log.go
View File

@ -27,7 +27,7 @@ import (
"sync"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/core"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/middleware"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/shared"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
@ -110,8 +110,12 @@ func CtxLog(ctx core.Context) *zapLogger {
func (z *zapLogger) CtxLog(ctx core.Context) *zapLogger {
zz := z.clone()
if rid := ctx.GetHeader(middleware.XRequestID); rid != "" {
zz.z = zz.z.With(zap.Any(middleware.XRequestID, rid))
if rid := ctx.GetHeader(shared.XRequestID); rid != "" {
zz.z = zz.z.With(zap.Any(shared.XRequestID, rid))
}
if user := ctx.GetHeader(shared.XUserName); user != "" {
zz.z = zz.z.With(zap.Any(shared.XUserName, user))
}
return zz

6
internal/pkg/middleware/authn.go
View File

@ -27,6 +27,7 @@ import (
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/core"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/errno"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/shared"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/token"
"github.com/gin-gonic/gin"
)
@ -37,8 +38,6 @@ var ErrTokenInvalid = &errno.Errno{
Message: "invalid token",
}
const XUserName = "X-Username"
// Authn authenticates a user's access by validating their token.
func Authn() gin.HandlerFunc {
return func(ctx *gin.Context) {
@ -46,11 +45,12 @@ func Authn() gin.HandlerFunc {
if err != nil || tk == nil {
core.WriteResponse(ctx, ErrTokenInvalid, nil)
ctx.Abort()
return
}
// TODO: check if the key is on logout blacklist.
ctx.Header(XUserName, tk.Identity)
ctx.Header(shared.XUserName, tk.Identity)
ctx.Next()
}
}

11
internal/pkg/middleware/requestid.go
View File

@ -23,24 +23,23 @@
package middleware
import (
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/shared"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
const XRequestID = "X-Request-Id"
func RequestID() gin.HandlerFunc {
return func(ctx *gin.Context) {
var rid string
if rid = ctx.GetHeader(XRequestID); rid != "" {
ctx.Request.Header.Add(XRequestID, rid)
if rid = ctx.GetHeader(shared.XRequestID); rid != "" {
ctx.Request.Header.Add(shared.XRequestID, rid)
ctx.Next()
}
rid = uuid.NewString()
ctx.Request.Header.Add(XRequestID, rid)
ctx.Header(XRequestID, rid)
ctx.Request.Header.Add(shared.XRequestID, rid)
ctx.Header(shared.XRequestID, rid)
ctx.Next()
}
}

9
internal/pkg/middleware/requestid_test.go
View File

@ -26,6 +26,7 @@ import (
"net/http"
"testing"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/shared"
"git.vinchent.xyz/vinchent/howmuch/internal/pkg/test"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
@ -39,12 +40,12 @@ func TestRequestID(t *testing.T) {
wanted := "123"
r.GET("/example", func(c *gin.Context) {
got = c.GetHeader(XRequestID)
got = c.GetHeader(shared.XRequestID)
c.Status(http.StatusOK)
})
r.POST("/example", func(c *gin.Context) {
got = c.GetHeader(XRequestID)
got = c.GetHeader(shared.XRequestID)
c.String(http.StatusAccepted, "ok")
})
@ -55,12 +56,12 @@ func TestRequestID(t *testing.T) {
"GET",
"/example?a=100",
nil,
test.Header{Key: XRequestID, Value: wanted},
test.Header{Key: shared.XRequestID, Value: wanted},
)
assert.Equal(t, "123", got)
res := test.PerformRequest(t, r, "GET", "/example?a=100", nil)
assert.NotEqual(t, "", got)
assert.NoError(t, uuid.Validate(got))
assert.Equal(t, res.Header()[XRequestID][0], got)
assert.Equal(t, res.Header()[shared.XRequestID][0], got)
}

6
internal/pkg/shared/const.go Normal file
View File

@ -0,0 +1,6 @@
package shared
const (
XRequestID = "X-Request-Id"
XUserName = "X-Username"
)