Move auth URI code to apply to all requests, append if request doesn't already have a marketplace ID