Feature/firewall sso refactor