Hey @muhammad.faizan.cs,
Let me know if my post here helps to keep the state through the OAuth flow:
Thanks, Tommy