Fixed UserInfo middleware
This commit is contained in:
parent
389dbae5b4
commit
17b8282b5e
@ -31,13 +31,11 @@ func UserInfo() aero.Middleware {
|
||||
return func(ctx *aero.Context, next func()) {
|
||||
next()
|
||||
|
||||
// This works asynchronously so it doesn't block the response
|
||||
go updateUserInfo(ctx)
|
||||
}
|
||||
// Ignore non-HTML requests
|
||||
if strings.Index(ctx.GetRequestHeader("Accept"), "text/html") == -1 {
|
||||
return
|
||||
}
|
||||
|
||||
// updateUserInfo is started asynchronously so it doesn't block the request
|
||||
func updateUserInfo(ctx *aero.Context) {
|
||||
user := utils.GetUser(ctx)
|
||||
|
||||
// When there's no user logged in, nothing to update
|
||||
@ -45,11 +43,13 @@ func updateUserInfo(ctx *aero.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Ignore non-HTML requests
|
||||
if strings.Index(ctx.GetRequestHeader("Accept"), "text/html") == -1 {
|
||||
return
|
||||
// This works asynchronously so it doesn't block the response
|
||||
go updateUserInfo(ctx, user)
|
||||
}
|
||||
}
|
||||
|
||||
// updateUserInfo is started asynchronously so it doesn't block the request
|
||||
func updateUserInfo(ctx *aero.Context, user *arn.User) {
|
||||
newIP := ctx.RealIP()
|
||||
newUserAgent := ctx.UserAgent()
|
||||
|
||||
@ -69,6 +69,14 @@ func updateUserInfo(ctx *aero.Context) {
|
||||
}
|
||||
|
||||
if user.IP != newIP {
|
||||
updateUserLocation(user, newIP)
|
||||
}
|
||||
|
||||
user.LastSeen = arn.DateTimeUTC()
|
||||
user.Save()
|
||||
}
|
||||
|
||||
func updateUserLocation(user *arn.User, newIP string) {
|
||||
user.IP = newIP
|
||||
locationAPI := "https://api.ipinfodb.com/v3/ip-city/?key=" + apiKeys.IPInfoDB.ID + "&ip=" + user.IP + "&format=json"
|
||||
|
||||
@ -98,7 +106,3 @@ func updateUserInfo(ctx *aero.Context) {
|
||||
user.Location.ZipCode = newLocation.ZipCode
|
||||
}
|
||||
}
|
||||
|
||||
user.LastSeen = arn.DateTimeUTC()
|
||||
user.Save()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user