Wrong queryString when building navigation plan in aurelia-router

I’m submitting a bug report

• Library Version: 1.7.1

Please tell us about your environment:

• Operating System: Windows 10

• Node Version: 10.15.1

• NPM Version: 6.4.1

• JSPM OR Webpack AND Version webpack 4.29.6

• Browser: all

• Language: TypeScript

Current behavior: Not redirected with correct query parameter. We are using aurelia-open-id-connect and when redirected back from our identity provider the query parameters are removed when creating the redirectPlan in aurelia-router, navigation-plan.ts. In my example you can see that the path we’re navigating to is “/example?test=123”. But in the end the query string is removed because the wrong instruction is used when getting query params.

• What is the expected behavior? Instead of getting queryString from instruction like this:

if (instruction.queryString) {
    redirectLocation += '?' + instruction.queryString;
}

I think you should get it from redirectInstruction like this:

if (redirectInstruction.queryString) {
    redirectLocation += '?' + newInstruction.queryString;
}

[MartyBoi]

@bigopon I think something like this should keep your existing tests intact and fix the issue I’m having. Could you please try this?

let queryString = instruction.queryString;
if (queryString) {
   redirectLocation += '?' + queryString;
}
let redirectQueryString = redirectInstruction.queryString;
if (redirectQueryString) {
   if (queryString) {
      redirectLocation += redirectQueryString;
   } else {
      redirectLocation += '?' + redirectQueryString;
   }
}

[rmja]

@davismj There are simple failing examples in #667 and #643 seems to solve the issue.