fix conflict

torcolvin · torcolvin · commit 4c62c4dd01de · 2025-11-11T17:51:13.000-05:00
diff --git a/rest/handler.go b/rest/handler.go
@@ -1029,7 +1029,7 @@ func (h *handler) setUserForPublicAuth(dbCtx *db.DatabaseContext) (base.AuditFie
 			var err error
 			auditFields = base.AuditFields{base.AuditFieldAuthMethod: "websocket_token"}
 			h.user, err = dbCtx.Authenticator(h.ctx()).AuthenticateOneTimeSession(h.ctx(), sessionID)
-			return err
+			return auditFields, err
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@ func (h handler) setUserForPublicAuth(dbCtx db.DatabaseContext) (base.AuditFie`
`1029`	`1029`	`var err error`
`1030`	`1030`	`auditFields = base.AuditFields{base.AuditFieldAuthMethod: "websocket_token"}`
`1031`	`1031`	`h.user, err = dbCtx.Authenticator(h.ctx()).AuthenticateOneTimeSession(h.ctx(), sessionID)`
`1032`		`- return err`
	`1032`	`+ return auditFields, err`
`1033`	`1033`	`}`
`1034`	`1034`	`}`
`1035`	`1035`