[query] move EPO user/token into the datafield

This simplifies the WithQuery structure even more
parent 93586adc
Pipeline #7211 failed with stages
in 51 minutes and 40 seconds