| commit | f06050f125dd23e2b6cbd67f8729b7559e16774b | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Oct 15 00:25:00 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 15 00:25:00 2015 +0000 |
| tree | 244f556162952848ef50c478ffc51c158d757ae2 | |
| parent | e38ddd19b7e5ee11fac823c21349bba5ac440b40 [diff] | |
| parent | ef0af83e66c0cdd1dacfeda2fc4b1b2c9da206e2 [diff] |
Merge "Provide better detection of requiring sign-in" into stable-2.11
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java index e48477f..771423e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java
@@ -72,7 +72,8 @@ } return sce.getStatusCode() == Response.SC_FORBIDDEN && (sce.getEncodedResponse().equals("Authentication required") - || sce.getEncodedResponse().startsWith("Must be signed-in")); + || sce.getEncodedResponse().startsWith("Must be signed-in") + || sce.getEncodedResponse().startsWith("Invalid authentication")); } return false; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java index 299f0f1..153329a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
@@ -99,7 +99,8 @@ out = query(); } catch (QueryParseException e) { // This is a hack to detect an operator that requires authentication. - Pattern p = Pattern.compile("^Error in operator (.*:self)$"); + Pattern p = Pattern.compile( + "^Error in operator (.*:self|is:watched|is:owner|is:reviewer|has:.*)$"); Matcher m = p.matcher(e.getMessage()); if (m.matches()) { String op = m.group(1);