I think for this scenario it is better to use destination query. You can writ...

I think for this scenario it is better to use destination query. You can write a simple JS which will set destination query parameter in login and logout link to current page and thus use core provided behavior for redirection.