Fix handling of redirect_uris with a query string

[tekul]

These are allowed by OAuth2 and the query parameters should be retained when building the new redirect. The current code is broken in that it will append a new query on the end.

Both the error and success cases need to be dealt with. The code should be refactored to share the redirect URL building functionality.