Feature/firewall sso refactor

nope, firewall.