Encode EDS search query in URL when encoding link for OA Proxy Workaround

Currently, when a Discovery profile is set to use the OpenAthens Proxy Workaround, everything but the search term being queried is encoded. This is resulting in being taken to the main EDS landing page, but the search is not carried over.

Example query url:

https://proxy.openathens.net/login?entityID=https%3A%2F%2Fidp.wa.galileo.usg.edu%2Fentity&qurl=http%3A%2F%2Fsearch.ebscohost.com%2Flogin.aspx%3Fauthtype%3Dip%26direct%3Dtrue%26scope%3Dsite%26site%3Deds-live%26mode%3Dand%26lang%3Den%26profile%3Dusg&bquery=nursing

We the search term that's included in the URL also encoded, like this:

https://proxy.openathens.net/login?entityID=https%3A%2F%2Fidp.wa.galileo.usg.edu%2Fentity&qurl=http%3A%2F%2Fsearch.ebscohost.com%2Flogin.aspx%3Fauthtype%3Dip%26direct%3Dtrue%26scope%3Dsite%26site%3Deds-live%26mode%3Dand%26lang%3Den%26profile%3Dusg%26bquery=nursing

Notice the first url has "&bquery=nursing" at the end and the second url has "%26bquery=nursing"

You can replicate the behavior by logging into GALILEO Staging as dem4 and performing a Classic Search. For testing purposes, I have the zbds:usg and zbds:neweds Discovery profiles set to use the OAproxy (and removed the "proxy remote" setting).

1. Go to https://gs-staging.galileo.usg.edu/
2. Log in as dem4
3. Perform a Classic Search
4. You will then be prompted to log in again since the OA proxy workaround is setup for prod but not staging. Go ahead and log in again as dem4.
5. Go back to Go to https://gs-staging.galileo.usg.edu/ again
6. Perform a Classic Search
7. You should be taken to the EDS landing page instead of the results page