opendev/gerrit
Code Issues Proposed changes

Merge "Fixing registration redirect for new OpenID users" into stable-2.14

Browse Source
This commit is contained in:
David Pursehouse
2018-02-08 23:36:50 +00:00
committed by Gerrit Code Review
parent 523ffacba6 40471df546
commit adfe3b5c67
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
View File

@@ -488,10 +488,15 @@ class OpenIdServiceImpl {
final StringBuilder rdr = new StringBuilder(); final StringBuilder rdr = new StringBuilder();
rdr.append(urlProvider.get(req)); rdr.append(urlProvider.get(req));
String nextToken = Url.decode(token);
if (isNew && !token.startsWith(PageLinks.REGISTER + "/")) { if (isNew && !token.startsWith(PageLinks.REGISTER + "/")) {
rdr.append('#' + PageLinks.REGISTER); rdr.append('#' + PageLinks.REGISTER);
if (nextToken.startsWith("#")) {
// Need to strip the leading # off the token to fix registration page redirect
nextToken = nextToken.substring(1);
} }
rdr.append(Url.decode(token)); }
rdr.append(nextToken);
rsp.sendRedirect(rdr.toString()); rsp.sendRedirect(rdr.toString());
} }