Revert "SSO authentication update"

This reverts commit c4aa5bc1dcb99ef0da5214838aa72a1fa24cf465.
Revert "Revert "SSO authentication update""

This reverts commit 663b76fa1ab01dd59fcee445e47efa39da7f7a79.