mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

fix: sentry middleware interface conversion

Browse Source
This commit is contained in:
Ferdinand Mütsch 2023-01-02 10:55:57 +01:00
parent c1f1b05fa8
commit cf5a515952
3 changed files with 951 additions and 949 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/sentry.go
View File

@ -146,15 +146,12 @@ func initSentry(config sentryConfig, debug bool) {
// returns a user id // returns a user id
func getPrincipal(r *http.Request) string { func getPrincipal(r *http.Request) string {
type identifiable interface { type principalIdentityGetter interface {
Identity() string GetPrincipalIdentity() string
}
type principalGetter interface {
GetPrincipal() *identifiable
} }
if p := r.Context().Value("principal"); p != nil { if p := r.Context().Value("principal"); p != nil {
return (*p.(principalGetter).GetPrincipal()).Identity() return p.(principalIdentityGetter).GetPrincipalIdentity()
} }
return "" return ""
} }

1887
coverage/coverage.out
View File

File diff suppressed because it is too large Load Diff

4
middlewares/principal.go
View File

@ -20,6 +20,10 @@ func (c *PrincipalContainer) GetPrincipal() *models.User {
return c.principal return c.principal
} }
func (c *PrincipalContainer) GetPrincipalIdentity() string {
return c.principal.Identity()
}
// This middleware is a bit of a dirty workaround to the fact that a http.Request's context // This middleware is a bit of a dirty workaround to the fact that a http.Request's context
// does not allow to pass values from an inner to an outer middleware. Calling WithContext() on a // does not allow to pass values from an inner to an outer middleware. Calling WithContext() on a
// request shallow-copies the whole request itself and therefore, in a chain of handler1(handler2()), // request shallow-copies the whole request itself and therefore, in a chain of handler1(handler2()),