SOAP-1642 Implement the Request authorized scenario
Minor refactoring