Feature/firewall sso refactor

firewall