Feature/firewall sso refactor

of the firewall