Auth flows - make required updates + testing for SAF

[argush3]

An initial version of separate auth flows had been created previously to support SAF migrations specifically. Some intial testing was done but there still needs to be some refinement and further testing done.

Tasks

• Refinement of separate auth flows
• Testing of separate auth flows