fix: [#754] Set the ID of the original requester early

[vivshankar]

The description of the problem is part of the #754 . This is not a breaking change.

Related Issue or Design Document

N/A

Checklist

• I have read the contributing guidelines and signed the CLA.
• I have referenced an issue containing the design document if my change introduces a new feature.
• I have read the security policy.
• I confirm that this pull request does not address a security vulnerability.
  If this pull request addresses a security vulnerability,
  I confirm that I got approval (please contact [email protected]) from the maintainers to push the changes.
• I have added tests that prove my fix is effective or that my feature works.
• I have added the necessary documentation within the code base (if appropriate).

Further comments

This is a minor change that has no impact to existing flows. It merely serves to be consistent with the auth code flow implementation and caters for cases highlighted in the Github issue.

[vivshankar]

Re-opening another PR.