Fixed a minor async bug

It returned redirectUri = ‘null’
Merge branch 'master' into oauth_server_logout_deauthorize

Conflicts:
	oauth-server/oauth-server.js