Changing method signature
Returns an object with both return and redirect urls
Changing method signature
Merge branch 'refactor/redirect-url'